Fix bug #342315 and bug #332749. Thanks to Attila Olah for the patch.

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

4 files changed, 90 insertions, 7 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index bc521387b2b3..1635c1d3a7c0 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/qgis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.15 2010/08/06 19:06:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.16 2010/12/21 14:37:08 scarabeus Exp $
+
+  21 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> qgis-1.5.0.ebuild,
+  +files/qgis-1.5.0-sip.patch:
+  Fix bug #342315 and bug #332749. Thanks to Attila Olah for the patch.
 
 *qgis-1.5.0 (06 Aug 2010)
 
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 90a26dd45b5c..300a98e03f4e 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,8 +1,9 @@
 AUX qgis-1.4.0-gcc45.patch 536 RMD160 78966492091d7b9a249fce13d892881d82d25d5a SHA1 6ea4ea20d346a4f4df7bb043f779afebd831a606 SHA256 909d0699d8c203ff3198261d46de770ed3b6da3b9d77be7315c895539564b922
+AUX qgis-1.5.0-sip.patch 2754 RMD160 c17e7ef79894e94406a9bf26f928026e5df2a3d9 SHA1 41d123b2415d863d8358ca88cc933f6788aea984 SHA256 2be600d2f303f442f6d42eeaa5149ada49aad5d279b5f50bdd6262620ead82ee
 DIST qgis_1.4.0.tar.gz 17285943 RMD160 47486732c8fe37aa6864d09c7420be22de5ea802 SHA1 105f353f36e9625d1eb15f1a315882f214dbe026 SHA256 bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
 DIST qgis_1.5.0.tar.gz 17360308 RMD160 bd371640740c4f6d589d5bb9f2677a0de46d4895 SHA1 f17b1a1175bdfad6f8a005470bfbb70eaeaf806a SHA256 f99748e3948b97894703dc81c2a3eba1f2796651e581957cc2c61c9b9dbab470
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
 EBUILD qgis-1.4.0.ebuild 2576 RMD160 50e73148c4888d745d395c7b048c42d31cfcc48d SHA1 e8b40ed3c76c1d7544dff465af8c301e5f02a156 SHA256 35ed320ec0ca0cccbd5841dee6f4cac66d0790bc819b41f75c43e3db0e110065
-EBUILD qgis-1.5.0.ebuild 2431 RMD160 54ef756115a7f833dff9d18aad522e0ac5749ba0 SHA1 1ca92b13e8322365b834f0ab5ac2fd79baa1beb7 SHA256 3a3eb9e15a3bb154529fede5057e83f2675f1593989e8092ecaaf5d5c2cb4eb0
-MISC ChangeLog 2478 RMD160 58a9e66212f11aedad8ab213a7f9a7a25d95c089 SHA1 d883a6c68642d5db148878114890c39924c04a22 SHA256 5475fd1047530852c47e3d7bf758fe8d5a05a267c8c4f4ab63d23d5687f4d1b1
+EBUILD qgis-1.5.0.ebuild 2478 RMD160 a853afbd0e1263b7959dde3ec3e5866e0040416f SHA1 d5f2717e7f69c5726370b6479e93175b8623fa67 SHA256 db1c0fbe2edc28a3dabe419babe505f08a80e14a6015bfbd93bd3ee6a553633b
+MISC ChangeLog 2656 RMD160 3eef6fea813084e8b22ef313636b9f833e7419a0 SHA1 23899e201831fad17b83ffde6821ba2d8fa3d553 SHA256 d3ad52fd9252754dbf7dfbaf11b6a58e327d7bd5bde95e3a593f3c3b0444b1a3
 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
