Fixes for PYTHOON ABI, #316257

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

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 08a8bf54e83481ca48cde24b46a570656c51d13c..037cc198e26b483b33c305dadd3b3035eeeb2143 100644 (file)
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.48 2010/05/12 12:59:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.49 2010/05/21 09:13:11 jlec Exp $
+
+  21 May 2010; Justin Lecher <jlec@gentoo.org> paraview-3.6.2.ebuild:
+  Fixes for PYTHOON ABI, #316257
 
   12 May 2010; Samuli Suominen <ssuominen@gentoo.org> paraview-3.6.2.ebuild,
   +files/paraview-3.6.2-libpng14.patch:

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 0d6827c4a299d11262d26d20592971af1a9f05fc..776f2b0d311498cd8b77f185ad9166a5e6f15ff8 100644 (file)
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX paraview-3.6.1-assistant.patch 1122 RMD160 4f6ecb6bd6105b3b4a5a7848782cfe92e6741d18 SHA1 81b47c0a30336fbfb45d55f2480474c994d7f820 SHA256 62fbe1310ee8f0c2405ff12cfe9edb50100e654678e7fb823f78084f284130d3
 AUX paraview-3.6.1-hdf-1.8.3.patch 2763 RMD160 f6a557565e75541e74b7052cdbd797e56e39f85b SHA1 d70f2b2715b3cebecb2db82d8c05b60fbb0220d1 SHA256 97247cc3fcb887de3bbf73a80ecda270c7f282802c365b21f20c518b76f2d3be
 AUX paraview-3.6.1-install-fix.patch 6861 RMD160 4c65e8f95670a740b67146cbf943e8d6340e4857 SHA1 17d02c81884f5a1c56832a26026265e53aa18566 SHA256 aa991a873f3f692981df75ff20dc67d55ab38fc8de2ee3b11d05326419d4b2c1
@@ -23,6 +26,13 @@ DIST paraview-3.6.2-openfoam-r173.patch.bz2 54275 RMD160 930785f07883a2fc952569a
 DIST paraview-3.6.2.tar.gz 28323172 RMD160 0f14419100d6d7fd7cc0ca3d385da41397a96da8 SHA1 5a2fad2bd2eaa39dbcbd3f592edfaedb780f63ff SHA256 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04
 EBUILD paraview-3.6.1-r1.ebuild 9571 RMD160 b3f54c931f6f1d1ea0b021f1e47c92910613c65e SHA1 2ce54d3de1ccc2a156ee699c9fa4b399c697318a SHA256 efd2af6317b8b4ac710f11c1b54a341cf74affe5b02546bba0ec58efcefaf24e
 EBUILD paraview-3.6.1.ebuild 9491 RMD160 f7677e326122f8303452f2e04be6b5594d63d685 SHA1 7150ec41d01de82c381e4335d048b09bf7b04f6a SHA256 79c2ad8a1b7ebc7f3abe2f628c7ee15fc304a161c307f042b9e4ad631410c970
-EBUILD paraview-3.6.2.ebuild 9473 RMD160 3ee6c6a0574299a2b5f773252892e9f26ed00bd7 SHA1 20a06d6050d32418e38dec84a914cc4408d5a963 SHA256 b3875b653da2c46178e1bc5300e5b28f1258f0d36293dbf1b337c5181e924726
-MISC ChangeLog 10621 RMD160 deb14c917312654d9e36fbfd9d1f13ddf637ad7a SHA1 23ec838babace73e6b38538f30413f1f4983a386 SHA256 6592e3b38308904cb9dff11fac66c7dc08a0247cee3ae8feab13a676dcab3550
+EBUILD paraview-3.6.2.ebuild 9509 RMD160 11d9fad21254c3cd33be25b44e3a7398f9ea3465 SHA1 05501cc437092086b2e17ddd856cad5ac7d86516 SHA256 a2f342193893ca28b238a8d91c37da352f4f426e4d9373b3b8768920298ef1e1
+MISC ChangeLog 10720 RMD160 5ff2b9dc1b8a8fd1a36cfc3a5aebbe2ffc052ffe SHA1 48f3776acc21b734ec6688ad3b91b6d5fa8fc12f SHA256 217a9b5660b1711e3e75b42ae3d9b8f2a1adc803faa5c21d9fb1a479bd147c21
 MISC metadata.xml 665 RMD160 e1e973749b838df0d1e6f08874c7e29f45a18381 SHA1 4be610c3d1f9eeca08ad57eedc90f937f69c5d39 SHA256 07414d0fbe0b6091fe16769a967d1b5b6e20c40e6c871f7e31f2135b11b5d932
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkv2TqwACgkQgAnW8HDreRZ5OACfeEYhtfcsyhXi4xlsKDIjPAMt
+TR4An0m+F3tqfaB0LVnvQe8Te+xhMch9
+=eEPf
+-----END PGP SIGNATURE-----

diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index 062f3ad6438652c8ab294bf7702b16bd644d3d8c..7e3d5a4647701c9249061a62fb8e6f70daeb56cb 100644 (file)
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.2.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-visualization/paraview/paraview-3.6.2.ebuild,v 1.6 2010/05/12 12:59:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.7 2010/05/21 09:13:11 jlec Exp $
 
 EAPI="2"
 
+PYTHON_DEPEND="python? 2:2.6"
+
 inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4 cmake-utils
 
 MAIN_PV=$(get_major_version)
@@ -23,7 +25,6 @@ RDEPEND="sci-libs/hdf5[mpi=]
        mpi? ( || (
                                sys-cluster/openmpi
                                sys-cluster/mpich2[cxx] ) )
-       python? ( dev-lang/python:2.6 )
        gui? ( x11-libs/qt-gui:4
                        x11-libs/qt-qt3support:4
                        x11-libs/qt-opengl:4
@@ -56,6 +57,7 @@ pkg_setup() {
        if (use overview) && (! use gui); then
                die "the overview plugin requires the USE='gui'"
        fi
+       use python && python_set_active_version 2
 }
 
 src_prepare() {