Fix build with new PyQt4 buildsystem. Patch by Martin von Gagern in bug 525700.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

5 files changed, 91 insertions, 15 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index a9ebfb4fd563..f35959417c7a 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/qgis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.33 2014/11/03 13:56:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.34 2014/11/10 15:21:40 pesa Exp $
+
+  10 Nov 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch, qgis-1.7.0.ebuild,
+  qgis-1.8.0.ebuild:
+  Fix build with new PyQt4 buildsystem. Patch by Martin von Gagern in bug
+  525700.
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> qgis-1.7.0.ebuild,
   qgis-1.8.0.ebuild:
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b8efd84491a1..2ba8aec02720 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,18 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qgis-1.7.0-avoid-deprecated-pyqtconfig.patch 2061 SHA256 d147c1f260616762c234ed4f1ff63025a6855713493d951d39df2c73db2b01dd SHA512 b65cfa939eb7a8bce7ba407dc17c2e8bb0f1bd8c32995ca61b40c22b8721de89f6a7fe145a1b891683f9c69be35031ede4f8d5443ae582038b20b4661a8783ef WHIRLPOOL 344268044079c8f0c42de60fdbda12fdb6b45c56e3a98207e329c44bc4dec4616ca2cc3f23b7e1132167ec255256a49be547df3cde7c3ad68691a9a6a9849d26
 AUX qgis-1.8.0-no-python-pyc.patch 1992 SHA256 c7b628112510a64443b562dcc18cfb91abe52f6b4a9029863a4b634c28401d34 SHA512 fd147a99cbcaa0bf9aa483b9b071d5cbf275b1bdd4e44961f8d7cd9113b8f3a9bd4d9eed5302ee7b96e453b6bd7a905c53bff823bcc5ac319748ebf9e93e6b4f WHIRLPOOL deb58e01046d558198ad44fb78d3ee4c1dccc091697fbb1416ca0ba757626ff186aff062dd56f4858efb77c3b79d30a7cc79179f4af54ae5972d91feb943f10a
-DIST qgis-1.7.0.tar.bz2 23420823 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34
+DIST qgis-1.7.0.tar.bz2 23420823 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34 SHA512 76e5bdc66626881c89945923548c1682c3fa4d217a0e26099960b079413caffa266066305c36dab1d7708490428d3670aa3825b4298a173278171b84f9d51279 WHIRLPOOL 67ae67f16140c2a6a1007115dd2202e5b495492167a124bb78d722354900f94e8e61a81479598f6c3f137131992fe95ff5db798e04a3cfe23e62268b4ace2adc
 DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
