Python ABI fixes, #316229

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

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index a608155efcdf93055edb6c2fea674ffb64f5be70..4db9bd46991cea85ae67f2052eabcef10e4a3d34 100644 (file)
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.64 2010/03/26 12:40:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.65 2010/04/25 10:00:50 jlec Exp $
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> vtk-5.4.2-r1.ebuild:
+  Python ABI fixes, #316229
 
   26 Mar 2010; Ben de Groot <yngwin@gentoo.org> vtk-5.4.2.ebuild,
   vtk-5.4.2-r1.ebuild:

diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 5b3668ee7b9ecce215421e5550c8783dfc308a7c..af1e265e4c079a0222f2d182e458e90a5b2ecf3e 100644 (file)
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
 AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 AUX vtk-5.2.0-tcl-install.patch 580 RMD160 e3654b90212a4f48f707cd4cfaf6069b9cbc4d49 SHA1 94269da0a6d83312d0fc00c3f7adf964531a7d20 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6
@@ -7,7 +10,14 @@ AUX vtk-5.4.2-libpng14.patch 548 RMD160 14217aaaad0b1d44d25574084ee2d3c75d52fbec
 DIST vtk-5.4.2.tar.gz 18265310 RMD160 607df8babe7413b92a5bd4d8c264fd69798df83f SHA1 508106a15c32326aa9ac737c7f0e7212c150d55f SHA256 037c0582ee7483e0b495e45a00c4f08784691ef82c4ea159ef86731c3beda73d
 DIST vtkDocHtml-5.4.2.tar.gz 229828672 RMD160 d6372984b74ede33713501219fecd6768edcfad3 SHA1 13da1373bb95f34b1f868b307f0e84fef6626020 SHA256 54dfe1c242c488db1d1099bbf9114f49ee2bd07859c067e77e2d6bd3c077ee25
 DIST vtkdata-5.4.2.tar.gz 52810062 RMD160 0cc24fc7a6a9bb80c619a0555eb288cc97554001 SHA1 5030523c0a9e17c47bf94fe9005e5c91069a571a SHA256 84c9895b72aec96977b8043a4be26ff58e14ae04ab2be9f19a02ca613dc3be26
-EBUILD vtk-5.4.2-r1.ebuild 6292 RMD160 d6845d75817117d8248953ea918cc053da07693b SHA1 dfcfd01416b2d219a481bac2e6e3c0dbead99136 SHA256 81ffe88751f44ee87ffa284d796567f77b5b3dcecec940a852378034fcb79554
+EBUILD vtk-5.4.2-r1.ebuild 6363 RMD160 0cbd84908befc0dedec1c4f99d85b4e34fbe5449 SHA1 205a291e867fb86f250cd85521c28ce86d3fd4b3 SHA256 00011f803b63e461542c564e9a9e702feb1cb357e3fb1b18c96f9c5f1865adcd
 EBUILD vtk-5.4.2.ebuild 9228 RMD160 48166d46b398bf602298f075f7c2503b889e2bab SHA1 a910c5ab6ea24e337ec81e655e2cbf703091f62a SHA256 4916278ab6b193e7fe49b5629e629d9133da4f5b2d67dd7cec9ffc1682c485b0
-MISC ChangeLog 10963 RMD160 d70a288b09352708510efc9f36dff07a6bdf0c65 SHA1 8ff401fea0dd1e66c40d1f3cc3725fbba592cc1b SHA256 a0505c86dd480400f4a17c25cfb39fc901be2bbddfd2b27cda0c3037cb33e172
+MISC ChangeLog 11058 RMD160 a8c8404d4362cd8c8e893a0ea345e8f0a2ebe7f2 SHA1 ca760f1708702a4ff0c845a5a1efb14561acf71c SHA256 f4d110fc7aed6348fcf7f9b94c206258e0645080d859d5c1699981ea8818ad6b
 MISC metadata.xml 432 RMD160 2b5009d16ed172daa9ae089e59ceadabeaab5884 SHA1 4163aa67aa3d1d46b8efc21d2af85a2105f6a77c SHA256 8dadae25a4cdeedb63f94cbaf7fc6a8ce7a1950feae7047e859839d2eee30747
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvUEtgACgkQgAnW8HDreRbfxQCfbAAVb6Ys5YtG2ssa9wRZdqP5
+Xi4AmwdrTAovOtR9Cgh3OtDFd29/u5Ev
+=xqR7
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/vtk/vtk-5.4.2-r1.ebuild b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
index 9bb17d79f8a7ab2d0c8e365b00ec0811f78358ba..673901bf49be4f457743024be36e441914cd411d 100644 (file)
--- a/sci-libs/vtk/vtk-5.4.2-r1.ebuild
+++ b/sci-libs/vtk/vtk-5.4.2-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.6 2010/03/26 12:40:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.4.2-r1.ebuild,v 1.7 2010/04/25 10:00:50 jlec Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt4 cmake-utils
+
+PYTHON_DEPEND="python? 2"
+inherit cmake-utils eutils flag-o-matic java-pkg-opt-2 python qt4 versionator toolchain-funcs
 
 # Short package version
 SPV="$(get_version_component_range 1-2)"
@@ -17,7 +19,7 @@ SRC_URI="http://www.${PN}.org/files/release/${SPV}/${P}.tar.gz
 LICENSE="BSD LGPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="boost cg doc examples mpi patented python tcl tk threads qt4"
+IUSE="boost cg doc examples mpi patented python qt4 tcl tk threads"
 RDEPEND="mpi? ( || (
                                        sys-cluster/openmpi
                                        sys-cluster/lam-mpi
@@ -58,9 +60,8 @@ pkg_setup() {
 
        java-pkg-opt-2_pkg_setup
 
-       if use qt4; then
-               qt4_pkg_setup
-       fi
+       use python && python_set_active_version 2
+       use qt4 && qt4_pkg_setup
 }
 
 src_prepare() {
@@ -129,7 +130,7 @@ src_configure() {
        fi
 
        if use python; then
-               python_version
+               PYVER="$(python_get_version)"
                mycmakeargs+=(
                        -DVTK_WRAP_PYTHON=ON
                        -DPYTHON_INCLUDE_PATH=/usr/include/python${PYVER}