sci-geosciences/qgis: Fix USE=python

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
new file mode 100644 (file)
index 0000000..b8a812d
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
@@ -0,0 +1,25 @@
+commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac
+Author: Marco Bernasocchi <marco@opengis.ch>
+Date:   Wed Dec 7 19:08:24 2016 +1300
+
+    fix 2.18 build with Qt5 by executing pyuic
+
+diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh
+index d6fb497a84..aa146b31bb 100755
+--- a/scripts/pyuic-wrapper.sh
++++ b/scripts/pyuic-wrapper.sh
+@@ -15,12 +15,12 @@
+ ###########################################################################
+ 
+ 
+-PYUIC4=$1
++PYUIC=$1
+ LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
+ PYTHONPATH=$3:$PYTHONPATH
+ PYTHON=$4
+ shift 4
+ 
+ export LD_LIBRARY_PATH PYTHONPATH
+-
++$PYUIC $@
+ exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@

diff --git a/sci-geosciences/qgis/qgis-2.18.6.ebuild b/sci-geosciences/qgis/qgis-2.18.6.ebuild
index 42c6a19e4aa3ce4c39b7441936d67ea3849b8021..53dee9ff00eed7c3251be33fc786292660d2a773 100644 (file)
--- a/sci-geosciences/qgis/qgis-2.18.6.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.6.ebuild
@@ -90,7 +90,10 @@ RDEPEND="${COMMON_DEPEND}
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-featuresummary.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-featuresummary.patch"
+       "${FILESDIR}/${P}-python.patch"
+)
 
 pkg_setup() {
        use python && python-single-r1_pkg_setup