sci-chemistry/pymol-plugins-dssp: Bump to python-r1.eclass; drop old

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

5 files changed, 46 insertions, 89 deletions

diff --git a/sci-chemistry/pymol-plugins-dssp/ChangeLog b/sci-chemistry/pymol-plugins-dssp/ChangeLog
index c902eb96c48a..3727801e5d95 100644
--- a/sci-chemistry/pymol-plugins-dssp/ChangeLog
+++ b/sci-chemistry/pymol-plugins-dssp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/pymol-plugins-dssp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-dssp/ChangeLog,v 1.3 2011/05/01 09:45:37 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-dssp/ChangeLog,v 1.4 2013/12/02 11:14:18 jlec Exp $
+
+*pymol-plugins-dssp-110430-r1 (02 Dec 2013)
+
+  02 Dec 2013; Justin Lecher <jlec@gentoo.org>
+  -pymol-plugins-dssp-110412.ebuild, -pymol-plugins-dssp-110413.ebuild,
+  +pymol-plugins-dssp-110430-r1.ebuild, metadata.xml:
+  Bump to python-r1.eclass; drop old
 
 *pymol-plugins-dssp-110430 (01 May 2011)
 
diff --git a/sci-chemistry/pymol-plugins-dssp/Manifest b/sci-chemistry/pymol-plugins-dssp/Manifest
index 17f3b64e13e9..191cce062372 100644
--- a/sci-chemistry/pymol-plugins-dssp/Manifest
+++ b/sci-chemistry/pymol-plugins-dssp/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-DIST pymol-plugins-dssp-110412.py.xz 6036 RMD160 a7cad2f19725952f892ddb8fee74636c9f8ecca4 SHA1 30b390395d74394a1373b7555e66fc43ce121519 SHA256 d311060b116e913a21a8f11a24ebe399628af21f4b00a5e16bb8449294a6af77
-DIST pymol-plugins-dssp-110413.py.xz 6376 RMD160 76c239f04331672a2330fbf70c99c3e4351916d0 SHA1 1a6ab0797e9c0f21d6e6e0f8efaaccd5464ef602 SHA256 9d3ed487bad438ea379da9d68fda7345c39189b954a49fbcd18537393da462b9
-DIST pymol-plugins-dssp-110430.py.xz 6836 RMD160 a7bb74b4886b916b901e897f709a3f9f7270f0c6 SHA1 aeb30a10de6c0b041bb7495450d2d39c20930bb5 SHA256 8be8da803f5b3908b5918c8fd355bd7e37785d2eada3a92d6de15b362b9e3868
-EBUILD pymol-plugins-dssp-110412.ebuild 1065 RMD160 49c9a91b32234bb77cf40dca09958f602f165421 SHA1 7a76d19160e71b301b4414cc7802cbc481ad80a2 SHA256 b94ef5a56ba04ed008c0d1ea194deff405bf31e945cabfdc5d196dc2f3258fa2
-EBUILD pymol-plugins-dssp-110413.ebuild 1065 RMD160 67cc079d4bd167da8e1ee46628596012e45ef6e2 SHA1 8ce7adfcee8e61eeb69d2324d2e4fe0d5acd095f SHA256 10cffe6dca79f56663b2472de52851eea8593810c7999d4845f1fcabff8dbe5d
-EBUILD pymol-plugins-dssp-110430.ebuild 1107 RMD160 ff543ae5d3f3c2eafbe6f6c47fd9e0a89b202384 SHA1 dc308e61f1862b03a13643b44a79b4bfaf8ae608 SHA256 ddc05e4849b99a0d0cfb46b702587f231e716d7e3df05ff024e041752b87f6e1
-MISC ChangeLog 676 RMD160 3c4de7da5219c638ee04b368523ee7d110157a9f SHA1 1128f91acd8b04a82bcc1f1107498edad630711d SHA256 65d222293f54d212de6107bb3006cb302c6a3946e8d8c37fad875fe7e97a9c0e
-MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
+DIST pymol-plugins-dssp-110430.py.xz 6836 SHA256 8be8da803f5b3908b5918c8fd355bd7e37785d2eada3a92d6de15b362b9e3868 SHA512 521e0a32ca6d2c8c21c690815b0654bb44303bd7fb9a1eb76227030b2ad7311fadb0d748e49b8bbc16cd5e69acba375b5353de7bffef1ff69686e62021fe64f4 WHIRLPOOL bfe0edc2307b3879668095dbe8a9bb242a58c5f6e449f1a08d3a655e9383c7b5a273d7cae65d3067f8f06a0a9d251565cd7f047d741349876bbfdfd366ffe2a5
+EBUILD pymol-plugins-dssp-110430-r1.ebuild 982 SHA256 1591d2bee6a8ab4224b1a9f4cbbe3ef946c917d0b3b47de181f5ed5a0402a324 SHA512 7f0ce80e8e98a73e1d7839f29b916a70f477c58341e5c13ea6506462a753223684bbe83d3c8323b3703d31e9791de9ac854f35c78eb0ff05bd897a8f774ee13b WHIRLPOOL 09f297be336b7a230c115c2152a6d0893ef4b4d2cbbd3e287093c23c79dccf9ca76f656cb13655e07fa89729acee91b0cd9bc2b94391b6262ae868b759ed9f02
+EBUILD pymol-plugins-dssp-110430.ebuild 1107 SHA256 ddc05e4849b99a0d0cfb46b702587f231e716d7e3df05ff024e041752b87f6e1 SHA512 ef7f7680b139abd1c74a3307f499b5503f2cd0de4e482e72e4d40c4b40f36702474efd5db0ea0e3587858ae1aecbea2fb7e7c30760535d013814582ab1c2945d WHIRLPOOL a47a3a0064c904f14ac3afb33eb45b0d657f54b99ac417334ffafd82f2b88045db7f37f61a84ac4d1e96a7a958065ea9c1272ba89bcb98fecba8fdf20d5b514a
+MISC ChangeLog 932 SHA256 6af4a21c96647f34105092a443d7f257a815cd8152956c65394d299faf2e9f1f SHA512 ba8a72329188133a5acfc5cc0448d8afe7011e7509888574e7545c398826c71abe4c3eee009a879a5b01774711fb5f421b6476a7d6a0b6d95461d295b89d1934 WHIRLPOOL a350a20f49275cf824fa8089eb43bfbfba8d444a6384a77ba98404a3e62fb26c141f51e4c07c6e26edc7b2541b10d91a2b683217c7afbb358aac6cedfb3c574f
+MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEARECAAYFAk29K8cACgkQgAnW8HDreRbowACdELFp8GlXl+vTZZ5LpnAZiV/F
-aL0AoMVCVgLC+aEsH/jGafj+2ILY+DLZ
-=FrLw
+iQIcBAEBCgAGBQJSnGuLAAoJELnU8jG9FVirEcUQAIHNZFbCOke4JsXHwjgMOVp5
+DUhHTJxkQPhEcwm9Trzw9p03TbM+eaP5Va4J+fnTafFdBTVhvp4SV7lfDbkSHU3Q
+rx/LqsyRYMnys76XgYkWvK4XDN4nDQK5Y3Kgx0YwCueSfA6/85vjseEiT1iHOWKG
+ebe4G5RSaM0UZynoovJcaxKQl+s7sdXAO0P3h6PyzByIC+kOZpHHR10JL/Ha0w64
+SQS8V3T/Bi+rHtreMvC/ODEw8hDw9+NUtxP8fvbcr+wFyKSdiUmq9UdZXSk0wttY
+qFnCCibLK+p/2he3zqS+zRzKxZxfkeClstM1MWcOESd0ZJc/CiyCg1xXTvzdvktU
+eEKcloDU4+xkwe5a/q4N1oDosGEjeFK6+nXstYtGeNHNH36m46F9EbRzsb46G62E
+VPu8e2Ud8M6jFgwEih9WFGYrho/EzdXI6fQ8bLlnydM1fFwVuhIAI09gMPaT4JTH
+u0awnt1YAjIo9aZ+AXB6OG4MyUraAA0fFgQj5igpw0c3aQYX5gpHkvctQTa5d4ly
+Ik2PJQ98QN5DXOTefcwOzZ+6UTIEZ86jmZ5e8NCQ4yOvyDEn07HaYnicGNv+3rgL
+oOcHGlKPrKfzOruwurMeoOzAJerCFGEz3u9YQGgTnXUK+7EAb4odVZTWjmblRDS8
+96BvHCMTbi6h5XDQb1ig
+=ZEdY
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol-plugins-dssp/metadata.xml b/sci-chemistry/pymol-plugins-dssp/metadata.xml
index dde7ca88a50f..ae9ec7c5f6a4 100644
--- a/sci-chemistry/pymol-plugins-dssp/metadata.xml
+++ b/sci-chemistry/pymol-plugins-dssp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110413.ebuild b/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110413.ebuild
deleted file mode 100644
index 2d58cbb5751c..000000000000
--- a/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110413.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110413.ebuild,v 1.1 2011/04/17 13:53:29 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit python
-
-DESCRIPTION="DSSP Plugin for PyMOL"
-HOMEPAGE="http://www.biotec.tu-dresden.de/~hongboz/dssp_pymol/dssp_pymol.html"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.py.xz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD pymol"
-IUSE=""
-
-RDEPEND="
-	>=sci-biology/biopython-1.5.7
-	sci-chemistry/dssp
-	sci-chemistry/pymol"
-DEPEND=""
-
-src_prepare() {
-	sed \
-		-e "s:GENTOO_DSSP:${EPREFIX}/usr/bin/dssp:g" \
-		-i ${P}.py || die
-}
-
-src_install() {
-	installation() {
-		insinto $(python_get_sitedir)/pmg_tk/startup
-		doins ${P}.py
-	}
-	python_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/${P}.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/${P}.py
-}
diff --git a/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110412.ebuild b/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild
index f0536c0b3cf1..15a15ba2f868 100644
--- a/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110412.ebuild
+++ b/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110412.ebuild,v 1.1 2011/04/12 15:32:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-dssp/pymol-plugins-dssp-110430-r1.ebuild,v 1.1 2013/12/02 11:14:18 jlec Exp $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+PYTHON_COMPAT=( python2_7 )
 
