Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ChangeLog              |    9 ---------
 FUNCTIONS              |   20 ++++----------------
 libs/libxml2/BUILD     |    7 +++++++
 libs/libxml2/HISTORY   |    3 ---
 python-pypi/PY_DEPENDS |    5 ++++-
 5 files changed, 15 insertions(+), 29 deletions(-)

New commits:
commit af34d7353faa1ed5653d359735d4beda28da584a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "fix builds involving python3.3"
    
    This reverts commit ee71c06a22645712994fd33e6fc87fdd660f749b.
    
    Conflicts:
    
        ChangeLog
    
    Usage of such stuff is *UNACCEPTABLE*. We get a ton of grep errors and 
extra
    calls for the spells which DO NOT DEPEND on any version of python!
    
    See your own compile logs and super debug sorcery logs for more info.

commit 7b023bd603824bf5113d9c006ad7bd11b51f425d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "libxml2 - tweak build for python3"
    
    This reverts commit c0ee14fe8afdf9f035aad59547a2384719294a12.
    
    Conflicts:
    
        ChangeLog

commit 5d08c761978d98a56d8ac4f985f26640eb328519
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "FUNCTIONS - fix python2 usage"
    
    This reverts commit 559e955724ce573573b4901423cdaea2c702924a.
    
    Conflicts:
    
        ChangeLog

commit 2a8d29f900217fd36d36ec4b412a0a6542f6040d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "FUNCTIONS - fix typo"
    
    This reverts commit 857999f63a64dc196d33ced7b831740adb520f2f.
    
    Conflicts:
    
        ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2c5b34a..f0830c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -680,9 +680,6 @@
 2013-12-09 Ladislav Hagara <hgr AT vabo.cz>
        * python-pypi/python-efl: new spell, python bindings for EFL
 
-2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
-       * FUNCTIONS: fix PYTHON2 typo
-
 2013-12-03 Ismael Luceno <ismael AT sourcemage.org>
        * disk/pspshrink: new spell, ISO Compressor for PSP games
 
@@ -695,18 +692,12 @@
 2013-11-26 Vlad Glagolev <stealth AT sourcemage.org>
        * php-pear/php-clamav: new spell, ClamAV Interface for PHP5 scripts
 
-2013-11-24 Treeve Jelbert <treeve AT sourcemage.org>
-       * FUNCTIONS: fix for python2 usage when it is not primary installation
-
 2013-11-24 Jeremy Blosser <jblosser AT sourcemage.org>
        * python-pypi/viridian: new spell, ampache client in python
 
 2013-11-24 Ismael Luceno <ismael AT sourcemage.org>
        * net/cgminer: new spell, multi-threaded multi-pool FPGA and ASIC 
miner for bitcoin
 
-2013-11-20 Treeve Jelbert <treeve AT sourcemage.org>
-       * FUNCTIONS,python-pypi/PY_DEPENDS: fix builds involving python3.3
-
 2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
        * loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013)
          <jariruusu AT users.sourceforge.net>)
diff --git a/FUNCTIONS b/FUNCTIONS
index 55bef4f..eabb067 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -2,18 +2,6 @@
 . $GRIMOIRE/libgcc
 . $GRIMOIRE/config_query_multi.function
 
-if is_depends_enabled $SPELL python;then
-  VV=`installed_version python | cut -c-3` &&
-  PYTHON2=/usr/bin/python${VV}
-  export PYTHON=$PYTHON2
-fi
-
-if is_depends_enabled $SPELL python3;then
-  VV=`installed_version python3 | cut -c-3` &&
-  PYTHON3=/usr/bin/python${VV}m
-  export PYTHON=$PYTHON3
-fi
-
 QT5DIR=$INSTALL_ROOT/opt/qt5
 qt5_build() {
   export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
@@ -453,28 +441,28 @@ function unpack_file() {
 ## Default build for Python2 spell.
 #-------------------------------------------------------------------------
 function default_build_python() {
-  $PYTHON2 setup.py build "$@"
+  python2 setup.py build "$@"
 }
 
 #-------------------------------------------------------------------------
 ## Default build for Python 3 spell.
 #-------------------------------------------------------------------------
 function default_build_python3() {
-  $PYTHON3 setup.py build "$@"
+  python3 setup.py build "$@"
 }
 
 #-------------------------------------------------------------------------
 ## Default install for Python spell.
 #-------------------------------------------------------------------------
 function default_install_python() {
-  $PYTHON2 setup.py install --root "$INSTALL_ROOT/" "$@"
+  python2 setup.py install --root "$INSTALL_ROOT/" "$@"
 }
 
 #-------------------------------------------------------------------------
 ## Default install for Python 3 spell.
 #-------------------------------------------------------------------------
 function default_install_python3() {
-  $PYTHON3 setup.py install --root "$INSTALL_ROOT/" "$@"
+  python3 setup.py install --root "$INSTALL_ROOT/" "$@"
 }
 
 #-------------------------------------------------------------------------
diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
new file mode 100755
index 0000000..10eb6b8
--- /dev/null
+++ b/libs/libxml2/BUILD
@@ -0,0 +1,7 @@
+if is_depends_enabled $SPELL python3;then
+ export PYTHON=/usr/bin/python3
+fi &&
+if is_depends_enabled $SPELL python;then
+ export PYTHON=/usr/bin/python2.7
+fi &&
+default_build
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index a271d2f..d0a1e12 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,6 +1,3 @@
-2013-11-21 Treeve Jelbert <treeve AT sourcemage.org>
-       * BUILD: deleted, python usege is solved in FUNCTIONS
-
 2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
        * SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
        * BUILD: added, fix detection of python3
diff --git a/python-pypi/PY_DEPENDS b/python-pypi/PY_DEPENDS
index 540295f..f20cfb3 100755
--- a/python-pypi/PY_DEPENDS
+++ b/python-pypi/PY_DEPENDS
@@ -1,2 +1,5 @@
 depends PYTHON  &&
-depends setuptools
+# distutils is now included with python3
+if is_depends_enabled $SPELL python; then
+  depends setuptools
+fi