Fix for Python ABIs

(Portage version: 2.2_rc67/git/Linux x86_64)
 (Signed Manifest commit)

3 files changed, 41 insertions, 15 deletions

diff --git a/sci-geosciences/qgis/ChangeLog b/sci-geosciences/qgis/ChangeLog
index 95fa9d1c1..37b1b3ea0 100644
--- a/sci-geosciences/qgis/ChangeLog
+++ b/sci-geosciences/qgis/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-geosciences/qgis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jun 2010; Justin Lecher <jlec@gentoo.org> qgis-9999.ebuild:
+  Python ABI fixes
+
   21 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> -qgis-1.0.2.ebuild,
   -qgis-1.1.0.ebuild, -qgis-1.2.0.ebuild, qgis-9999.ebuild, metadata.xml:
   Removed old and adapated svn qgis in sync with portage tree one
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index c49462101..5284c211a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a
-EBUILD qgis-9999.ebuild 2263 RMD160 ef8420ee608edaffc0e333abacbcacc3b2122bfe SHA1 e1a5ed10ca6d1e798a336ef78f2767183e599690 SHA256 ab9a9990b595cdda759032fc46d735e5d2361ca1f4f5a0335a25dd65991466dd
-MISC ChangeLog 337 RMD160 7e2aeb20e3b35920ed21e651857cb2686620eaf5 SHA1 93e114c7df3e9fda67b8b9a7ed0dd9f6266c35cc SHA256 bd9fb10bc5a6b3a64bb9282cfd0d3e85d155d2794d029e7c41fc6aef4bb66b8d
+EBUILD qgis-9999.ebuild 2436 RMD160 cd8b4f20263d58e031e63a2e430769889468aac6 SHA1 9fcc8851345eb1afd5e8d6321b03e0f12535594c SHA256 7dc22aea99faee569598330f42dafe07c63d3d44bcfefd4e6a4e5c2cb3100d3a
+MISC ChangeLog 422 RMD160 ee66e01f9ff08026b752b0eb9e79d47cf48636ee SHA1 bbec1b99c475c90f77ba4631b538ac257a4c72c8 SHA256 0f4022f1564ce14fc98c276425c44060c3b764c2d87f969d42866e60a08a27a6
 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwqKh0ACgkQgAnW8HDreRaQWACdGZBSkK2V8TUGWcYyCsJXm+u4
+IxgAoNNMt4eWRb/jESARPt2QBrhmClGh
+=neEq
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 3934c9233..e2c459255 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -4,7 +4,9 @@
 
 EAPI="2"
 
-inherit cmake-utils eutils subversion
+PYTHON_USE_WITH="sqlite"
+PYTHON_DEPEND="python? 2"
+inherit python cmake-utils eutils subversion
 
 DESCRIPTION="User friendly Geographic Information System"
 HOMEPAGE="http://www.qgis.org/"
@@ -16,28 +18,39 @@ SLOT="0"
 KEYWORDS=""
 IUSE="examples gps grass gsl postgres python sqlite"
 
-RDEPEND="dev-libs/expat
-	>=sci-libs/gdal-1.6.1
-	sci-libs/geos
-	sci-libs/proj
+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
-	gps? ( x11-libs/qwt )
-	grass? ( >=sci-geosciences/grass-6 sci-geosciences/gdal-grass )
+	x11-libs/qt-webkit:4
+	sci-libs/geos
+	sci-libs/proj
+	gps? (
+		dev-libs/expat
+		sci-geosciences/gpsbabel
+	)
+	grass? (
+		>=sci-geosciences/grass-6.4.0_rc6
+	)
 	gsl? ( sci-libs/gsl )
-	postgres? ( >=virtual/postgresql-base-8 )
-	python? ( dev-lang/python[sqlite] dev-python/PyQt4[sql,svg] )
+	postgres? ( >=dev-db/postgresql-base-8 )
+	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+=(
+		"-DQGIS_MANUAL_SUBDIR=/share/man/"
 		"-DBUILD_SHARED_LIBS:BOOL=ON"
 		"-DBINDINGS_GLOBAL_INSTALL:BOOL=ON"
 		"-DQWT_INCLUDE_DIR=/usr/include/qwt5"
@@ -67,14 +80,14 @@ 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.png
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
+		doins -r "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
 	fi
 }