diff --git a/sci-geosciences/qgis/files/qgis-1.5.0-sip.patch b/sci-geosciences/qgis/files/qgis-1.5.0-sip.patch
new file mode 100644
index 000000000000..61fc44e67aac
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.5.0-sip.patch
@@ -0,0 +1,76 @@
+diff -rc qgis-1.5.0/cmake/FindSIP.cmake qgis-1.5.0-patched/cmake/FindSIP.cmake
+*** qgis-1.5.0/cmake/FindSIP.cmake	Sat Jan 16 12:08:04 2010
+--- qgis-1.5.0-patched/cmake/FindSIP.cmake	Wed Nov 17 16:46:34 2010
+***************
+*** 36,41 ****
+--- 36,42 ----
+    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config)
+    IF(sip_config)
+      STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config})
++     STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config})
+      STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
+      STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
+      STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
+diff -rc qgis-1.5.0/cmake/FindSIP.py qgis-1.5.0-patched/cmake/FindSIP.py
+*** qgis-1.5.0/cmake/FindSIP.py	Sat Jan 16 12:04:41 2010
+--- qgis-1.5.0-patched/cmake/FindSIP.py	Wed Nov 17 16:46:57 2010
+***************
+*** 9,14 ****
+--- 9,15 ----
+  
+  sipcfg = sipconfig.Configuration()
+  print("sip_version:%06.0x" % sipcfg.sip_version)
++ print("sip_version_num:%d" % sipcfg.sip_version)
+  print("sip_version_str:%s" % sipcfg.sip_version_str)
+  print("sip_bin:%s" % sipcfg.sip_bin)
+  print("default_sip_dir:%s" % sipcfg.default_sip_dir)
+diff -rc qgis-1.5.0/python/CMakeLists.txt qgis-1.5.0-patched/python/CMakeLists.txt
+*** qgis-1.5.0/python/CMakeLists.txt	Sat May 15 10:21:42 2010
+--- qgis-1.5.0-patched/python/CMakeLists.txt	Wed Nov 17 16:47:57 2010
+***************
+*** 39,44 ****
+--- 39,48 ----
+    SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
+  ENDIF(PYQT4_VERSION_NUM LESS 263680)
+  
++ IF(NOT PYQT4_VERSION_NUM LESS 263941)	# 0x040705
++   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
++ ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
++ 
+  # core module
+  FILE(GLOB sip_files_core core/*.sip)
+  set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
+diff -rc qgis-1.5.0/python/core/conversions.sip qgis-1.5.0-patched/python/core/conversions.sip
+*** qgis-1.5.0/python/core/conversions.sip	Tue Apr 20 14:25:42 2010
+--- qgis-1.5.0-patched/python/core/conversions.sip	Wed Nov 17 16:45:03 2010
+***************
+*** 14,19 ****
+--- 14,21 ----
+  - QMap<int, QgsOverlayObject*>*
+  */
+  
++ %Feature QSETINT_CONVERSION
++ 
+  %ModuleHeaderCode
+  // From Python 2.5, some functions use Py_ssize_t instead of int
+  // thus this typedef is for maintaining backward compatibility
+***************
+*** 265,270 ****
+--- 267,273 ----
+  
+  
+  
++ %If (QSETINT_CONVERSION)
+  %MappedType QSet<int>
+  {
+  %TypeHeaderCode
+***************
+*** 316,321 ****
+--- 319,325 ----
+  %End
+  
+  };
++ %End
+  
+  
+  template <TYPE>
diff --git a/sci-geosciences/qgis/qgis-1.5.0.ebuild b/sci-geosciences/qgis/qgis-1.5.0.ebuild
index 95181fb79865..1ae75c554fd2 100644
--- a/sci-geosciences/qgis/qgis-1.5.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.5.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.1 2010/08/06 19:06:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.5.0.ebuild,v 1.2 2010/12/21 14:37:08 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="python? 2"
-inherit python cmake-utils eutils
+inherit python base cmake-utils eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -38,13 +38,15 @@ RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?]
 			>=dev-db/postgresql-server-8.4
 		)
 	)
-	python? ( dev-python/PyQt4[sql,svg] )
+	python? ( dev-python/PyQt4[X,sql,svg] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
+PATCHES=( "${FILESDIR}/${P}-sip.patch" )
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup