Update to use python correctly. Drop old. Per bug #316215.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 30 insertions, 209 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 8ce2f9833fbd..7cd5de4ba13b 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.5 2010/03/09 12:09:12 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/ChangeLog,v 1.6 2010/04/26 22:50:43 scarabeus Exp $
+
+  26 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> -qgis-1.3.0.ebuild,
+  -files/qgis-1.3.0-sip.patch, qgis-1.4.0.ebuild:
+  Update to use python correctly. Drop old. Per bug #316215.
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org> qgis-1.3.0.ebuild,
   qgis-1.4.0.ebuild:
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 8f79efbd45d4..19c86604682b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX qgis-1.3.0-sip.patch 2929 RMD160 54e82871460ae566bda62218b73dd51d5b3fcac0 SHA1 56d055dc3089216b4037165a2819424fb751f458 SHA256 af7c60951bc51dd4e2e0afe3bf81d6427138907fc02b21e421fdd532dfa84779
-DIST qgis_1.3.0.tar.gz 22091843 RMD160 c2ffd90468b7f9cd49d2ba878a6572e8f19e137a SHA1 6c2f4cf5db8d5b513306465bfd160bdfa9a727af SHA256 4d94913fa44648980609762c7a72d9e3b9736a2157321acb0402afb03ea8186c
 DIST qgis_1.4.0.tar.gz 17285943 RMD160 47486732c8fe37aa6864d09c7420be22de5ea802 SHA1 105f353f36e9625d1eb15f1a315882f214dbe026 SHA256 bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-1.3.0.ebuild 2442 RMD160 8ed6dff874409fecf76bb90483af231e341ea355 SHA1 86f2d3a8e08e39fa7e609647e52bc1e6c766d2cb SHA256 7e3c8e038cbab7f8f23cdad91c285be14a480b760b9a3a62412c33b6f6612d42
-EBUILD qgis-1.4.0.ebuild 2334 RMD160 9a9faaf9e4400aed351714f9c8605ba2b39e3714 SHA1 8a20ab753b960e660f03976d052e2a09b77d271a SHA256 ede613ab7d8b66568cb0d109ea4b85c47971b4f66c1052f4d7521ea23e2cb1d8
-MISC ChangeLog 1087 RMD160 621794650a2f6e4f0c73adcccc146174b42c5097 SHA1 ecd8b6c0d6eecbd98121eefafdfa1b15fb969695 SHA256 94c51bc0668f692e43014ef7214c2c30c8bf111ab4ee3f9eae777f53a8df004a
+EBUILD qgis-1.4.0.ebuild 2461 RMD160 dbc902da60dbb6ff333862416b06fb6b155b57ce SHA1 c18f7586edda4474304b3e26461430ef57c46cbd SHA256 f0138e01f9c6590a20f94033070321229bda1fbe1feb66c431564bb9960af5ef
+MISC ChangeLog 1279 RMD160 d558fb917f3940f4234715bdb0550ffdfd4c89a0 SHA1 62ea0ef6d17f4d898cb49f7cf14a34b6d7ab25a9 SHA256 60130e720ffa3f531fc77791b99ab70e8d73c7b6b1c05e659e71c33cbdc9cec9
 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuWOm8ACgkQOypDUo0oQOqp2QCgkOgGmhDbxIpATmm5ogYy7Hir
