sci-chemistry/pdb-tools: Drop old, #478590; mv generic helper modules to PN subdir, #480026

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 33 insertions, 184 deletions

diff --git a/sci-chemistry/pdb-tools/ChangeLog b/sci-chemistry/pdb-tools/ChangeLog
index 7add3d4224e8..4dff4a33eced 100644
--- a/sci-chemistry/pdb-tools/ChangeLog
+++ b/sci-chemistry/pdb-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/ChangeLog,v 1.17 2013/08/11 12:14:34 jlec Exp $
+
+*pdb-tools-0.2.1-r2 (11 Aug 2013)
+
+  11 Aug 2013; Justin Lecher <jlec@gentoo.org> -pdb-tools-0.1.4-r3.ebuild,
+  -pdb-tools-0.1.4-r4.ebuild, -pdb-tools-0.2.1.ebuild,
+  +pdb-tools-0.2.1-r2.ebuild:
+  Drop old, #478590; mv generic helper modules to PN subdir, #480026
 
   07 Aug 2013; Michał Górny <mgorny@gentoo.org> pdb-tools-0.1.4-r4.ebuild,
   pdb-tools-0.2.1-r1.ebuild, pdb-tools-0.2.1.ebuild:
diff --git a/sci-chemistry/pdb-tools/Manifest b/sci-chemistry/pdb-tools/Manifest
index 662d2cddb7f2..224d58ae16a3 100644
--- a/sci-chemistry/pdb-tools/Manifest
+++ b/sci-chemistry/pdb-tools/Manifest
@@ -1,30 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST pdb-tools_0.1.4.tar.gz 101510 SHA256 6aeb9e76747147f840ac76e29b7a9494304e4aee2c18d3f104b2e93a272b8f41 SHA512 385633391ad0d5d91e56624bf0a7fb13df2860f1e6a5f84f6f5ffa773041d4a912764cab1b266be581fa96baa27a7407a42133919232a2f0381eb30c99c791de WHIRLPOOL 06d7443a22aa23b0c5a3bfde41bb9f85a13bb5b05d7f6e5142088a47e1680cd84599e606d17b22bc21793abf3d620a6bebe780b3c6f112f36b1694b7599ab5f0
 DIST pdbTools_0.2.1.tar.gz 103835 SHA256 317a5246e806a2b3d0425d080d679646fc77388e3e855412527603f945fa37ae SHA512 9c43c10e8739f8a34dbb1a3bba710cc727f7d8392ff979681371bd4460c67203253fb01852438eb93b214c4a009789608d200ca551f30399652fb76d702cf724 WHIRLPOOL 36d8cf71ba9f9b28e3ad59828539f4e94bbb8bc4514f050ddcbec63857b154ecdc7c32c2945c0d15f4d718c4fe5ab3adcb2e62a4368bfd819b80e9641a9dfd88
-EBUILD pdb-tools-0.1.4-r3.ebuild 1900 SHA256 95336505ac3b41c3ba72895043dd32f577843a817bcacc63d11990b0c04cfef1 SHA512 2a5057cfe9140fb796e9abadd2c1c7b83ae13081acb9c38217c2c18069b659970a258b97c90950a99c8ec34b7d87e0f2d716152a4db6cb49c27e5e8d93bf018e WHIRLPOOL 58a963038c563730287bed24611494ede28c14d605480ca4b5c067eb4fe5336b2c9314237c256a575db0c03ee055afb78a0425b3054607f23268cd084399eed7
-EBUILD pdb-tools-0.1.4-r4.ebuild 1766 SHA256 ee11c2532c6496f84f774dc9a5241d2881cfb0201a6651100840cd37fcd2590c SHA512 22ea45c79d8b2e12f11b7ac087bf719adfbcdce18a8033cfc7794f8e25c5c5d74139238c12fa4515edbc02b2e53b2772d12412ef8293642e27e5ef628e824451 WHIRLPOOL 8ce399a000d5dd2259efaa6b93585665a63bb3f3e26bed47e2fcb90733cc94a118d9ed063dfac296cec107e15f77a662a6a886b0eba3e3197c120953c3c33afb
 EBUILD pdb-tools-0.2.1-r1.ebuild 1812 SHA256 0e68adc731dfdafba2574246cec627678bbe4bb126e169e92d839f84d923adf6 SHA512 ab25e2bbbe2310b0bda4b66e1720dbcacb74ba784950a5a280fe7133bebe0d9d7c0ed18cc3835b216bd53aaaaf094fca5a7f86e2a884c8ffa875c77b472e8dbf WHIRLPOOL ec5f7f47a475f3e2523dc334b767b943b1a67021c5cfdc4500a88df71d0bcabd441f7473a8f5d4c0f514498a63cc684fdfcc88e4ae19b1863b4365ce2c1b5369
