Fix for new python ABIs, #316259

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

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index f16fa9d127d40b3accbe27bd0f01ce5864acc1ae..06fbd93dc7d5da70aeaa69871cae949440ff2272 100644 (file)
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.57 2010/04/26 20:40:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.58 2010/05/18 07:03:11 jlec Exp $
+
+  18 May 2010; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.7.14.ebuild:
+  Fix for new python ABIs, #316259
 
   26 Apr 2010; Markus Meier <maekke@gentoo.org> qtiplot-0.9.7.12.ebuild:
   amd64/x86 stable, bug #309717

diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 166d44e214f29dd0fb5f6a4f74dd1985be7f0df7..a1628601848b9c12185f737cff84ecc58a8142c8 100644 (file)
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -11,13 +11,13 @@ DIST qtiplot-0.9.7.13.tar.bz2 8093399 RMD160 db226c26e923268424d4d0a834a89173067
 DIST qtiplot-0.9.7.14.tar.bz2 8119824 RMD160 09bf50211c77159dad674fcab4f9772fe4267947 SHA1 3e31b2c3fea827a573da96fb50118e6d9cc33f4b SHA256 10edfe55651d0e82f87b10b53fe068cee54782d1df2cbf482a7bafcc27eb3d18
 EBUILD qtiplot-0.9.7.12.ebuild 5081 RMD160 0d461312c4850d382e36ad24674f97c1863a5e45 SHA1 26aca4bc844b7137c03b66aa4104eb9d0b56087a SHA256 d15f9069e3a0e9efc07d2d8da382805a493062e80808c691813035df87cac40e
 EBUILD qtiplot-0.9.7.13.ebuild 5110 RMD160 289c056d6fe35747f1bf37418767f9432a8b83d4 SHA1 baa29e34411233c0318213a2f25f516978a206a9 SHA256 e3bec3364049233a1ad4ce426505fb45fc287b4c574feb5236bd3dd33ebf5c89
-EBUILD qtiplot-0.9.7.14.ebuild 5110 RMD160 cf402d7473de542d1d26d22aeede959b7990695d SHA1 17164d73184d9c2a6d2d0c25b2ff1d1229a33540 SHA256 e5619600893ebf1a0b3d95e8908be744490eadb24e48d50bd279ba47eb232d12
-MISC ChangeLog 16120 RMD160 390e30d9ca70c1b76c09c5d58744b68b94635fc7 SHA1 55acc141f50b03bacfed3c281d20f530086d731f SHA256 26e18e9a1e0abba4ff5bc9d0b3b47d4295052bdb157d3d172bf4810a19467b3f
+EBUILD qtiplot-0.9.7.14.ebuild 5161 RMD160 dbc61fed03ee4a466d5583823b18a1eccd978769 SHA1 0e7f66a2eeb7beabc470df7d30266f3bd247bae3 SHA256 6412fef43aec10788e922eb854a6f23c92ed9d5167844990095dcb97d5eb0002
+MISC ChangeLog 16226 RMD160 e0117ec13cbc824e978bc82eaa13a7feed786671 SHA1 205bbb5274f93df838f41afe9344b87f0f29800f SHA256 3315d3de88c1fa80f078cd8724ed05fe190807b6b03e1d392ea4f7a8796d3a1a
 MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvV+gAACgkQkKaRLQcq0GIcLwCeINZDqtfqYf93zpwBxJqEqQhr
-xT8AniCXy4FV1CjGcNNtyyicuSlJ4Z3X
-=QZjY
+iEYEARECAAYFAkvyO7UACgkQgAnW8HDreRbkGQCgxZOF12RAG35PuXs0AvmnFivT
+gbYAnA/3SIWAv2B+IfrwRXWzw+47tlJG
+=mgRg
 -----END PGP SIGNATURE-----

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild
index 026cd443f1ac4ff051f9e886d4d880d5bc9d6f4f..72bfd0cdbcfb64e2b90700252d98b96c45876f40 100644 (file)
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild,v 1.1 2010/04/23 08:16:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.14.ebuild,v 1.2 2010/05/18 07:03:11 jlec Exp $
 
 EAPI=2
+
+PYTHON_DEPEND="python? 2"
+
 inherit eutils qt4 fdo-mime python
 
 DESCRIPTION="Qt based clone of the Origin plotting package"
@@ -48,7 +51,7 @@ DEPEND="${CDEPEND}
                   >=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
 
 RDEPEND="${CDEPEND}
-       python? ( >=dev-lang/python-2.5
+       python? (
                dev-python/PyQt4[X]
                dev-python/pygsl
                dev-python/rpy
@@ -61,6 +64,11 @@ PATCHES=(
        "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
        )
 
+pkg_setup() {
+       python_set_active_version 2
+       qt4_pkg_setup
+}
+
 src_prepare() {
        qt4_src_prepare
 
@@ -113,8 +121,6 @@ src_prepare() {
        #       echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf
        #fi
 
-       python_version
-
        sed -e "s:doc/${PN}/manual:doc/${PN}/html:" \
                -e "s:/usr/local/${PN}:$(python_get_sitedir)/qtiplot:" \
                        -i qtiplot/qtiplot.pro || die