Python ABI fixes, #316183

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

diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest
index 44c34c9a9fabee3f8774727cab4d3e3ec43421fc..7f439b6c8f76ea0bcc42afbbfddd203aea170b23 100644 (file)
--- a/sci-chemistry/viewmol/Manifest
+++ b/sci-chemistry/viewmol/Manifest
@@ -7,13 +7,13 @@ AUX 2.4.1-look-for-python-in-right-place.patch 866 RMD160 cc62c43ef5a9a84b389b3a
 AUX 2.4.1-remove-icc-check.patch 1214 RMD160 b6e1f7fe33b5d21f9fcffb5da63563b8f7236cdd SHA1 4748df9fe707ad8b200de2a705e0ddab814a3b6e SHA256 4c0f638a44ee74093103a8f3b9e94252b31c0eff875596aade43eb7c2faf06c7
 AUX 2.4.1-use-root-for-app-defaults.patch 827 RMD160 109cf436c73bb732f89c16f206892b2297a20ee7 SHA1 17ce44db692b61c635719f32bc90d8a36f95bb06 SHA256 c7e82343c254a38e61fee72e5e86ecd86339e56e783255a5d882bcff38937094
 DIST viewmol-2.4.1.src.tgz 2229379 RMD160 d63d1a6aa2ab9212874cf9bae82a238a440aba47 SHA1 8e6c55bd1381db076706e19df44fc8e7d3a6b9aa SHA256 dfed3eed6441d89c4bf2be1c13cbe263341c8880edf1742d446fc0f8f4a99e19
-EBUILD viewmol-2.4.1-r1.ebuild 2197 RMD160 7002f9d7c7dc229b3129efd262c7da695d6c4517 SHA1 2fdf80d3dff1e791b4ad904206704a730a045dc0 SHA256 a2d1208a3359274f6e0acdc68361ac4036eeeb9d14f0c92cb455dcccf8bde469
+EBUILD viewmol-2.4.1-r1.ebuild 2254 RMD160 1b3732b87d5385687eca41131ce57d08add9ccdc SHA1 eab3fa2c4425a52a0eed5cafeb3efb60329bea45 SHA256 abfc38b0f74947dae743ba53e7b7e8e521d652bbad686d7b2be90134a05c3ff7
 MISC ChangeLog 1848 RMD160 cd35b3c4c997b5d8cd6333e5a567558988fbb4f1 SHA1 858da582853e75bd49d8eb3a4b3ca3dc39b45856 SHA256 41fc55eea2010b0cfe7664385c1ad4fd6b0c3326fa926dbed42248a2bffed253
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuYolkACgkQgAnW8HDreRZMdgCdH7oaShEw6uuVU6vhunCSBrsh
-Rp0AoM/4wd4tkpqS509Vxvv+x0QywtHW
-=8K+f
+iEYEARECAAYFAkvUHv4ACgkQgAnW8HDreRY7/gCfaX1Mf5LGWDGL/BFe0/OJWtq8
+K54AoJ3whIUGNDnHPI0O1izfuFvGtq5V
+=wHpo
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
index 4e2eb952023ed584bb623d1a763fadabd7c0fa81..10525f19fa7b1df22139e38cb395537c5902bd08 100644 (file)
--- a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
+++ b/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild,v 1.1 2010/03/10 17:09:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild,v 1.2 2010/04/25 10:52:40 jlec Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/viewmol/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}/source"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_prepare() {
        epatch "${FILESDIR}"/${PV}-remove-icc-check.patch
        epatch "${FILESDIR}"/${PV}-change-default-paths.patch
@@ -71,9 +75,9 @@ src_compile() {
        pushd $(uname -s)
        emake viewmol_ tm_ bio_ readgamess_ readgauss_ readmopac_ readpdb_ || die
        popd
-       ${ERPEFIX}/bin/bash makeTranslations || die
+       "${ERPEFIX}"/bin/bash makeTranslations || die
 }
 
 src_install() {
-       ./install ${ED}/usr || die
+       ./install "${ED}"/usr || die
 }