-EBUILD qgis-1.7.0.ebuild 2439 SHA256 14bf243c3648072da522f59bfd0e9ecdbb05cef0d7a7c1f6a3234cbf75f439da SHA512 17fd1f7c174ff7928ae2bbe76637f99fad2c0546626c9d0974d34881f38a884a1aa36e54e935e12dbd9a2ecd00a4586456f6012b67ba7c189a5ebf6b835c6a9f WHIRLPOOL 2c2e30f071730f8db0355e4722900e792e29f15a3cc1fa332e4e57ac3326a42c01dc2be7ee8c46464fa9982804cfc739e87fb7a0e87d1b73a77e37dfae4cae7d
-EBUILD qgis-1.8.0.ebuild 2928 SHA256 9ccd5f66a01c590ac4a49e9e9658336175aa4c66a30579ef2537f8c8b1a8cf9f SHA512 4b5879732327e8a163a3e58313932049b836b382eed70ba329fc712451e717542723e46744cebb56e55e18e425389b1e503db1d3feca432a285332e6af4d1acb WHIRLPOOL 6b5f560db41f8e2b71bbf2128114b9aa5d0a0f8d67575b1c9c3e0b9db675d018ed2f696974b6d416734ee31e7be6ed6633b7a84cde50f5fc36f657a65fe9c609
-MISC ChangeLog 5295 SHA256 16530460f008f969e0c04678a0e336cfe246755ab90fdd6559eabf41bdee2317 SHA512 fecdf0ba81312bcc817cb98237202e4ecfc3251e847dfea3f41d70c2e7de132545468aefdc73ee6832383005ba1052f5164e7c9de0e8c9c07668f2254a51f1bd WHIRLPOOL 0a8e548b3f4d891f7420a71556e8c186b0484f7402f7d6c754d291e4b1fdb4f4f0e1f18a0059564e1f3ac2d65e48bf3a8134d4c41410ca28c566f13e065b3635
+EBUILD qgis-1.7.0.ebuild 2506 SHA256 b5905dc9fbed7eeb067700a4aabdb946450be0a24caf9b81a1a72a2f9a4719c9 SHA512 d4b4d0d77e6b5d0b1e5b79dd61bdb396bc02935c52924fb99f321143b4eda95c3f08e6be70aec58358e332a4f926945768df18bbf3636c89a74894c6cbece0ff WHIRLPOOL 304113cb7f74a02a7c07c439f60f5988fff746ede49432c696b197a2faac944366d6a4cffa0d2633aabc2b0fd82a5c5bd2fc4d62774f91ca546840eb8e6afea0
+EBUILD qgis-1.8.0.ebuild 2977 SHA256 0dae080c50cd2f837b0361dc7a5275ac75db7d3a8ef0f42b9a7679bbb48ece2f SHA512 49ff3e233a978ffbc5dd8ad22db61cee94f100b75a4cfc509853171d4b6aa5457a9350fbfa783fc30ecac1442ee01dc23b5f8899c27bd9791c77fd86fda9ab71 WHIRLPOOL 446f3a735e384054935455027469dc88ef3513374284c30db8b09d0be513ec71ad80476db6131ef15eee741d3bd23b52a9a6f12be0863dbfd24d3efbbf19f7f1
+MISC ChangeLog 5519 SHA256 bcd0f76ac806826c9e7009841f810bb7e5250023839884065bf43d2781d14988 SHA512 3684d492ea58077abb24c8daf574ee0361416e74969881cce8d480840e80f5bc8ef54e5b8659dce05167f790958af431114380123951fcb5944cf4d1ca90775f WHIRLPOOL 6353171e3302cf4ba34cfdd16b906072a896cdfbc653c3ff2a7dc33e128986689dba2c232a14d85e4676fe7197cbc01906a1153a406db780f0968c4d9272ec57
 MISC metadata.xml 856 SHA256 13d42ab9e1157d249cb431aecc96b56e1de66c0d81e5a9323d0c878e0cc3b16d SHA512 2a88daa49b4107439665a3352e17ced39e132d031910a66f3d75e89122540db0854261cccbd2beb6eb396d8390e3c916796fd4af37fe7af15676ab6cf850a516 WHIRLPOOL b8e1f1ee238cd8dea0daf3b66fc64a8eac81ef38dbf46d82c9f154340afcef881d8aae3cca0967b694383a8fd37a4cf06d033efbd9938675992605fc1cdbd7fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlRXiZ0ACgkQVxOqA9G7/aCUqwD/VVu4swmyctXFJn266PZmRK7c
