Version Bump, fixes for python.eclass usage

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

6 files changed, 85 insertions, 70 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
+}
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 01505b5271bc..0ad51d15d52f 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -6,28 +6,21 @@ AUX 1.2.1/pymol-1.2.1-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c
 AUX 1.2.1/pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
 AUX 1.2.2-data-path.patch 3361 RMD160 ece520d476cc13a312ba3976902fda9dedf7758d SHA1 3a03308d74372bf8fe62cbe804711bdb58895f8d SHA256 da9dfec59b09b2fd6bad5f0188589a0d04c28296651add308acd35d159f60947
 AUX 1.2.2-prefix.patch 1183 RMD160 25a3e3fb1639e0c5cc93928b4fcba412a3e9b371 SHA1 3c61c3552a579a48883c61b646f05ce1f059744e SHA256 35b14c60163517debfdeae52b3be00bc0fc6ab96c58d2bf3efb65e22728522d4
-AUX nosplash-gentoo.patch 332 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 SHA1 275a325f7a9bb076bea72897fd6dd5ed1b014390 SHA256 5e0761591eeea90bcaa06a72c210a80ba46f2542ff985f8dd893af112254a890
 AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea SHA1 7a3585d14431b7840eff8f6ee0a5d8324049ff77 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de
-AUX pymol-1.0-r1-data-path.patch 3521 RMD160 bbd8722a1f52944f122caa64642db5dc2609a208 SHA1 735871b06d8f874334ef51fe9054ae92a7fbe523 SHA256 ba0c036b1f01338b42f9e31a0252be59292726289e330f4c33cf52ee48ea9172
 AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de16 SHA1 5651438459920b74040330ec0b7d9ea14e63818c SHA256 c15e5c5d2a6b53b96c6a7fe0b717ac0f7d85c90aca3e5b02c8d8c34b9038cb68
 AUX pymol-1.2.2-vmd.patch 1250 RMD160 fa5064d842099cd43e951278220b80fba170c5ec SHA1 2381931650169a841cf41fd38a1b870c0a896745 SHA256 d3688f57f32912ace20a3344dc49530a48963454dcc5a9aafe45d4b6be269525
 DIST apbs_tools.py.090618.bz2 21329 RMD160 80baed718524dfbaff2f0a3b7263fc75c55bf1d9 SHA1 e2c69bb150679f137ba7ff2cfcd0fe2da000612b SHA256 604803ed58f1827b76cbf5f3b58c35859d31c68d51481da4b37e08a1c0656d6e
 DIST pymol-1.2.1.tar.gz 8276264 RMD160 0b888ef9dfc91057077248bd388327dd9d3ff15b SHA1 2fb71dd69fbfffd2a6b2804766e410c6167be066 SHA256 f8b38fce8b56015c9e40f8af20fe69ae14b758fa2d3578a62ac9d26e97426e78
-DIST pymol-1.2.2.tar.gz 8280622 RMD160 e1246c98843fe004e50b5158c0be204a321fc983 SHA1 0d7e564b92564fb3f3db93b8700195f360226ea7 SHA256 15cd754317fff2fc975de1d8bf521f86227eba6674120ef336b819be80b0d7d9
 DIST pymol-1.2.3.tar.gz 8281001 RMD160 125b4827b1ee5708ed28ac5bd8988a75b707ce4f SHA1 435dccba925298fa4865980a7139edcb8748accc SHA256 7d85e3e818ba357fa6df0db2248ef5555f84394559790e88e7003d602a20ab9f
 EBUILD pymol-0.99_rc10.ebuild 2125 RMD160 92cb22b6566abc10a6d5f02d6b45be0316f2126d SHA1 4dfd6793fd7b1ee3bd90b12e0ed9c1ded007cb03 SHA256 3a9eb60ad0fff94a55d8614f5ade15225298a05d31efb4de0e1f0aa092d94b24
-EBUILD pymol-1.0-r1.ebuild 2114 RMD160 26354ebc9e4bf91327f0631cf415eb08989bdd89 SHA1 1bb01c6daf8a44a11670dc0c12f63bdb08c136c3 SHA256 30356fe8bc8fc8183c2b04ea7179682476c8bda5673b29f04d2107a41fc37d1d
 EBUILD pymol-1.2.1.ebuild 2948 RMD160 e5894b3e057f178dec0ecebf7ae40301ab392239 SHA1 0658797816610b8de962cd7640db3e359f8579c0 SHA256 fe9f60d348ca7b1a4e04cb17235724ee1e614a77eafed3e53c8aeed868a5f296
-EBUILD pymol-1.2.2-r2.ebuild 2391 RMD160 7fd5ccd8f4d504126381695651903d0a280af6fc SHA1 82574dbb7b73c4244d3c05bd6e41f5b7a3316c2e SHA256 563b2f15c8bf0fc640fb4c3e56d9cf1baaac62cee67d5a661c55746980e4f929
-EBUILD pymol-1.2.2-r4.ebuild 2599 RMD160 5bd603008485738d092a66240233d0e7c6c981cf SHA1 9273784374bb47450f93121a648873dc7176a086 SHA256 48a53530581d9006d9387b4816ce4f00ff3c7adddb3a5fe35b7ed1db37132d37
-EBUILD pymol-1.2.2.ebuild 2951 RMD160 290195269d3bf42d8a2b0e3c8905dbe64bfcdbbf SHA1 d1cadff92e18f1d74d11da304d0672ecd1774c0b SHA256 22afa35303d15e4e82465204d3fab42fb420ec163e37a2f20287e143cdb1e478
 EBUILD pymol-1.2.3-r1.ebuild 2612 RMD160 b86f1b565c63044733b4aa342e6dccce149df5c6 SHA1 07ff82936953597697acee2173118da61fdc8511 SHA256 3e0fb145318bdf1ad1faf33efe84f7c6cda75cf54e080818cbe144d3688db98b
-MISC ChangeLog 12772 RMD160 d177e11858eea06a2dda408f58864730ad307a56 SHA1 772b4710b31dc06065fd991f938a01b5ed8c74ff SHA256 98fc0fabd2a9eeca4ce1572c8ebf053aaa9f6337638677564a987e1440751fa1
+MISC ChangeLog 13051 RMD160 b89ec055617622734027be2074261f592635d7a8 SHA1 64064bb26aa47563a0a2ed8e977ee5242babe3de SHA256 45f1c5874e55b347a8359a83f892544f45762c9bd18926926efdb50d78c26280
 MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvv6oIACgkQgAnW8HDreRalxgCeKaguKCxSTF1qwR9Juic9StqP
-w44AoMzkSU3PF9k5k+6pnv+VI38o+GOH
-=Y4BU
+iEYEARECAAYFAkwPOZwACgkQgAnW8HDreRZcUwCfdd39IPgtSilSZAfLhk+KGdCM
+1b4AnjEkDdHyfReuPaC3p5sbEsf1oONX
+=Ovz6
 -----END PGP SIGNATURE-----