sci-chemistry/pymol: Version Bump

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

3 files changed, 123 insertions, 16 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index b6626a5e7595..e9b41a583efc 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.110 2014/03/13 08:16:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.111 2014/04/08 16:11:32 jlec Exp $
+
+*pymol-1.7.1.1 (08 Apr 2014)
+
+  08 Apr 2014; Justin Lecher <jlec@gentoo.org> +pymol-1.7.1.1.ebuild:
+  Version Bump
 
 *pymol-1.7.0.4-r1 (13 Mar 2014)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index f50d973367f6..e8108a7eddef 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -18,6 +18,7 @@ DIST pymol-1.6.0_rc1.tar.xz 6592108 SHA256 7353c9bdfa272b516bd43efaea7df16a6e163
 DIST pymol-1.7.0.0.png.xz 5392 SHA256 4c554a5c4f47946b6f7bae00209d5116305162534292735d30ae0794c56a8a0b SHA512 24bb1584b28688f5d5824e938f8500ca9887838adf490b4284c52f8c0da4c5ec4a56051ee80f48e4f34541ab53f9a4e00c849c382f1fd37c232fbea12d700105 WHIRLPOOL 395f978eb9ea3a8f8f39bf0694f71986ac9f8ebb307b90283c53fed85c4412d84e54af472f8646fcbd99c650039cb395a8f02b281168802c73ddb9bad175512b
 DIST pymol-1.7.0.1.tar.xz 6550492 SHA256 e8c6f6a465aec78171daf5cd981ebd1614dfa5e014e13c85a044cfbb591841c8 SHA512 a09277cd827f832c4f4e307f6117613d2ee8250643d129a5c34a30ceab2bfe8cea195c71a138fff09b6c69e9427153b917d7d3a7262d154ada5f323ec9635087 WHIRLPOOL 1803b55ade1b04de5963fd4a3bbe1354cda8759e15254c644952e25d7dcc904bc7b9fd91da75fdb8c6a96fd118a5a21bec9c8bba368744b44436747faca5cd9c
 DIST pymol-1.7.0.4.tar.xz 6565436 SHA256 29ff657ae45c733931473a49f88add8bb760e31ddcf03738bba82fdbb3b875ff SHA512 1033e3d8da59c71849f7e7fad89f090fd5015469ba7ff00460b07d73c4a6640fa7edccc748b68ccf1f26e1d94bc8d26c6004f8c2a0481403f79a77e7028a6d6c WHIRLPOOL 2c978cb47944e148b6bc4bea3b96168de624c279bc4ae59c437b7f14a3448ca600dbda77f3ef3f3533a487b8c52b3478314b60044f99dd5229f6576d6e46a438
+DIST pymol-1.7.1.1.tar.xz 6569352 SHA256 aef62da6e68c218972d59920b1a243adfa2b780313cb55768dbce00abb9ba881 SHA512 7239cc7d8fcd8236842419e42e296ca263f31a30d3a70288b5357f1cae53221c21d6a7399fe335b13e555197846ec17e2b507886add3cf82de1d66bd19a00bdc WHIRLPOOL 7ba972125cc770d300b1df7cde5c9f85bd6dcea8a4867fceac110f020ce251cae5082b7c61928627909b5d7596101eb964d0bdd40c58ecfc2efce4e04f6c139d
 DIST pymol-icons.tar.xz 38100 SHA256 03500f28256f67abfbb7d08b798b11aaa208f0ae1473ef2a7205b3c012ddb06a SHA512 5af51014d4fcbc85ef1fecd7667224709c9305b9b72bfdfd89ece2b4420fa8a81bf8c85fcc5903e2a670f44403f12764808f6a16ef42f111bbd0e7ed8e412d54 WHIRLPOOL 6104d378928c56b39f8cbe29184629b73f87da09e81e41ddc08b9b291876f1a30ccaf9ec257f47798c6d03253816f80c14567073c419fa48dd1520fa3fa58ecd
 DIST pymol-v1.6.0.0.tar.bz2 8695114 SHA256 a37eb1a1bd882da14ac9c03617f62f6a49eea5a6dacd0d7202fb3b7cba84e62b SHA512 afe4a9e9c9501b3e636ca97eac3e4204da2cbafd7dc85ad6fd43227c68b448de435f190eea9c75b3403f11786bc512b6366bdf092c591432440032ddc018b0b2 WHIRLPOOL 30302badde84ad63e4a402a54046da63812051879bdb707782589b4bfaa09a8f590e58b5bdd89d0deefd9d2127f17406dd862f36f6a0e33e3e410f8a9d47a937
 DIST pymol-v1.7.0.0.tar.bz2 8775358 SHA256 f4c1b6f0dfc9b1b8419d92e39d436d4ea3462bdfcd17df1025877379bf647a4d SHA512 f5a1dc255aefe14f1cbb716687af959a53757bb77d9858650ea8b021f34bf9f2a48ac04fbfe40f67fe0219def5cfea1e30d78f50fd68930c5bbd4983ea58d8ac WHIRLPOOL c0a4b7f93a4140af44d5b3aa0824426482e65f5dc7c6a598435388ac3dc912ad220dc38a619165b921cedb131069d02a41bbcda8ce218dc3f8c052a3dc7a022f
@@ -31,24 +32,25 @@ EBUILD pymol-1.7.0.0.ebuild 2477 SHA256 73f2ad6605e9b5dd776904e9d2594e3c2d9322f3
 EBUILD pymol-1.7.0.1.ebuild 2553 SHA256 7fd10ccbf59cb01c992353b8a7363959c9f789f596fff9ebf61f91171fb35714 SHA512 c90dab7fdd09e0e9e38b811126423c1d36ec2f793443fca7d0e40522510bcac7be0359cbed6b190a706cb4de8c6b071f6a1e80c8477f19a8563f8cae569a73a4 WHIRLPOOL 0bf7d047e4774afa0e51f4c61c24458c3396c3ed888d78077dd2d1b8c2eb7c3bfccdf12b4edbb168bf6b17315f04855cc290e4efac24f8175b96f41218656bba
 EBUILD pymol-1.7.0.4-r1.ebuild 2629 SHA256 3c9b53b1f8cf811328e4f6b321a40200f9af8978f3343df42be315d89e7566c6 SHA512 08649f9dc0bec58df5884abe4a534224c32c2648df632bce1b5280fceef580374524a8289d803e267635094cbc637fb24519252b0a05b93b2ec7d177ad259ff8 WHIRLPOOL 911d138d68449d54ffe7c4022d203866c40dfab0d20f3073a10fe84aa7de6c2992286d3ef7a8834c141cf8dd7b3eb138e7d660dd080d2b1fb49ad97d6320edcb
 EBUILD pymol-1.7.0.4.ebuild 2553 SHA256 b31adb810360896cf6784c1a6e7dbf78ee8c4ee5932b39f2ab9385e0b8effc33 SHA512 7eddb5d4dff2fdddb6631ba64a59989258381c6eb63174f0ef0d44c8afa108e9c9cde902daad7c17a44f4eaa6cb44bacd313171c9f213f91af3ba0e3ebc54d26 WHIRLPOOL 70e125d140e350664d1b2fe21439deb65a9c1b8cef2458e77382bffe6468211a86a13b1224f0b2d247a11631fb4d9891a86d38a638ccfa482cf5bd81cc216392