-inherit python
+inherit python-r1
 
 DESCRIPTION="DSSP Plugin for PyMOL"
 HOMEPAGE="http://www.biotec.tu-dresden.de/~hongboz/dssp_pymol/dssp_pymol.html"
@@ -20,29 +18,22 @@ LICENSE="BSD pymol"
 IUSE=""
 
 RDEPEND="
-	>=sci-biology/biopython-1.5.7
 	sci-chemistry/dssp
-	sci-chemistry/pymol"
+	sci-biology/stride
+	sci-chemistry/pymol[${PYTHON_USEDEP}]"
 DEPEND=""
 
+S="${WORKDIR}"
+
 src_prepare() {
 	sed \
 		-e "s:GENTOO_DSSP:${EPREFIX}/usr/bin/dssp:g" \
+		-e "s:GENTOO_STRIDE:${EPREFIX}/usr/bin/stride:g" \
 		-i ${P}.py || die
 }
 
 src_install() {
-	installation() {
-		insinto $(python_get_sitedir)/pmg_tk/startup
-		doins ${P}.py
-	}
-	python_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/${P}.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/${P}.py
+	python_moduleinto pmg_tk/startup
+	python_parallel_foreach_impl python_domodule ${P}.py
+	python_parallel_foreach_impl python_optimize
 }