Drop old; Bump EAPI and python eclasses

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

4 files changed, 21 insertions, 95 deletions

diff --git a/sci-chemistry/pymol-plugins-caver/ChangeLog b/sci-chemistry/pymol-plugins-caver/ChangeLog
index b41e77a946b0..c4b8adfa74ce 100644
--- a/sci-chemistry/pymol-plugins-caver/ChangeLog
+++ b/sci-chemistry/pymol-plugins-caver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pymol-plugins-caver
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-caver/ChangeLog,v 1.1 2011/03/18 10:22:58 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-caver/ChangeLog,v 1.2 2015/04/15 14:14:33 jlec Exp $
+
+  15 Apr 2015; Justin Lecher <jlec@gentoo.org>
+  -pymol-plugins-caver-2.1.1.ebuild, metadata.xml,
+  pymol-plugins-caver-2.1.2.ebuild:
+  Drop old; Bump EAPI and python eclasses
 
 *pymol-plugins-caver-2.1.2 (18 Mar 2011)
 *pymol-plugins-caver-2.1.1 (18 Mar 2011)
@@ -10,4 +15,3 @@
   +metadata.xml:
   Moved from sci-chemistry/caver to sci-chemistry/pymol-plugins-caver, Version
   Bump
-
diff --git a/sci-chemistry/pymol-plugins-caver/metadata.xml b/sci-chemistry/pymol-plugins-caver/metadata.xml
index 9ac9ffdb3a41..51fdedab1b38 100644
--- a/sci-chemistry/pymol-plugins-caver/metadata.xml
+++ b/sci-chemistry/pymol-plugins-caver/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+  <herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.1.ebuild b/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.1.ebuild
deleted file mode 100644
index 7e044a08f28f..000000000000
--- a/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.1.ebuild
+++ /dev/null
@@ -1,66 +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-caver/pymol-plugins-caver-2.1.1.ebuild,v 1.1 2011/03/18 10:22:58 jlec Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit multilib python eutils versionator java-utils-2
-
-MY_PV="$(replace_all_version_separators _)"
-MY_P="Caver${MY_PV}_pymol_plugin"
-
-DESCRIPTION="Calculation of pathways from buried cavities to outside solvent in protein structures"
-HOMEPAGE="http://loschmidt.chemi.muni.cz/caver/"
-SRC_URI="${MY_P}.zip"
-
-LICENSE="CAVER"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6
-	sci-chemistry/pymol"
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/${MY_P}"/linux_mac
-
-pkg_nofetch() {
-	elog "Download ${A}"
-	elog "from ${HOMEPAGE}. This requires registration."
-	elog "Place tarballs in ${DISTDIR}."
-}
-
-src_prepare() {
-	python_copy_sources
-}
-
-src_install() {
-	java-pkg_dojar Caver${MY_PV}/*.jar
-
-	java-pkg_jarinto /usr/share/${PN}/lib/lib/
-	java-pkg_dojar Caver${MY_PV}/lib/*.jar
-
-	installation() {
-	sed \
-		-e "s:directory/where/jar/with/plugin/is/located:${EPREFIX}/usr/share/${PN}/lib/:g" \
-		-i Caver${MY_PV}.py || die
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		doins Caver${MY_PV}.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/Caver${MY_PV}.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/Caver${MY_PV}.py
-}
diff --git a/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild b/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild
index 87f97bb1cf2d..a07cc8d7ecf8 100644
--- a/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild
+++ b/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild,v 1.1 2011/03/18 10:22:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-caver/pymol-plugins-caver-2.1.2.ebuild,v 1.2 2015/04/15 14:14:33 jlec Exp $
 
-EAPI="3"
+EAPI=5
 
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+PYTHON_COMPAT=( python2_7 )
 
-inherit multilib python eutils versionator java-utils-2
+inherit multilib python-r1 eutils versionator java-utils-2
 
 MY_PV="$(replace_all_version_separators _)"
 MY_P="Caver${MY_PV}_pymol_plugin"
@@ -23,7 +22,7 @@ IUSE=""
 
 RDEPEND="
 	>=virtual/jre-1.6
-	sci-chemistry/pymol"
+	sci-chemistry/pymol[${PYTHON_USEDEP}]"
 DEPEND="app-arch/unzip"
 
 RESTRICT="fetch"
@@ -36,10 +35,6 @@ pkg_nofetch() {
 	elog "Place tarballs in ${DISTDIR}."
 }
 
-src_prepare() {
-	python_copy_sources
-}
-
 src_install() {
 	java-pkg_dojar Caver${MY_PV}/*.jar
 
@@ -47,20 +42,13 @@ src_install() {
 	java-pkg_dojar Caver${MY_PV}/lib/*.jar
 
 	installation() {
-	sed \
-		-e "s:directory/where/jar/with/plugin/is/located:${EPREFIX}/usr/share/${PN}/lib/:g" \
-		-i Caver${MY_PV}.py || die
+		sed \
+			-e "s:directory/where/jar/with/plugin/is/located:${EPREFIX}/usr/share/${PN}/lib/:g" \
+			-i Caver${MY_PV}.py || die
 
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		doins Caver${MY_PV}.py || die
+		python_moduleinto pmg_tk/startup/
+		python_domodule Caver${MY_PV}.py
+		python_optimize
 	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/Caver${MY_PV}.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/Caver${MY_PV}.py
+	python_foreach_impl installation
 }