-MISC ChangeLog 5973 SHA256 ef298efbefdfa3a14262883e00db4a9e04cd638f7d51e826e27ccb264b1d97aa SHA512 62be7b42ef4ce36ebe380635784e2572137ae920e0c77fc2e10a0633aa0046a823ff6486cd6a75c98412a8181a1556f53583b860226e3b6c626e181de207e922 WHIRLPOOL 518d0684e50a4f2701a9f3067454bb2907a913ab4a9ccba0bf026d5d192814f244cd007c52aa67b8508eae4897dd85d5407c4a25430b5353659bbf27c8635406
+EBUILD pymol-1.7.1.1.ebuild 2553 SHA256 3fbf897831dd4fbc842cb08dc4933769364fc03d6adca040408a2e83353bf861 SHA512 ee9bf21843a17592034cdc0c7e94418472b6a5ad5ef4470e90a867da39133666e8c9dbcd54fdbf732184566259216d5eec4a1d482b7def1bbd525cc793fb85b5 WHIRLPOOL 07257a361f653696d461b46ff111712f7c650e87c9790aa089d31449023de1d95af5a8e9eac4d86fb34edad7b98e17ee1c733e1a81b4f22f97e64487ee7848f4
+MISC ChangeLog 6089 SHA256 635be94a705fe6c72e36b2b35454996ec58e153fa7e4e72104786b9aff3953d0 SHA512 1c42ecf9b94a880a9208c467d2596fbd4f7e6f6c31caa83bc1787420996b5b6c6673fa3b2f3169702100c6a65c7cf5ee776c477e10700732798ff60753f654f7 WHIRLPOOL 6393c473c5b453fa01da9ced0d1e9a239404f011c4541efae94d4ea06ba67732e6820ab793c1acbbe601c30c62a9f0eb2ef913f6400380568b86290c0267b98b
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTIWlYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTRB+1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViry+YQAJ3J16Tcte2UrYRSLnLSXlRz
-mPH3yigUm8gT2WgS5La+zikCp9qkhJ3zg43KrMGGp7tESzMSeo8PYni/xS34h54O
-WvlOQOGl5F+JcCv2eWq/fck8b4ouCCTWwXGsLKcKHJmEz1XQw8o8SVX1QoYdf0dP
-RN3zP79k7YUEwyWLSOXgvp7iWlyyqjjYsTcqQz38GF9r6fQID4MA2xr5v39g8k9c
-wUofdMrbL5zX2kI0YJ+JeVa/KiHa6n3VVFRNxRmafjlvp2yBZ7KfvGYYY9GHciWh
-aTZKxsPKWWeTTe5tefYY2/w5I5u9jcFTa/GUPCfTUYgHgoA2TVRrUxp2nB5Ce/TY
-jv0LjwUCAbXQD+KsUCmN4zET82gipmPUvTyRPxxYnG5pz+Em8grCUXaeTaRRTIgv
-9cH+HGGOLqJ2KHr6872a5nTtTT+8XgetE+9NPv8RlRRllnU9lieDipI7BZTVtExl
-Ors0VrUeL8grlvPlucUWTjocDTD1UdrLn9hub34vTiprtmn8Vet8vdgxo3EdTrWn
-rUKujqCjhF+tZGUwVVkMqg6bG2N5UfQuTDZMPV0dZSE9MVk6FVaK16QVxiKidleG
-RhO4XfzUqxsXikVLzeq2cFAYVoKkVHOUFDVi/VV6kMBfpYP7fHrgHBoA6Y1aFj9C
-222UsgtA6vst5et5Npsg
-=/JTE
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViroEUQAI9VfjCq2aAz2WfUaFXUuXjz
+bmSvfiGFElvE/rfdRHSHFC/3YuAWfpxCzosdXypNzUQ6bwcB0HTvAoJYBWVWn6cf
+5qc1tVGcaXtmjlps22YNGrNkz0pHvr92SwBamqdNDdfi11ERAZpXfxbdY0x8OEGq
+/h3HQLY9q6d3ZCqLV4FYWN1fPIumTkiHyS7qyYLefg4+1dR9R2FXtBX8+xF1Sfzr
+pS7hHN7yup3uxo8XeIBzuYoz2/qCXYcnaxrzAE0on8wQ/RpAYykv5Z9g1aaV//4b
+6Xsk8zdAKK0HYUwm6NGs2Dk6/KsnDRT61eF9tatrYg5Xhuew8OJ8OiPHac0gxBfK
+ICaf2EU3nkWtzqeiL78D/8Jk6hgida2dREQskgzZNMVdM/UoV+DWBMXLZdRfZtKo
+EMbfkp374YZ80T2jWWERINTBrORyRqdOzTOmqJwxq8iF9k6Ipf98jOWbAJq+PhfP
+cDhetTVETVUrv0ndR9iIghPep9JGHYWR/Lms+TVH6fXbTsgc+QFKyrWxVMwtCqsj
+4liQ7Q72UgNRHkrCmCLA3UaZe7gJVh6xN+Eoh4f46GmC2Q+9OQy4o4zo6eMJeeha
+la3EOfycn+WvDMPIQhWtvHVGNHNYBCQiCrYJgGhAiWn8VnOg67z03eFiHImqU8hE
+E9tN9/pe5dpSc6cgVzfA
+=Ugaa
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.7.1.1.ebuild b/sci-chemistry/pymol/pymol-1.7.1.1.ebuild
new file mode 100644
index 000000000000..bb0301b04c50
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.7.1.1.ebuild,v 1.1 2014/04/08 16:11:32 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 fdo-mime versionator
+
+DESCRIPTION="A Python-extensible molecular graphics system"
+HOMEPAGE="http://www.pymol.org/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}-1.7.0.0.png.xz
+	http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
+"
+#	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="apbs web"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pmw[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-libs/freetype:2
+	media-libs/glew
+	media-libs/libpng
+	media-video/mpeg-tools
+	sys-libs/zlib
+	media-libs/freeglut
+	apbs? (
+		dev-libs/maloc
+		sci-chemistry/apbs
+		sci-chemistry/pdb2pqr
+		sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
+	)
+	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}/${PN}
+
+python_prepare_all() {
+	sed \
+		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
+		-e "/ext_comp_args/s:=\[.*\]$:= \[\]:g" \
+		-e "/import/s:argparse:argparseX:g" \
+		-i setup.py || die
+
+	rm ./modules/pmg_tk/startup/apbs_tools.py || die
+
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	python_export python2_7 EPYTHON
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="$(python_get_sitedir)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
+	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
+	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;"
+
+	if ! use web; then
+		rm -rf "${D}/$(python_get_sitedir)/web" || die
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}