sci-chemistry/pymol: Version Bump

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

3 files changed, 124 insertions, 15 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 73c419290a91..f5a97ddc2778 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.108 2014/01/26 09:21:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.109 2014/03/10 07:08:07 jlec Exp $
+
+*pymol-1.7.0.4 (10 Mar 2014)
+
+  10 Mar 2014; Justin Lecher <jlec@gentoo.org> +pymol-1.7.0.4.ebuild:
+  Version Bump
 
   26 Jan 2014; Justin Lecher <jlec@gentoo.org> ChangeLog:
   Update HOMEPAGE
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 883b81424457..3c655f1c5559 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -16,6 +16,7 @@ DIST pymol-1.5.0.3.tar.xz 7412080 SHA256 b304c2839bc944bd2619403474d36cb846b372b
 DIST pymol-1.6.0_rc1.tar.xz 6592108 SHA256 7353c9bdfa272b516bd43efaea7df16a6e1632b013ac6091eb5ec34b1f8676bc SHA512 971f03b41db1ed6b1095e91cea49ca5ffb819bf9b97e34dab215112462da02d7bb1b608c462d07556998dfd49631663f3d2cbf27368980f3d69bf134002224a8 WHIRLPOOL 2368fb3a20cbb2d490b1f4b370f770aa7b89921c5827414715ec7616ad66e991bb7f378ed7c379db78b9391dea0bcae9d56362bd705978d667858af8ef46ebb4
 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-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
@@ -27,22 +28,25 @@ EBUILD pymol-1.6.0.0.ebuild 2329 SHA256 72013c55e9e223c76a4643a8b423292b43e2e9e9
 EBUILD pymol-1.6.0_rc1.ebuild 2262 SHA256 468f978ce8800b1db5c55274c912bd67000715454762007286d3c0c1c36dbf24 SHA512 d4d57c77f7bd5805af04260207da63da1e4dbdfb067de2538d4882818d3169e66d2cb1a2bf48977967011d566db591938e0531c1847ade8389f4c698e7ac41c9 WHIRLPOOL 2cc6be852c6c6e502d3a963bdc2eb5393c81fcf28248cc33ce4efb5853cb5606e807cff2b96fc725ee3d8f5a3e2b9b93dead7b0441877780480ef9315f4197f2
 EBUILD pymol-1.7.0.0.ebuild 2477 SHA256 73f2ad6605e9b5dd776904e9d2594e3c2d9322f3095113303169f9859ba94247 SHA512 d6483ad15a56a41d9c517d9f1c2e40cce5050fc0151c48e370b2e11bb0aa57291fbf9b6263fa810e5cf273ca0cc493006e988f16389f28450caadf6e7edd1eb2 WHIRLPOOL 1c16c22aa3db290b67b3a180e42ef2bb8b561e64d742fb8d0122a779c3af2644cba170c41feb3a494343f46d33bcd2ce166002a94d79506cd3c8aa492e389d35
 EBUILD pymol-1.7.0.1.ebuild 2553 SHA256 7fd10ccbf59cb01c992353b8a7363959c9f789f596fff9ebf61f91171fb35714 SHA512 c90dab7fdd09e0e9e38b811126423c1d36ec2f793443fca7d0e40522510bcac7be0359cbed6b190a706cb4de8c6b071f6a1e80c8477f19a8563f8cae569a73a4 WHIRLPOOL 0bf7d047e4774afa0e51f4c61c24458c3396c3ed888d78077dd2d1b8c2eb7c3bfccdf12b4edbb168bf6b17315f04855cc290e4efac24f8175b96f41218656bba