-EBUILD pdb-tools-0.2.1.ebuild 1813 SHA256 b8cd52eacdf34a0a84d01a5f4dbb3bb7e9804d650c96befbd9d4e1019e0f6014 SHA512 188e6e4dbf009f1e096efbbf3ce55c9f51fe6fdc0ffa8c32806d96990ded7dab4802397551f909fe4a542e8c8980a9a4bf2be2277c7aecf1db27bec8fd3f9f30 WHIRLPOOL 31a5001c5afdf076ac2248f31712b525d249bbf3b7b3e4789d47d5d1eb5594ccd88014dacb33a1353e1d7c0c180cf83e8b75c868017752f7ad429fcf06f8005a
-MISC ChangeLog 2528 SHA256 22f290bfc2619117a2790b77902ded7cb0a750f11db2dfb16d048aaccf7e9048 SHA512 4d4fffc6bb7120f97274a1ee9dcf2002175196a1a537ab8f67cac0efe5ca33b0509759822cf6abc42b7a548d841c560b7ffbeff8c358697312aa13ec22fc4331 WHIRLPOOL 84cb4a345b82d856cbd7300ffe27b2e481819ecb666daa18184276afaa553a3294d39877c095189ac43897140a6834edadb7e9c111e84762647aac8ab8359f7f
+EBUILD pdb-tools-0.2.1-r2.ebuild 1880 SHA256 3f5e51590cb3191f19508c9692d1de7d5554fa2fdc7ae907814443df5d628d85 SHA512 ec6ad5d9e31b3bbb23d08d1acae23eebeef27aedc2197c5824083ee1f6348d35e3951090d78df00997bf2d2c7888620a435b801187f529ff32f591e8f1b350f7 WHIRLPOOL f0bf26609f9c4dfe04c178c769e244c14cbb38231b17c7e97a95fd7774910ba589919e0ea6baacec74b21de47b02118cf7a3c8a6bb05bc2a1474b2094565004a
+MISC ChangeLog 2791 SHA256 cbe9b4e82fe9ae4747c52e45b4498f2b78e944bc911feec621d3c6b641d3ce21 SHA512 f49cd47fff880f522361131f2ebc12d21e41f23282444361206ad0b482652720964dbdf44598f174b56e0435a489242f15a9c3c77561e6f0edc00700ced5d072 WHIRLPOOL 2220dd2f8aed43bbaf3b3b6d62ca7860610f50234dc56079f3d2a4070b56fdc99f4763491a909c8ee957037b2b1c0009e3cc78fc4c9b913c609c448ad49adc55
 MISC metadata.xml 317 SHA256 1c5c79ef17bf870aaf18731dc2929fa10ea7ab7df24599babce0d9ed2ec22876 SHA512 ad9c2c8cc534f0e0fa329414c2eec4169dc2447cbe34322c79c5f79497de468de4127b9b8e83eaa9141c86df5eaeb56214ce11656dc4a84636268015b9720b36 WHIRLPOOL 00f84b3887669bf66062c3b4c8684f96c81505d2f0e3bfe6341b13e97064ec5c555e592a86c046fffbd1f001abed9afbb1b29dd817b1d39d4efc46ddf7dfdef1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSAjXCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDnNcP/Rp0SeMC6kqDRkkSV6Qvd14N