-lKoAoKcK6e6SwhE0Ra8WBrTFo6wUiMLy
-=ktFY
+iEYEARECAAYFAkvWGKMACgkQHB6c3gNBRYfI7gCgtMfSvSfSmqJ54ZILkV+UWMzT
+ZC8An2EWjviurKe7Cyv4C6E1zv44C9jp
+=pB8q
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qgis/files/qgis-1.3.0-sip.patch b/sci-geosciences/qgis/files/qgis-1.3.0-sip.patch
deleted file mode 100644
index 620b0d0e2c60..000000000000
--- a/sci-geosciences/qgis/files/qgis-1.3.0-sip.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- python/core/conversions.sip.orig	2009-11-21 19:58:32.000000000 +0000
-+++ python/core/conversions.sip	2009-11-21 20:08:49.000000000 +0000
-@@ -28,6 +28,10 @@
- {
- %TypeHeaderCode
- #include <QVector>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -104,6 +108,10 @@
- {
- %TypeHeaderCode
- #include <QVector>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -179,6 +187,10 @@
- {
- %TypeHeaderCode
- #include <QSet>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -229,6 +241,10 @@
- {
- %TypeHeaderCode
- #include <QSet>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -301,6 +317,10 @@
- {
- %TypeHeaderCode
- #include <QMap>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -418,6 +438,10 @@
- {
- %TypeHeaderCode
- #include <QMap>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -518,7 +542,11 @@
- %MappedType QMap<TYPE1, TYPE2*>
- {
- %TypeHeaderCode
--#include <qmap.h>
-+#include <QMap>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -626,6 +654,10 @@
- {
- %TypeHeaderCode
- #include <QMultiMap>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
-@@ -744,6 +776,10 @@
- {
- %TypeHeaderCode
- #include <QMap>
-+#if (SIP_VERSION >= 0x040900)
-+#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
-+#endif
- %End
- 
- %ConvertFromTypeCode
diff --git a/sci-geosciences/qgis/qgis-1.3.0.ebuild b/sci-geosciences/qgis/qgis-1.3.0.ebuild
deleted file mode 100644
index 46a66c6367e6..000000000000
--- a/sci-geosciences/qgis/qgis-1.3.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.3.0.ebuild,v 1.4 2010/03/09 12:09:12 abcd Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="http://download.osgeo.org/${PN}/src/${PN}_${PV}.tar.gz
-	examples? ( http://download.osgeo.org/${PN}/data/${PN}_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples gps grass gsl postgres python sqlite"
-
-RDEPEND=">=sci-libs/gdal-1.6.1
-	x11-libs/qt-core:4[qt3support]
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-sql:4
-	sci-libs/geos
-	sci-libs/proj
-	gps? ( dev-libs/expat sci-geosciences/gpsbabel )
-	grass? ( >=sci-geosciences/grass-6 sci-geosciences/gdal-grass )
-	gsl? ( sci-libs/gsl )
-	postgres? ( >=virtual/postgresql-base-8 )
-	python? ( dev-python/PyQt4[sql,svg] )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-src_prepare() {
-	# patch to wor with all versions of sip, taken from upstream trunk
-	epatch "${FILESDIR}"/${P}-sip.patch
-}
-
-src_configure() {
-	local mycmakeargs
-	mycmakeargs+=(
-		"-DBUILD_SHARED_LIBS:BOOL=ON"
-		"-DBINDINGS_GLOBAL_INSTALL:BOOL=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with grass GRASS)
-		$(cmake-utils_use_with gps EXPAT)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use_with sqlite SPATIALITE)
-	)
-
-	if use grass; then
-		GRASS_ENVD="/etc/env.d/99grass /etc/env.d/99grass-6 /etc/env.d/99grass-cvs";
-		for file in ${GRASS_ENVD}; do
-			if test -r ${file}; then
-				GRASSPATH=$(sed -n 's/LDPATH="\(.*\)\/lib"$/\1/p' ${file});
-			fi
-		done
-		mycmakeargs+=(
-			"-DGRASS_PREFIX=${GRASSPATH}"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS
-
-	newicon images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "Quantum GIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	fi
-}
diff --git a/sci-geosciences/qgis/qgis-1.4.0.ebuild b/sci-geosciences/qgis/qgis-1.4.0.ebuild
index 617879621f85..3c9f002e8a71 100644
--- a/sci-geosciences/qgis/qgis-1.4.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.4.0.ebuild
@@ -1,10 +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.4.0.ebuild,v 1.2 2010/03/09 12:09:12 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.4.0.ebuild,v 1.3 2010/04/26 22:50:43 scarabeus Exp $
 
 EAPI="2"
 
-inherit cmake-utils eutils
+PYTHON_USE_WITH="sqlite"
+PYTHON_DEPEND="python? 2"
+inherit python cmake-utils eutils
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -24,17 +26,28 @@ RDEPEND=">=sci-libs/gdal-1.6.1
 	x11-libs/qt-sql:4
 	sci-libs/geos
 	sci-libs/proj
-	gps? ( dev-libs/expat sci-geosciences/gpsbabel )
-	grass? ( >=sci-geosciences/grass-6 sci-geosciences/gdal-grass )
+	gps? (
+		dev-libs/expat
+		sci-geosciences/gpsbabel
+	)
+	grass? (
+		>=sci-geosciences/grass-6
+		sci-geosciences/gdal-grass
+	)
 	gsl? ( sci-libs/gsl )
 	postgres? ( >=virtual/postgresql-base-8 )
-	python? ( dev-lang/python[sqlite] dev-python/PyQt4[sql,svg] )
+	python? ( dev-python/PyQt4[sql,svg] )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs
 	mycmakeargs+=(
@@ -66,9 +79,9 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS
+	dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS || die
 
-	newicon images/icons/qgis-icon.png qgis.png
+	newicon images/icons/qgis-icon.png qgis.png || die
 	make_desktop_entry qgis "Quantum GIS " qgis
 
 	if use examples; then