sci-chemistry/pymol-apbs-plugin: Fix double prefix

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 82 insertions, 11 deletions

diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog b/sci-chemistry/pymol-apbs-plugin/ChangeLog
index ee80eea0b1dc..87a011009289 100644
--- a/sci-chemistry/pymol-apbs-plugin/ChangeLog
+++ b/sci-chemistry/pymol-apbs-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/pymol-apbs-plugin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/ChangeLog,v 1.12 2014/07/10 09:29:13 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/ChangeLog,v 1.13 2014/07/22 09:51:30 jlec Exp $
+
+*pymol-apbs-plugin-2.1_p26-r1 (22 Jul 2014)
+
+  22 Jul 2014; Justin Lecher <jlec@gentoo.org>
+  +pymol-apbs-plugin-2.1_p26-r1.ebuild:
+  Fix double prefix
 
   10 Jul 2014; Chema Alonso <nimiux@gentoo.org>
   pymol-apbs-plugin-2.1_p26.ebuild:
diff --git a/sci-chemistry/pymol-apbs-plugin/Manifest b/sci-chemistry/pymol-apbs-plugin/Manifest
index 81445594cb5e..aa68e0e3a537 100644
--- a/sci-chemistry/pymol-apbs-plugin/Manifest
+++ b/sci-chemistry/pymol-apbs-plugin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pymol-apbs-plugin-2.1_p26-tcltk8.6.patch 9553 SHA256 e7ec16e9d105931cc4fc26e358b150e8d860b7323092247ecf3b5f1df9310384 SHA512 0c00a6f10f23905f42dd33bf99f4f3fd2d217dc29931d2f8282a1de8d636ff059fc365b062f80359a4fb88731f3a8535a56dbef5da8c9a67908b94d00d82f065 WHIRLPOOL a8065f324172e9b0177486031d0cc3d52a8aa2cf8803e17fb689f181b118d641c9a1fdd924eaee4b211bfdcaf63d6d5c203860b37841b53b96b99384b232a80c
 DIST pymol-apbs-plugin-0_p15.py 104351 SHA256 c5a259ddc1931f1ec4efe0ffc3ae9e9ac4a84a28c83a4f93a06ebb7c1bef0c1d
@@ -9,17 +9,26 @@ DIST pymol-apbs-plugin-2.1_p26.py 113086 SHA256 552242b4f5b47f298eeb0616e0d51924
 EBUILD pymol-apbs-plugin-0_p15.ebuild 1560 SHA256 f8e5f0c27d8e545e7f35fe2c6a5748595ba6e32d87ae2811d70c20fae38162c8 SHA512 6d84e564cee32f6af9d2d713da2c525b70788d84173365db5df9fd670e5e8a07c8c57eb2ca496dbdacf1863d9b8d94af0a9477b22f2164c383b8bb50a0cec4cb WHIRLPOOL 9eb71604fa67d70fef00d0a6b62a008a03240488cafa50806b0223cea4722d9f684b555ecab4e7cf41631aa7fc492a82cb049ff41f7f0101c030b5e2af10253f
 EBUILD pymol-apbs-plugin-0_p18.ebuild 1562 SHA256 5243c77704b6fe53ac2a93cb4494b75356f8cc9347b25d5703215afe6e59be93 SHA512 767e79d3c564e2c4b4a18304a82100d968d21c5b9c3b683fd4d54dee33472eb9bb6c4556512b87feb3c9e0fc4c4519af0119726cccf012c62152e6aaa246be35 WHIRLPOOL 9c8a1bcb57225cf4ffbac559f9f5d5f77440dd52d5970df214006212f7dc750c176d8e4fcc36d8808fc3442d03cdddb1b9411c59ea84c519406097fb1f779bf0
 EBUILD pymol-apbs-plugin-2.1_p24.ebuild 1563 SHA256 9699ed1122483edd8d9a631273fba0daa8d0dbcd580161bd2a66251df90a8949 SHA512 b102134c85ad045d9c97da2e4c9331c004ed949fedbbd7f14aa3654369d126fbf96fac2c4d48906ca8f86cf081926a2008bfb2073839798dd0703c831b7f5bc5 WHIRLPOOL e3d61783a6f4547a9b227eb5b2c2bd5602d3352f8e2183adf77d67c0460061fcebe75bb4409f25ed260d52f12eabb871978c24e8f50de32ea81cc142f61f4c6e
+EBUILD pymol-apbs-plugin-2.1_p26-r1.ebuild 1524 SHA256 3838903773e853040d3f701890ff652c919fbaee328ca06e8b389b4789e98f6d SHA512 e970559379ca53a186ad0e9d72ec4be84ff95ad1efb4d19a648727ed102244092aa04efe581f18c152e431ac2127f8621a703b902198d4ca28dd5775e7f071d0 WHIRLPOOL 2326d1902375693b19553b41d3b720aa734552be84701a9a843f07e79aea392e8cb0ad69ebf4a12e601f9638cc7bdcf349e4bc7f2cecbd25727b4aad7d484009
 EBUILD pymol-apbs-plugin-2.1_p26.ebuild 1551 SHA256 11ab57d912b3fb71db868e48a61a25909d97add67a4b244d2a2199d466917da3 SHA512 6f8e750082adbd84ad004963525ee3db3e568a7d82dee2b36a93676f7f9bc7fa35f0f3c3bdafec41566ea9519f8fc585e913eea3a1db40345c99cdcb29c4b865 WHIRLPOOL 28641f39f4594476af9023518d9ce1edf39426d60bd15fe3d6aa38ebdd1e07bdae3c82b819c25187a96e3c3ad193dc135f45e7d7a3b5dc69b2b4b41a782ed500
-MISC ChangeLog 2202 SHA256 2d1513444f2b51a09e8596f408d55009ee9fe50ca579e901e1d45c9b419479c0 SHA512 9d929eeb6edbb6d9a47108da7f36c6eecec933b5fc8be9cf936e927ba6b2f097c8ab83f8cade06c649825419ff8c22d08ff4e785ec3110b7120c755d7e4e2e75 WHIRLPOOL 5388e5b329a1f9b9787f854f20a40a65f72406ed19f3ddd6b20744f8dc7ad3654fd673d7ad54b051097cc8e5a2b1a4c58d0d74592d4cb49760dbde230f80bc9e
+MISC ChangeLog 2353 SHA256 6a8dd15e6b3362443a4e635bb7de4f5477d1663a92cafa77ba877ffff2c271be SHA512 cc1edd90f2f59f2c7bb59c5e4bc4be9a500b9ded85ecaab577e31ab82af986d517f6c583647b09711b28b8dbd8e6b037e8494ad45cd76d4d451e7b35dce5f1fa WHIRLPOOL ff7d5ce3a987c26fb02cd57407d943800fb7603ec3db78a3a1ff4d261c8174f097f597a7d5174f6605070fb5a4ae98b74ad5b3fbdc55c66cd665c6a34526576b
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTvl0tAAoJEA2sAkrWKOU22LQH/RpOcWsvV66yF4X1EkYC3e8e
-FKDU+muJCKk/1KzZWtXXmJL0GSkxYu/KyWHHFR5c2eClRX8bNL4y84td/aRHWFgW
-INHmuWFDDoAiUC+q+Jwno6lB9CxSkOoZD6IhaSxsxDfw3pFMJM/80TrI/83CF7vK
-FeKvkh2auHk5AtEQ3/kvS03ItCWjlr8ONRp+xPqREddcFdEfFqEBa+OkUlwTCP5m
-zfBgES3UX5DeOewTStKVCy7iKqeRfMU/fk0bja541uXFFnnaIjfuV1WH/4sJ/HK4
-PldyAhpRjwV18f4urOVIT+SzAGJpR3g8ggyuiPBP3TXbpuyyFSvM7+z4VHt7EBs=
-=vwD0
+iQJ8BAEBCgBmBQJTzjQjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5b4P/20GyasFKZADsKos9OVuVGiw
+kUuNRh/TYTJ1sh7KTuE8Wz9538QH1GObi6/83TRakDzgyJ/7V1PeS8qXnGJzASYt
+F4utPbRzF/s/RSU/iUPQdc7d/HY1Q4nUseZ8fbVRelW/y73/PoTQo+EgI0ZxPIpR
+I9s7q8mdFZixSRyeuaurdXe2HnAYQAGL5a2tjpq8UpvFsl0ghkyKJ3VLOpfVkZC4
+YLGrxdO5LbMAMxl1I/C4cvgqioO+5XKalovOvLqyrHiiRMvrg1whrbkJyegbOEs3
+8Qo6tQVmUWHziM13WalckJyqs5h5V5kvaYCXAKS7YVsFar4SaOjT+j4eyxtRpQRR
+pG3k7N/MCCZomZveGrOboPuMMAhY2872PECk8Cor8gb7BBC/u3WJNmY5kDRdTolg
+QBHEB5CNukkaEBD1RZwiCzxmBiHUWVVnWQtXW1LDY1pWZdM16ZQdwkg/jFPs5m9K
+Slq8gBabC2Nt3hgOzv9SC09HX5PnwqFxJ+a9WH8fn5vTpnVD+UHAfSnYKGSedw+/
+w6U/j/j4/TgFCQX62MjSNW514A9g72x4JghfTc1ValpGw80gzs/Y6lOD6eoBpa4O
+SaIqTF+txX9607SCjQaBnQUdziSQLU26zubY/KngvPu1ayYZz+DgXW9yaX+2j867
+m/3WbDG/JgrSA53l3Uto
+=fmpA
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
new file mode 100644
index 000000000000..9098926397c5
--- /dev/null
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 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-2.1_p26-r1.ebuild,v 1.1 2014/07/22 09:51:30 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+MY_PV="${PV##*_p}"
+
+DESCRIPTION="APBS plugin for pymol"
+HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
+SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="pymol"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-chemistry/apbs
+	sci-chemistry/pdb2pqr
+	!<sci-chemistry/pymol-1.2.2-r1"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	mkdir "${S}"
+	cp "${DISTDIR}"/${P}.py "${S}"/
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
+	python_copy_sources
+}
+
+src_install() {
+	installation() {
+		cd "${BUILD_DIR}" || die
+		sed \
+			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
+			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"$(python_get_sitedir)/pdb2pqr/src/\":g" \
+			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"$(python_get_sitedir)/pdb2pqr/\":g" \
+			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
+			${P}.py > apbs_tools.py || die
+
+		python_moduleinto pmg_tk/startup
+		python_domodule apbs_tools.py
+		python_optimize
+	}
+	python_parallel_foreach_impl installation
+}