sci-chemistry/pdb-tools: This package cannot be installed for multiple py abis

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 26 insertions, 14 deletions

diff --git a/sci-chemistry/pdb-tools/ChangeLog b/sci-chemistry/pdb-tools/ChangeLog
index bf641223c83c..165a45256640 100644
--- a/sci-chemistry/pdb-tools/ChangeLog
+++ b/sci-chemistry/pdb-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/pdb-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.9 2013/04/16 08:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.10 2013/04/16 08:57:43 jlec Exp $
+
+  16 Apr 2013; Justin Lecher <jlec@gentoo.org> pdb-tools-0.1.4-r4.ebuild:
+  This package cannot be installed for multiple py abis
 
 *pdb-tools-0.1.4-r4 (16 Apr 2013)
 
diff --git a/sci-chemistry/pdb-tools/Manifest b/sci-chemistry/pdb-tools/Manifest
index 250099b9b9e0..ed0dfe8b61d5 100644
--- a/sci-chemistry/pdb-tools/Manifest
+++ b/sci-chemistry/pdb-tools/Manifest
@@ -3,13 +3,13 @@ Hash: SHA512
 
 DIST pdb-tools_0.1.4.tar.gz 101510 SHA256 6aeb9e76747147f840ac76e29b7a9494304e4aee2c18d3f104b2e93a272b8f41 SHA512 385633391ad0d5d91e56624bf0a7fb13df2860f1e6a5f84f6f5ffa773041d4a912764cab1b266be581fa96baa27a7407a42133919232a2f0381eb30c99c791de WHIRLPOOL 06d7443a22aa23b0c5a3bfde41bb9f85a13bb5b05d7f6e5142088a47e1680cd84599e606d17b22bc21793abf3d620a6bebe780b3c6f112f36b1694b7599ab5f0
 EBUILD pdb-tools-0.1.4-r3.ebuild 1900 SHA256 95336505ac3b41c3ba72895043dd32f577843a817bcacc63d11990b0c04cfef1 SHA512 2a5057cfe9140fb796e9abadd2c1c7b83ae13081acb9c38217c2c18069b659970a258b97c90950a99c8ec34b7d87e0f2d716152a4db6cb49c27e5e8d93bf018e WHIRLPOOL 58a963038c563730287bed24611494ede28c14d605480ca4b5c067eb4fe5336b2c9314237c256a575db0c03ee055afb78a0425b3054607f23268cd084399eed7
-EBUILD pdb-tools-0.1.4-r4.ebuild 1592 SHA256 14bc1eafbe2df492b494c09d838100d4453b26d9affd823375b773459ecc67d2 SHA512 f84bc2e13c5a6b1cbc9969a3007dc77f542d9f25d37793be2cfe7927b9e381823645f4113f66a6a034ca4ba5f76dd5e89964c88c4251030c428659cd1f7e3d7d WHIRLPOOL 527db39f1b9def7fe5755317bf32da6d21a31e19f81cac886aa551980e54887068108d5fb65054914c834b51f99163a105397d4922bb9441a88a8245da3b56d3
-MISC ChangeLog 1555 SHA256 c2163051b0d90db5440ce93461d24f6878a00b9fe475be62b787af0aca28b0f7 SHA512 49cf87285029247570b8e332012202f821936e9d9bee6c3bc78491b55fb1ec6202bf143cd6db0ff010ec80f7031f014f80de5aa5bb95d3ec4dd57b4cc1da2b5a WHIRLPOOL 91991f54591ebac6effd529b6a596e4bd9ab66f40b6b800f404a775dce5d5a0ae102c1f21ad1493ef69ea6a34061c4b791254f70ac4fdab1dc51551a2b7048c4
+EBUILD pdb-tools-0.1.4-r4.ebuild 1701 SHA256 5322f83830eb523308e72bbda7e97732ce7bfd503644577a364bc4450a7b59d8 SHA512 5c15ffbc6876d770bc058c39b15ac8e228aee053049eeeb06ceb2d2f3a6593fabf3b2eca04852402a3da5c5059d9f15fa7eb40c95b2bab84bbd418559060248e WHIRLPOOL 0c472e75d2010796740eb8c21066d2e282c0d0a666b1c6712d86ed185cd1b4df329e4d4ca21aa8dffa43c2d076ffeef804c83be43c5e73b26d31abed3b71e98f
+MISC ChangeLog 1687 SHA256 9cfc65ba108b5e85933ad0762e0754c0072ee7f16a369419a5fc983e38ee347d SHA512 3f95eb5ecaa666caac1b9b24e4434c322c4c6ad8b9033a41d5dc7238b27bd45bfb585592074a7e38bc407738c6c8e7b56db8d5f83104b03291e3edf52ad0d398 WHIRLPOOL ede96abc57f59cb8b562e282fe2877640f92979abebf0dedf52c36649133b4da92b84dcc96ccc15fdf4215de86942208fcf29d4195d2262d4e6fc0c3b44f454c
 MISC metadata.xml 317 SHA256 1c5c79ef17bf870aaf18731dc2929fa10ea7ab7df24599babce0d9ed2ec22876 SHA512 ad9c2c8cc534f0e0fa329414c2eec4169dc2447cbe34322c79c5f79497de468de4127b9b8e83eaa9141c86df5eaeb56214ce11656dc4a84636268015b9720b36 WHIRLPOOL 00f84b3887669bf66062c3b4c8684f96c81505d2f0e3bfe6341b13e97064ec5c555e592a86c046fffbd1f001abed9afbb1b29dd817b1d39d4efc46ddf7dfdef1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFtDqcACgkQgAnW8HDreRZhXwCeIcY+anFTdqNQvYyGL1g7HPyL
-+pQAn29lrhY1nXoVXa0RAvgIEnp+UjU4
-=yYg5
+iEYEAREKAAYFAlFtEokACgkQgAnW8HDreRYwLACcD5/rbLWO5SyPt/bkfl4GiQpk
+wg0An3/VHST6TCeP57dTsu9bD+elJteJ
+=wDoE
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r4.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r4.ebuild
index 67ab5082e64e..f7a2ea08fefa 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r4.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 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-r4.ebuild,v 1.1 2013/04/16 08:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r4.ebuild,v 1.2 2013/04/16 08:57:43 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} pypy{1_8,1_9} )
 
-inherit fortran-2 python-r1 toolchain-funcs
+inherit fortran-2 python-single-r1 toolchain-funcs
 
 DESCRIPTION="Tools for manipulating and doing calculations on wwPDB macromolecule structure files"
 HOMEPAGE="http://code.google.com/p/pdb-tools/"
@@ -22,6 +22,11 @@ DEPEND=""
 
 S="${WORKDIR}"/${PN}_${PV}
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+	fortran-2_pkg_setup
+}
+
 src_prepare() {
 	sed \
 		-e "s:script_dir,\"pdb_data\":\"${EPREFIX}/usr/share/${PN}\",\"pdb_data\":g" \
@@ -50,14 +55,18 @@ src_install() {
 	doins -r pdb_data/peptides
 	rm -rf pdb_data/peptides || die
 
-	for script in pdb_*.py; do
-		python_foreach_impl python_newscript ${script} ${script%.py}
-	done
+	python_domodule helper pdb_data
 
-	python_foreach_impl python_domodule helper pdb_data
+	python_moduleinto ${PN/-/_}
+	python_domodule *.py
 
-	python_moduleinto ${PN}
-	python_foreach_impl python_domodule *.py
+	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
 
 	dobin bin/*
 	dodoc README