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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 26 insertions, 76 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/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
 }