Python ABI fixes, #316165

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

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 0b754f5526314c06accb651c8d41373d538aa875..82bb974cf77d1c6f0c2593211d8458541fcc6716 100644 (file)
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.27 2010/03/30 07:02:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.28 2010/04/25 09:24:23 jlec Exp $
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r2.ebuild:
+  Python ABI fixes, #316165
 
   30 Mar 2010; Justin Lecher <jlec@gentoo.org> apbs-1.2.1b-r2.ebuild,
   metadata.xml:

diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 45c0a263e7711406986d2b973a299509393e1829..5920cea37f29ec2d86e003a15543d2eda6fde316 100644 (file)
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -17,14 +17,14 @@ DIST apbs-1.2.1b-source.tar.gz 40647966 RMD160 4ba1f72a7f9adcf7b283dc18743488143
 EBUILD apbs-1.0.0-r1.ebuild 1995 RMD160 0efbe531fe27749a65a23d17958c411bcd15ad74 SHA1 9ff5761e0d8d01cdb49518cdf5d3372977c0f9ad SHA256 34b2bd026da29cec1224c91d9b4c86bdac3bec95747e167b2127aa329de2f4b2
 EBUILD apbs-1.2.0.ebuild 2514 RMD160 860994d50bc8a5d1657a5f3f6fa0dfef3c1e76e4 SHA1 d917e489ecc0e245e02796097a6aef07617e73ff SHA256 4f4229963c163b60012c091e84cf456a1215680358e3852174f2a972554546bf
 EBUILD apbs-1.2.1b-r1.ebuild 2666 RMD160 147ace2cedc979ae431e0e2e83ace236c320c7a0 SHA1 7889ebff83224c531315123dae972d3e503270bf SHA256 c9b404e8870a7461b38139785f62a05db8227464fc6b6bd918467655ed959b8e
-EBUILD apbs-1.2.1b-r2.ebuild 3453 RMD160 5c1fea5796961b8b84c6cd90de2573c793469ca9 SHA1 57cfae6a2e5e5551019c1100c6b29ae6213f0c16 SHA256 f322e5608ff64bfe6fd947d665172fe8224bf9babf41cd5652946c52e6b9867e
+EBUILD apbs-1.2.1b-r2.ebuild 3512 RMD160 9209d8e909ad273417bebe30b01e38b4e8b731d9 SHA1 f586f4dd6c9cc09876d26fe9040a1d21b662dccd SHA256 82ac266610f3205f6f9620f7703d00016fc7f033a1866a55ef7677379f69d8b5
 EBUILD apbs-1.2.1b.ebuild 2583 RMD160 03d49d8d7d7a5a7ab71164e40bdde4a0c3e8632e SHA1 7712bc2d3faed84eb914d7466769be38076d11ed SHA256 9fa004e87205630e756762a82e6f6ffa969d77970aab2210b9688a8a295ef2a7
-MISC ChangeLog 4801 RMD160 b0eb1f82b1fac9ae72866a6cb9625d4dddbcb9ad SHA1 0299d162b674cff2960f135b0096f7bf81fb69fc SHA256 167ed2932a981509b4896930192684a4f00c3c3c633b257614527d9eaf221bd4
+MISC ChangeLog 4900 RMD160 69f08d06e99e1c611ddfe634fce80aebd35902b5 SHA1 d8377378aea35c9149f72b75359d051e35aad86a SHA256 cd68bde1561bd1a45372d1e740b84eb781dd5eece8eb091c210d07e2113ef31f
 MISC metadata.xml 547 RMD160 7df9b626591272a0875025ac69614734ebeaa886 SHA1 7fb86e4654460def273914edb38551efbee4facc SHA256 49c4f98a836f53297ed0efc680613a595f149b92a864ed3e7e329f93ea17116f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuxohsACgkQgAnW8HDreRbd3ACgkJ1O60un4AZlGDghX9IPHc9q
-HiMAnizMxMvgpsZi/vqMm1Zqf+ycQ9U2
-=3Uuh
+iEYEARECAAYFAkvUCk4ACgkQgAnW8HDreRbdpQCguhBBhEOMyLz3rCekgIdiJMo/
+cmMAnRfW7IaGZzF2FWgdgmz6HVbAeIvC
+=gJzI
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild b/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild
index 53d63e6bc302d12c91423d0d6999db5d2ec478ea..3fa543dbde540aae3a1925d0d1bdc3ebb536a332 100644 (file)
--- a/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild
+++ b/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.2 2010/03/30 07:02:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.2.1b-r2.ebuild,v 1.3 2010/04/25 09:24:23 jlec Exp $
 
 EAPI="3"
 
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
 FORTRAN="g77 gfortran ifc"
 
 inherit autotools eutils flag-o-matic fortran python versionator
@@ -24,7 +24,6 @@ KEYWORDS="~x86 ~amd64 ~ppc ~amd64-linux ~x86-linux"
 DEPEND="
        dev-libs/maloc[mpi=]
        blas? ( virtual/blas )
-       python? ( dev-lang/python )
        sys-libs/readline
        arpack? ( sci-libs/arpack )
        mpi? ( virtual/mpi )"
@@ -32,6 +31,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/"${MY_P}-source"
 
+pkg_setup() {
+       use python && python_set_active_version 2
+}
+
 src_prepare() {
        epatch "${FILESDIR}"/${P}-openmp.patch
        epatch "${FILESDIR}"/${P}-install-fix.patch
@@ -126,9 +129,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       python_mod_optimize /usr/$(python_get_sitedir)/${PN}
+       python_mod_optimize ${EPREFIX}/usr/$(python_get_sitedir)/${PN}
 }
 
 pkg_postrm() {
-       python_mod_cleanup /usr/$(python_get_sitedir)/${PN}
+       python_mod_cleanup ${EPREFIX}/usr/$(python_get_sitedir)/${PN}
 }