Version Bump, fixes for python.eclass usage

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 80 insertions, 58 deletions

diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog b/sci-chemistry/pymol-apbs-plugin/ChangeLog
index aea3bc26a808..0e3884e07be2 100644
--- a/sci-chemistry/pymol-apbs-plugin/ChangeLog
+++ b/sci-chemistry/pymol-apbs-plugin/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-chemistry/pymol-apbs-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/ChangeLog,v 1.6 2010/03/23 13:53:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/ChangeLog,v 1.7 2010/06/09 06:48:36 jlec Exp $
+
+  09 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  -pymol-apbs-plugin-0_p11.ebuild, pymol-apbs-plugin-0_p15.ebuild,
+  +pymol-apbs-plugin-0_p18.ebuild:
+  Version Bump, fixes for python.eclass usage, removed old version
+
+*pymol-apbs-plugin-0_p18 (09 Jun 2010)
+
+  09 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  pymol-apbs-plugin-0_p15.ebuild, +pymol-apbs-plugin-0_p18.ebuild:
+  Version Bump, fixes for python.eclass usage
 
   23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   pymol-apbs-plugin-0_p15.ebuild:
diff --git a/sci-chemistry/pymol-apbs-plugin/Manifest b/sci-chemistry/pymol-apbs-plugin/Manifest
index ba992b1de0ed..8ef493320cee 100644
--- a/sci-chemistry/pymol-apbs-plugin/Manifest
+++ b/sci-chemistry/pymol-apbs-plugin/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST pymol-apbs-plugin-0_p11.py 102097 RMD160 1ab4b3a9caa2f1e2a3a42b1072c91eea1c6be31c SHA1 3678bd0e329efd5401304e9434014f6712be1374 SHA256 ed2e5c7eaa0a0c81cf12092fd58c949bbfce93b5c1acd3d880f812823a66a450
 DIST pymol-apbs-plugin-0_p15.py 104351 RMD160 852273d6e09eb17d06b0508408f957ac547b4c12 SHA1 215a9ad498c0c28f9d8db3c18c6822b7b44917ef SHA256 c5a259ddc1931f1ec4efe0ffc3ae9e9ac4a84a28c83a4f93a06ebb7c1bef0c1d
-EBUILD pymol-apbs-plugin-0_p11.ebuild 1407 RMD160 17c215ca3f3c59c7887e21ff2febe16677074142 SHA1 9b54024e06c2bfbbad9e52dd109fc5708fb68841 SHA256 e6eb6d43f2c00513a8254be206ac38212d093c319fd9e794206642b239d9ec48
-EBUILD pymol-apbs-plugin-0_p15.ebuild 1542 RMD160 25fd7ac67e55ef77592593a0e37ea61a5a73b239 SHA1 936a9c6c1d7906615ef66abf5a119d2f63d6d156 SHA256 8398cd74d748eeb3eb080fcaadfbaf4def05f76e127e8531dff3fb67ed7f3c06
-MISC ChangeLog 1061 RMD160 af30d20e3c1a00472ecffe922e87f6180b95b50d SHA1 83334aa4f6902ca248a0d66c0c8f9dd6e4507a00 SHA256 8eeab1f5e25292a58afc1ff64bfd2215953f115fa335b06f54036f66f2bca83f
+DIST pymol-apbs-plugin-0_p18.py 108766 RMD160 bdf7a1ce29bab9cbba990bd202d4e6c33673ac77 SHA1 84477e09f461d71416777a025492c1e6e8be8174 SHA256 ec09c5a0903ac965cc29fcf0a3c1999bd939f9791d037915596092698855d12c
+EBUILD pymol-apbs-plugin-0_p15.ebuild 1560 RMD160 b73994240f25549942dbc502fd39cfce14cc8232 SHA1 ebb65fb68bf50b1ab4e6ff8a1d03b5370564e968 SHA256 f8e5f0c27d8e545e7f35fe2c6a5748595ba6e32d87ae2811d70c20fae38162c8
+EBUILD pymol-apbs-plugin-0_p18.ebuild 1560 RMD160 c5b16f48f1924f6feed95bfa521a76ea5a672a23 SHA1 55b71c75619fbd5055a75b01d6d2cd937214072c SHA256 cf8b79dac2282c70f35b829e8d423668969a577af6144261fb56b0067d6f5613
+MISC ChangeLog 1478 RMD160 b8264900ad890b9570ee511f740bc0e076b60a4b SHA1 db77a6b83d87f8edc89a69fa39d8bcba0341873d SHA256 aa5c9a8e4a0a8a40710671fb6791162e59495fd7f695c20e79518172cc9bf3dc
 MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuox/kACgkQNQqtfCuFneMVoQCfXu1Jw3+8b8LQ/rLdvEsnHZ0E
-jD8AmwTn2mbLIKP/JnFRVirt6hVJnb03
-=gpp2
+iEYEARECAAYFAkwPOUkACgkQgAnW8HDreRYqAgCfSaEIrCQPp4KOEtj4RCqkapet
+Ep8An1jDv33Qc5dwVoWo7t9XFbrbLn5e
+=U6yk
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p11.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p11.ebuild
deleted file mode 100644
index 3df525ec13ba..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p11.ebuild,v 1.1 2010/02/01 21:40:04 jlec Exp $
-
-EAPI="2"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	cp "${DISTDIR}"/${P}.py "${WORKDIR}"/
-}
-
-src_install() {
-	sed \
-		-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-		-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-		-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-		-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-		-i ${P}.py
-
-	insinto $(python_get_sitedir)/pmg_tk/startup/
-	newins ${P}.py apbs_tools.py || die
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
index 134fdb9725c8..28e963d5e031 100644
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild,v 1.6 2010/03/23 13:53:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild,v 1.7 2010/06/09 06:48:36 jlec Exp $
 
 EAPI="3"
+
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit python
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
new file mode 100644
index 000000000000..f98082487b27
--- /dev/null
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild,v 1.1 2010/06/09 06:48:36 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python
+
+MY_PV="${PV##*_p}"
+
+DESCRIPTION="APBS plugin for pymol"
+HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
+SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="pymol"
+IUSE=""
+
+RDEPEND="
+	sci-chemistry/apbs
+	sci-chemistry/pdb2pqr
+	!<sci-chemistry/pymol-1.2.2-r1"
+DEPEND="${RDEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_unpack() {
+	mkdir "${S}"
+	cp "${DISTDIR}"/${P}.py "${S}"/
+	python_copy_sources
+}
+
+src_install() {
+	installation() {
+		sed \
+			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
+			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
+			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
+			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
+			-i ${P}.py
+
+		insinto $(python_get_sitedir)/pmg_tk/startup/
+		newins ${P}.py apbs_tools.py || die
+	}
+	python_execute_function -s installation
+}
+
+pkg_postinst() {
+	python_mod_optimize pmg_tk/startup/apbs_tools.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup pmg_tk/startup/apbs_tools.py
+}