Move to EAPI=5 and new python eclasses, bug #544720; thanks Ian Delaney for the patch

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

4 files changed, 24 insertions, 64 deletions

diff --git a/sci-chemistry/pymol-plugins-psico/ChangeLog b/sci-chemistry/pymol-plugins-psico/ChangeLog
index 4c51390ea124..8a315998ad61 100644
--- a/sci-chemistry/pymol-plugins-psico/ChangeLog
+++ b/sci-chemistry/pymol-plugins-psico/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/pymol-plugins-psico
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-psico/ChangeLog,v 1.5 2012/11/06 19:10:22 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-psico/ChangeLog,v 1.6 2015/05/29 07:01:07 jlec Exp $
+
+*pymol-plugins-psico-3.1-r1 (29 May 2015)
+
+  29 May 2015; Justin Lecher <jlec@gentoo.org>
+  +pymol-plugins-psico-3.1-r1.ebuild, -pymol-plugins-psico-3.0.ebuild,
+  -pymol-plugins-psico-3.1.ebuild, metadata.xml:
+  Move to EAPI=5 and new python eclasses, bug #544720; thanks Ian Delaney for
+  the patch
 
   06 Nov 2012; Justin Lecher <jlec@gentoo.org> pymol-plugins-psico-3.0.ebuild,
   pymol-plugins-psico-3.1.ebuild:
@@ -23,4 +31,3 @@
   21 Mar 2012; Justin Lecher <jlec@gentoo.org> +pymol-plugins-psico-3.0.ebuild,
   +metadata.xml:
   New addition, written by me, #408995
-
diff --git a/sci-chemistry/pymol-plugins-psico/metadata.xml b/sci-chemistry/pymol-plugins-psico/metadata.xml
index 1837bbc07a6e..ae9ec7c5f6a4 100644
--- a/sci-chemistry/pymol-plugins-psico/metadata.xml
+++ b/sci-chemistry/pymol-plugins-psico/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-psico/pymol-plugins-psico-3.0.ebuild b/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.1-r1.ebuild
index 9aabd8b7eb65..aeb4b7cc478a 100644
--- a/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.0.ebuild
+++ b/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.1-r1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2012 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-psico/pymol-plugins-psico-3.0.ebuild,v 1.4 2012/11/06 19:10:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.1-r1.ebuild,v 1.1 2015/05/29 07:01:07 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_MODNAME="psico"
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils vcs-snapshot
+inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Pymol ScrIpt COllection"
 HOMEPAGE="https://github.com/speleo3/pymol-psico/"
@@ -21,14 +18,15 @@ LICENSE="BSD-2"
 IUSE="minimal"
 
 RDEPEND="
-	dev-python/numpy
-	sci-biology/biopython
-	sci-libs/mmtk
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-biology/biopython[${PYTHON_USEDEP}]
+	sci-libs/mmtk[${PYTHON_USEDEP}]
+	sci-chemistry/pymol[${PYTHON_USEDEP}]
 	!minimal? (
 		media-libs/qhull
 		media-video/mplayer
 		sci-biology/stride
-		sci-chemistry/ccp4-apps
+		sci-chemistry/ccp4-apps[${PYTHON_USEDEP}]
 		sci-chemistry/dssp
 		sci-chemistry/mm-align
 		sci-chemistry/pdbmat
diff --git a/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.1.ebuild b/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.1.ebuild
deleted file mode 100644
index 2272d3dbf6ca..000000000000
--- a/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.1.ebuild
+++ /dev/null
@@ -1,45 +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/pymol-plugins-psico/pymol-plugins-psico-3.1.ebuild,v 1.2 2012/11/06 19:10:22 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_MODNAME="psico"
-
-inherit distutils vcs-snapshot
-
-DESCRIPTION="Pymol ScrIpt COllection"
-HOMEPAGE="https://github.com/speleo3/pymol-psico/"
-SRC_URI="https://github.com/speleo3/pymol-psico/tarball/${PV} -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD-2"
-IUSE="minimal"
-
-RDEPEND="
-	dev-python/numpy
-	sci-biology/biopython
-	sci-libs/mmtk
-	!minimal? (
-		media-libs/qhull
-		media-video/mplayer
-		sci-biology/stride
-		sci-chemistry/ccp4-apps
-		sci-chemistry/dssp
-		sci-chemistry/mm-align
-		sci-chemistry/pdbmat
-		sci-chemistry/theseus
-		sci-chemistry/tm-align
-		sci-mathematics/diagrtb
-	)"
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog "For full functionality you need to get DynDom from"
-		elog "http://fizz.cmp.uea.ac.uk/dyndom/dyndomMain.do"
-	fi
-}