-ogxnjaffw7HGSq5St9gsi0PWhDIlA5xxitu+W24nt+N/gFXP9bOl0gt1UFXCxo3O
-ybcYXNQ34GzmFGwGW/ARMqYddRl4SSiqy+mNHOA4m9D19njDasZfCqvKFL37PGJw
-22HNrGrt2wAu4yNFO8JDQQOaCeBJosMCefFkEJFwIiVnURi/bSDXrOfVsw7DKn20
-1ZUCOTM6mStRjFP1GM15TzjD6TlC7XJCe6JgbyktS4gYW7xbNmpO807u6jblvS79
-0CgUv+CysikR2qw0d3rqi+C66aqLCv0aEZKFLFnZJXXWCG1nUjh+S5aEAo2kvean
-vdYSgw6stvVdyp0OrEsWMfGtYxcVeq7YRU6AM+vwgHphIw57jvqAPIJ7bcG4URB4
-s+qIdcIhmaD8uc3u0BUa+hL4UYuAZCDYzAfLSCtNsGlXUGuNEbKSDjZlSYUqoz4I
-oA9XCDvFBOrJKXvrAuK7A2ygLHfPEYR/80Uy1OcFmthLoeW5ET3SR4ba3R9MWz6k
-tsNCKQ1MXEdNbd/Y/+nOuTnLBl7tliJ1KIZG+QQvlf7lwLKsle+CMxLlG3wZSgrM
-wryuCLc1XTwQkYlYBIzIbyVhcyHC3OBK/R/+TLrxahuwm/ojCF0AUjc0wHDjjeZ2
-sGi+GfsIhjdwqAAGauJF
-=/1Yo
+iQIcBAEBCgAGBQJSB4ArAAoJELnU8jG9FVirDPkP/2g5vWZBdyFuZQ33QMyF5V4+
+m/omCf43SyOI4Y5Vs704mTF6U7yKgG6fJujOBvjEhE+NnwGYIGgmoSYlYjWqWWHE
+l0OOc35V9G5Se5MoVUn3u5tha+PaX1s+O2MUIAA8UpW76E6v7wuYoEdTL7jPF2pI
+zPMVv7pdjSFyCs0OZ43G79NQwggw7RwxSkXkAoizCYPJm1L/DbLY8XAnTOO3yOUn
+xKpTfzFk509qhxwkYqvHHsrZSGkCn2zWxjtg/E6wUw21/5K8dfJWwW91mGVDva3j
+hv1rz+ukw/JxxfI8k+VKSrjYlAzFJIOCpfvZNRBP+c3zfolcsIJXBtF5DVhRx06H
+jvL9JWadBIClLDuIkjVC4rvwoy2getFOejbG5NEQ/CqqjC4rYZ42LbfsrrEtp1Zv
+2ZhsezXl0eLbhqfv01BD1HNdj8Ss5OLNI9u/fex6SAQx/xE2jH6E4DXKqKH8NJWk
+8PvWglRqXIkBsqWZN9k4Tr3OeOndY9yUUxgR88aGjn0Vyc5PIr+Xy+TR4QXg0TiY
+Nfc7S1XZbuEIowxsuE5KMlSvPulVfmh3rhATgPnZTcPj40WtEqP4uH/lEhmchooi
+h3s/9Zx73CQ/0VJFY7pJ3R3ISTmtpLyONHYazGs2QZpVACTG/Fvw9z2D7luFfBdG
+jWtVzHEmSSEAhgIhIk/s
+=rP7d
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r3.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r3.ebuild
deleted file mode 100644
index 43176a6a74aa..000000000000
--- a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 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-r3.ebuild,v 1.2 2012/10/19 10:11:54 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit fortran-2 python toolchain-funcs
-
-DESCRIPTION="Tools for manipulating and doing calculations on wwPDB macromolecule structure files"
-HOMEPAGE="http://code.google.com/p/pdb-tools/"
-SRC_URI="http://${PN}.googlecode.com/files/${PN}_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sci-chemistry/dssp"
-DEPEND=""
-
-S="${WORKDIR}"/${PN}_${PV}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	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
-}
-
-src_compile() {
-	mkdir bin
-	cd satk
-	for i in *.f; do
-		einfo "$(tc-getFC) ${FFLAGS} ${LDFLAGS} ${i} -o ${i/.f}"
-		$(tc-getFC) ${FFLAGS} -c ${i} -o ${i/.f/.o} || die
-		$(tc-getFC) ${LDFLAGS} -o ../bin/${i/.f} ${i/.f/.o} || die
-		sed "s:${i/.f}.out:${i/.f}:g" -i ../pdb_satk.py || die
-	done
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r pdb_data/peptides || die
-	rm -rf pdb_data/peptides || die
-
-	installation() {
-		insinto $(python_get_sitedir)
-		doins -r helper pdb_data || die
-
-		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 ${PN} helper pdb_data
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN} helper pdb_data
-}
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
deleted file mode 100644
index b29c0f8c4f75..000000000000
--- a/sci-chemistry/pdb-tools/pdb-tools-0.1.4-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.4 2013/08/07 11:55:07 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy1_9 )
-
-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/"
-SRC_URI="http://${PN}.googlecode.com/files/${PN}_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sci-chemistry/dssp"
-DEPEND="${PYTHON_DEPS}"
-
-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" \
-		-i pdb_sasa.py || die
-	sed \
-		-e "/satk_path =/s:^.*$:satk_path = \"${EPREFIX}/usr/bin\":g" \
-		-i pdb_satk.py || die
-}
-
-src_compile() {
-	mkdir bin
-	cd satk
-	for i in *.f; do
-		einfo "$(tc-getFC) ${FFLAGS} ${LDFLAGS} ${i} -o ${i/.f}"
-		$(tc-getFC) ${FFLAGS} -c ${i} -o ${i/.f/.o} || die
-		$(tc-getFC) ${LDFLAGS} -o ../bin/${i/.f} ${i/.f/.o} || die
-		sed \
-			-e "s:${i/.f}.out:${i/.f}:g" \
-			-i ../pdb_satk.py || die
-	done
-}
-
-src_install() {
-	local script
-	insinto /usr/share/${PN}
-	doins -r pdb_data/peptides
-	rm -rf pdb_data/peptides || die
-
-	python_domodule helper pdb_data
-
-	python_moduleinto ${PN/-/_}
-	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
-}
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
index 6c2c50f61105..dedc56285714 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.2.1.ebuild,v 1.3 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild,v 1.1 2013/08/11 12:14:34 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_8,1_9} )
 
 inherit fortran-2 python-single-r1 toolchain-funcs
 
@@ -41,6 +41,10 @@ src_prepare() {
 	sed \
 		-e 's:> %:>%:g' \
 		-i pdb_seq.py || die
+
+	sed \
+		-e "/import/s:helper:${PN/-/_}.helper:g" \
+		-i *.py || die
 }
 
 src_compile() {
@@ -62,15 +66,15 @@ src_install() {
 	doins -r pdb_data/peptides
 	rm -rf pdb_data/peptides || die
 
-	python_domodule helper pdb_data
+	python_domodule pdb_data
 
 	python_moduleinto ${PN/-/_}
-	python_domodule *.py
+	python_domodule helper *.py
 
 	for i in pdb_*.py; do
 		cat > ${i/.py} <<- EOF
 		#!${EPREFIX}/bin/bash
-		${PYTHON} -O "${EPREFIX}$(python_get_sitedir)/${PN/-/_}/${i}" \$@
+		${PYTHON} -O "$(python_get_sitedir)/${PN/-/_}/${i}" \$@
 		EOF
 		dobin ${i/.py}
 	done