-MISC ChangeLog 5653 SHA256 82d2c1f9ef0fc7ee887054bd2441d05145150c9637c319e8c73a2949d2f8bdeb SHA512 8fb5c0b59f0afd0e0645333aea523014c0d1ad18124d95ecf418ba04e2935dbb22e60928b926f6d61d157bff8573fe54c7696839de67940abb20dbb1490c4dfe WHIRLPOOL ec24cbf33f403f82f74c21b4e412ad4ebc0c66d49aa1077e9a80561bfe5ea3c4b30e04840bd89f1e2c1dd082ad89ecda77b28f1b74a832089d69ac2282f4d93e
+EBUILD pymol-1.7.0.4.ebuild 2553 SHA256 b31adb810360896cf6784c1a6e7dbf78ee8c4ee5932b39f2ab9385e0b8effc33 SHA512 7eddb5d4dff2fdddb6631ba64a59989258381c6eb63174f0ef0d44c8afa108e9c9cde902daad7c17a44f4eaa6cb44bacd313171c9f213f91af3ba0e3ebc54d26 WHIRLPOOL 70e125d140e350664d1b2fe21439deb65a9c1b8cef2458e77382bffe6468211a86a13b1224f0b2d247a11631fb4d9891a86d38a638ccfa482cf5bd81cc216392
+MISC ChangeLog 5769 SHA256 1636b046bbe6f0b0d6710a06f4b96a77969ab66403bbda62f744d90a6610e048 SHA512 93e3ebee11931074c9535530588ec50c459a428974ceac21f75d54b176fd9ca67b09543a4220d2aac813eb721d52d4f0c3917e3c9e5a328d9f91919d048c4fcf WHIRLPOOL e1063e5ea27f26b0f719f7925f308f4d979f6be5b8c34f2bb506334c1d1d878042f28f8d7fdefd5bea10f1d82421243afb6fc9fe4dc5ab6e624615fbc62b1821
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS5NOLAAoJELnU8jG9FVirpgsP/15CnoCtu3A9/+nF1MBIawgO
-YSGqMhFadsrUBiCs5gDHvH6CuX02SSjm+6UskwpYwB2IWZQ1w5Jor6qfJwOpLUL2
-Pk5irtA+YlzlXovttttoM7xF7X6tBepGbFXJclWq/cQnR5SP0AxMkfciFzZ4LzTl
-7xj/3kePpoYBCmWvlGnqXv0jLOttT7fCOyhs6wJejeFRBmEwCSCtBD7Jz+D5MoYa
-YsPWgWUmfrLe9w4V4IixPm/M/P/EDrbb+5HYPwpel73ky9DnTwtXiYiipmTgb/Fb
-lh7qCkQA/4e0IDlD5YPoxqk6APAiEPR5CKPwTLpg/OtDC1hrATmiblhCchPXjViM
-9RI1Ocrixj4If3PsiIdP28A8sFqRwLXPjY1FN5EDcCw8VoyxFUx/If+O3zj/dZRo
-nMf/dCI4ik1IgyoxFKg38R8q8IwnnJGqTn8TQwJPx0Z7l2kDa057+aTm1/hyDOxX
-YFcMkifAJ6Ghu4dn1jB+HXlccqI09CvSlvtTWbP1OvLJ6aKgrTusrKDqn6k3So5j
-5g0uF4ed8K7XbndJJ1lO3FTvuh8yjxvTAQ/fdxFmceuNGw/te9QBhAWlR0vuSdSD
-4mcKgeHlCQ9+xi47P6c91TTYbhLJajxO3zQaop0gi6w93weLrRIVErfmLwSUqXiT
-EpW7Om5tXyTRfCvEN0Yi
-=OMZ+
+iQJ8BAEBCgBmBQJTHWTVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirL88P/jeSh/jPITrsRqq6j88d/CJC
+k5AVIlO/qyNXHT3s/LUnfMn7etOwh8Lmbtf4XOlcax8A0nmOMMzJBu1jdzWr0J7i
+MkwMMmXMDz/ZjDnlrRunq1DHXKVbGScTlJnFIGey/cARrgDlAHtrGrMUZyPI6WRP
+woy0ddPrBJzO6Iv9sIZf+1965ORmTQFBZ6BSeTtUQ86hfifwXmhNyZFDaxsiDY7R
+dMM5UEZDzMVRiDZz+Nm3G4FJryDyIY2XxfAEdKnN1zDILqJ510iPNYY+mEVBgPdz
+e96v3Pu774MOGH0kzkI/0WGWywyFOyk/mjewupdhAqx3D8o93LYqWjH6Q65ndJkG
+TxcQWuKf7uogueV9/T3X6UNG+SMN9Cxk4oq8it8mV2okJeEOXgsSmScJbdyevGrb
+als7Kj3DzBfCkgfm97danuTwAzqligu46+fwKG3/kdYqEW8BHjdakVmAa0FnTkte
+g8U2QJ97dyAmQM8JNagamWTG1+qe9rI6YGEYQUm0K6eUL/8W/uM76CWmC9kkJ2wB
+9v4dn+pN0G04wCD6/03/mbzH2mGBgkwSOT7w/Jz6D88tRL45hEYwG7loFIcDqwFY
+NteMBP/Y/+50EQMC3UJc7FWNoIIC3oCUkSANPbqaxLytzdlZ7B1Mqe80pwz1LEge
+8z7L/6hpOXNJXi+Kf7EG
+=GM33
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.7.0.4.ebuild b/sci-chemistry/pymol/pymol-1.7.0.4.ebuild
new file mode 100644
index 000000000000..59a5328c4446
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.0.4.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.0.4.ebuild,v 1.1 2014/03/10 07:08:07 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
+}