Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 ChangeLog          |    3 +++
 FUNCTIONS          |   13 +++++++++++++
 libs/pyqt4/BUILD   |    4 +++-
 libs/pyqt4/HISTORY |    4 ++++
 4 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 7079bad5c299fc79615ce68e04a4e3b55bd0acf3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    pyqt4: fix build

commit d05f2932783549b602c120cfbb3372e3728dc1d7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    FUNCTIONS: added get_spell_provider_file

diff --git a/ChangeLog b/ChangeLog
index 1d7fd0b..d84b1a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+       * FUNCTIONS: added get_spell_provider_file
+
 2015-03-18 Vlad Glagolev <stealth AT sourcemage.org>
        * python-pypi/python-daemon: new spell, library to implement a
          well-behaved Unix daemon process
diff --git a/FUNCTIONS b/FUNCTIONS
index eabb067..b991bae 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -727,6 +727,19 @@ if spell_ok $1 &&
 fi
 }
 
+#---
+## Find a file matching some pattern(s) as installed by the chosen
+## provider, e.g. /usr/bin/python3 for python3 providing PYTHON.
+## @params $1 - spell at hand
+## @params $2 - provider name (PYTHON)
+## @params $3 - expression for grep
+#---
+function get_spell_provider_file(){
+  gaze install $(get_spell_provider "$1" "$2") \
+  | grep "$3" | sort | head -n 1
+}
+
+
 . $GRIMOIRE/glselect.function
 . $GRIMOIRE/bzr_download.function
 . $GRIMOIRE/hg_download.function
diff --git a/libs/pyqt4/BUILD b/libs/pyqt4/BUILD
index 23a40ec..bcc4082 100755
--- a/libs/pyqt4/BUILD
+++ b/libs/pyqt4/BUILD
@@ -3,5 +3,7 @@ if [ $PYQT_BIG == y ];then
 fi &&
 export QTDIR=/usr          &&
 PATH=$QTDIR/bin/qt4:$PATH  &&
-$PYTHON  ./configure.py --confirm-license $VBIG  -j $MAKE_NJOBS &&
+# Need to use the proper selected python.
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$')
+$PYTHON  ./configure-ng.py --confirm-license $VBIG  -j $MAKE_NJOBS &&
 make
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index d65b654..18df94b 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,7 @@
+2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD: actually look for the correct python, use correct
+          build script
+
 2014-03-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.10.4