-uoDrMqh9SL6jZiguhZgA/249r7gBEvVLOxKQvvz7qlQ1XVzcYM1grqZ3TqXyqnSA
-=DQRV
+iQJ8BAEBCABmBQJUYNgMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9c90P/27okMp1jXzJuUjAbSJ5Xbdm
+gXPY79tok9jf5oeCBDJKYS8Hpya0YZrFqP/gXOO9APVhD85TmPYAjP6URLCDdFd/
+LEMpp4LEfzbzo3ZK8lTItCzkytC1p/CIxsgqDT79YpLM1fjXUlK0cI9WmR0x0v8s
+yAXpdDu9NgwKQhy6Ek+nov5kk1MbCs7z2TXl/Jsgikw2J70o/XunfrKTVIG3RPjs
+SbiQW4Bb8nWJiCgYS3D11ZiUvrDupGhDdOcieWSFROL/HFBtRU8+A0JSbfc5Lkqr
+Hv79t2ElCCC2dWcXBYHKSf4W6zvaJuNf9TAEHYm+uPLIuhorO09CgrietoKykbzx
+B1qnn9lip9EFl+aCi15F9TBpQfzIJuZ3v8aDBV6kxX9YPFvB824hKtpIQNW/Kl0q
+z7Zq3HXecnlH21StOMNPZnKF/LKFqNZ3djBX5Ozr+t3h8qmZaBFRlcSSWm/Xooey
+Ol4PuMDgXZMFyGs66HNkrwP3Jh5ABuPRXjyMAYiHLdY5xHF2wROaHGG3pb15e1ik
+hCnZCQYUGvRCAuecE+0XaUS7KXbidYDMhJbL1tr9XOBg58cReAmB00q7HFU1FoO4
+iY2W50HdHG/vlDkdpsM8GCXF0rVZ/2Wa+CrKiztg0AqW/DB3ykrpgbZq/rWTxc0p
+auFrgKj0lO+G96eaQgC2
+=Apcv
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
new file mode 100644
index 000000000000..65cabb2afe72
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
@@ -0,0 +1,53 @@
+Avoid relying on the deprecated pyqtconfig module.
+
+When PyQt4 is configured using configure-ng.py then no pyqtconfig module
+will be built, causing the automatic detection in the QGIS build system to
+fail.
+
+This change tries to work around the problem by extracting or guessing all
+the relevant settings.  It should work reasonably well for a default
+configuration of PyQt, but may fail if PyQt overrides the defaults from sip. 
+All may break if SIP v5 is used, since that version apparently won't contain
+a sipconfig module any more.  But we'll tackle that once we get there.
+
+References:
+* https://bugs.gentoo.org/show_bug.cgi?id=525700
+
+2014-10-21 Martin von Gagern
+
+Index: qgis-2.4.0/cmake/FindPyQt.py
+===================================================================
+--- qgis-2.4.0.orig/cmake/FindPyQt.py
++++ qgis-2.4.0/cmake/FindPyQt.py
+@@ -30,9 +30,29 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import PyQt4.pyqtconfig
++try:
++    import PyQt4.pyqtconfig
++    pyqtcfg = PyQt4.pyqtconfig.Configuration()
++except ImportError:
++    import PyQt4.QtCore
++    import sipconfig # won't work for SIP v5
++    import os.path
++    cfg = sipconfig.Configuration()
++    sip_dir = cfg.default_sip_dir
++    for p in (os.path.join(sip_dir, "PyQt4"), sip_dir):
++        if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
++            sip_dir = p
++            break
++    cfg = {
++        'pyqt_version': PyQt4.QtCore.PYQT_VERSION,
++        'pyqt_version_str': PyQt4.QtCore.PYQT_VERSION_STR,
++        'pyqt_sip_flags': PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'],
++        'pyqt_mod_dir': cfg.default_mod_dir,
++        'pyqt_sip_dir': sip_dir,
++        'pyqt_bin_dir': cfg.default_bin_dir,
++    }
++    pyqtcfg = sipconfig.Configuration([cfg])
+ 
+-pyqtcfg = PyQt4.pyqtconfig.Configuration()
+ print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
+ print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
+ print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
diff --git a/sci-geosciences/qgis/qgis-1.7.0.ebuild b/sci-geosciences/qgis/qgis-1.7.0.ebuild
index d1bb65141929..c8aff33169c8 100644
--- a/sci-geosciences/qgis/qgis-1.7.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild,v 1.8 2014/11/03 13:56:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.7.0.ebuild,v 1.9 2014/11/10 15:21:40 pesa Exp $
 
 EAPI=3
 
@@ -44,6 +44,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 DOCS=( BUGS ChangeLog CODING.pdf README )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
+)
 
 # Does not find the test binaries at all
 RESTRICT="test"
diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index 4dc894e428e9..c123ea1bc970 100644
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.5 2014/11/03 13:56:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.6 2014/11/10 15:21:40 pesa Exp $
 
 EAPI=5
 
@@ -53,14 +53,15 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
+	"${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch"
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-python-pyc.patch
-}
-
 src_configure() {
 	local mycmakeargs=(
 		"-DQGIS_MANUAL_SUBDIR=/share/man/"