important fix and Support for Python ABIs

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

4 files changed, 49 insertions, 26 deletions

diff --git a/sci-chemistry/hollow/Manifest b/sci-chemistry/hollow/Manifest
new file mode 100644
index 000000000000..f93ff14dd729
--- /dev/null
+++ b/sci-chemistry/hollow/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST hollow-1.1.zip 58269 RMD160 11082e48c0ba8dc2ab72d324cb28e2508086d2a6 SHA1 3e27918cf4ee4b04429601d8171da32351194aa1 SHA256 d83615947a9287d562cbf83de56baad671103ddd556332ec093148e77bc00a65
+EBUILD hollow-1.1.ebuild 1122 RMD160 fa06b3f8c45e141e036a5e9129eb48e29e0848b6 SHA1 e07585511ec376c1a9be60747e799693e0d50a64 SHA256 344b7ff84133db3b66a43ef0515abc0370a1298f8771d94ad3d06712cbc0b066
+MISC ChangeLog 338 RMD160 5dc8a04ce950561d1c599e9b736b14d7e94c83a8 SHA1 56647bc7d5069d892158255b1a69fda54e2c4a8e SHA256 00fddae9fc4bc7a957017e695101e72f3d5ea28445d26db7bbd671ebe81bf1fe
+MISC metadata.xml 227 RMD160 3acbd5c8f8b3919c46f20caa913fcc0df192a132 SHA1 da018b87c941fd3145bcb6917d5a03a6bf1933ae SHA256 d8c99db5ebfd6eb7f2fa8ee7077e65c441024c861ec92dcc86a510ff68495d53
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzJ110ACgkQgAnW8HDreRbcpACgw1ldrbfbnFD6MrfcPU3Qybjw
+8gAAnixco3EbGIElzX7tSzzbp4tbE6Gy
+=k4WX
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pdb-tools/ChangeLog b/sci-chemistry/pdb-tools/ChangeLog
index 208f29c57e01..455851ac3ab9 100644
--- a/sci-chemistry/pdb-tools/ChangeLog
+++ b/sci-chemistry/pdb-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/pdb-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.2 2010/10/28 16:43:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.3 2010/10/28 20:01:39 jlec Exp $
+
+*pdb-tools-0.1.4-r2 (28 Oct 2010)
+
+  28 Oct 2010; Justin Lecher <jlec@gentoo.org> -pdb-tools-0.1.4-r1.ebuild,
+  +pdb-tools-0.1.4-r2.ebuild:
+  important fix and Support for Python ABIs
 
 *pdb-tools-0.1.4-r1 (28 Oct 2010)
 
diff --git a/sci-chemistry/pdb-tools/Manifest b/sci-chemistry/pdb-tools/Manifest
index 1d22f8d11af0..d0df6c9d10a3 100644
--- a/sci-chemistry/pdb-tools/Manifest
+++ b/sci-chemistry/pdb-tools/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST pdb-tools_0.1.4.tar.gz 101510 RMD160 7c5c5f6ce5a214cf99bcc28d8bd6feccf3598b59 SHA1 f61df28dd009d91b974bf42567e0458bee5e39ef SHA256 6aeb9e76747147f840ac76e29b7a9494304e4aee2c18d3f104b2e93a272b8f41
-EBUILD pdb-tools-0.1.4-r1.ebuild 1788 RMD160 a663424af2b1b5ab5b6c8c6a256d62ace7685ad4 SHA1 22ccd733a41f0ee4870740f4e638f7e29a9852ad SHA256 f8e27d57cb6cc4460f242ec731e47d78ee865cc0fcd43e179df8826c5bfb0a01
-MISC ChangeLog 508 RMD160 d2f3245f18bad12ae04f3d7d845dda5369ad4447 SHA1 b71f2d5d51e523b3da37564581802b01a28f1939 SHA256 14661920a96995df6ad4c26b0c375f76500ce76e3a00970d92fdee42cfd2e3a9
+EBUILD pdb-tools-0.1.4-r2.ebuild 1862 RMD160 264337cdf154e316293ee50fb63b012604f8020b SHA1 7a806b55a596f767765a1d851ed2e6c5b252e117 SHA256 20e3285d8f077c6ec5382157df42e9d514434cc14c0e025944f8e4aeb219c2aa
+MISC ChangeLog 693 RMD160 943e55f6e6318ac008f32dd26d417cbc03a28642 SHA1 15dfb9da6a7a7ac7395c23ae03583555cb833a94 SHA256 130c9ed9b19ffaea97bbed79278cdedc29f00f7a12f1c80a2ce21dd2bbe7df1f
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzJqDMACgkQgAnW8HDreRZUJwCgn52aV6cB8xOtbqjB+IYRdTtu
-++sAnAlD/UdDpQ88ppKVjUEwwrBYiJGz
-=lyja
+iEYEARECAAYFAkzJ1qkACgkQgAnW8HDreRbltQCfS791Zw7nODsQLFRFkrwDALSj
+A/sAoIkAyF6LuLBUq/aiUI3akCiMf56e
+=dA3C
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r1.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild
index 84d913416243..40de5820edb0 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r1.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r1.ebuild,v 1.1 2010/10/28 16:43:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r2.ebuild,v 1.1 2010/10/28 20:01:39 jlec Exp $
 
 EAPI="3"
+
 PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit python fortran
 
@@ -12,7 +15,7 @@ HOMEPAGE="http://code.google.com/p/pdb-tools"
 SRC_URI="http://${PN}.googlecode.com/files/${PN}_${PV}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE=""
 
@@ -23,14 +26,7 @@ FORTRANC="ifc gfortran"
 
 S="${WORKDIR}"/${PN}_${PV}
 
-pkg_setup() {
-	python_set_active_version 2
-	fortran_pkg_setup
-}
-
 src_prepare() {
-	python_convert_shebangs -r 2 .
-	PDB_PY="$(ls pdb_*.py)"
 	sed "s:script_dir,\"pdb_data\":\"${EPREFIX}/usr/share/${PN}\",\"pdb_data\":g" -i pdb_sasa.py || die
 	sed "/satk_path =/s:^.*$:satk_path = \"${EPREFIX}/usr/bin\":g" -i pdb_satk.py || die
 }
@@ -51,25 +47,32 @@ src_install() {
 	doins -r pdb_data/peptides || die
 	rm -rf pdb_data/peptides || die
 
-	insinto $(python_get_sitedir)
-	doins -r *.py helper pdb_data || die
+	installation() {
+		insinto $(python_get_sitedir)
+		doins -r helper pdb_data || die
 
-	for i in ${PDB_PY}; do
-		cat >> ${i/.py} <<- EOF
-		#!${EPREFIX}/bin/bash
-		$(PYTHON) -O "${EPREFIX}"$(python_get_sitedir)/${i} \$@
-		EOF
-		dobin ${i/.py}
-	done
+		insinto $(python_get_sitedir)/${PN}
+		doins *.py || die
+
+		for i in pdb_*.py; do
+			cat >> ${i/.py} <<- EOF
+			#!${EPREFIX}/bin/bash
+			$(PYTHON) -O "${EPREFIX}$(python_get_sitedir)/${PN}/${i}" \$@
+			EOF
+			dobin ${i/.py}
+		done
+	}
+
+	python_execute_function installation
 
 	dobin bin/* || die
 	dodoc README || die
 }
 
 pkg_postinst() {
-	python_mod_optimize ${PDB_PY} helper pdb_data
+	python_mod_optimize ${PN} helper pdb_data
 }
 
 pkg_postrm() {
-	python_mod_cleanup ${PDB_PY} helper pdb_data
+	python_mod_cleanup ${PN} helper pdb_data
 }