Version Bump

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

3 files changed, 137 insertions, 17 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 564554e450f3..0626cb2058f6 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.128 2015/04/07 14:38:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.129 2015/05/05 07:56:30 jlec Exp $
+
+*pymol-1.7.6.0 (05 May 2015)
+
+  05 May 2015; Justin Lecher <jlec@gentoo.org> +pymol-1.7.6.0.ebuild:
+  Version Bump
 
   16 Mar 2015; Justin Lecher <jlec@gentoo.org> pymol-1.7.0.1.ebuild,
   pymol-1.7.4.0.ebuild:
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 553acf47e844..6392778fe2a5 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -5,26 +5,28 @@ AUX pymol-1.7.3.1-maeffplugin.cpp.patch 407 SHA256 852a4e0c104caf4ea2c297dcc25a5
 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.4.0.tar.xz 6528964 SHA256 5a732aeb8a02797a185f54c3bd8bb477a1a11976eb9f982f6cf79ce887ce3a4a SHA512 fa53e90413cb1e02797a30b21b4254901504edc029104567fd2d4c5ef630eb8c2eb9f5065b2b9e65f657aaa30ca8ac85c3314c6c7fbb89148d89a9a0964de3cf WHIRLPOOL 1467a9746abe60e371162e6065253fbb23453f80a4757a18936f5b6509f63657b7073ee5e118c7e4faf333371cd38c78917e1f4b0a3a684b4807972546180d69
+DIST pymol-1.7.6.0.tar.xz 6510380 SHA256 31d4924378b38b65fae5b294e0755ee15916f9e845ef2efe5e2421f463bf3b91 SHA512 ff8c37de07e0ed8dc1176224eea439109f2bd5e42b5c08316f5737a2fdcf5a1f267b625c166fa740296c20ef089873ae1ad6cb89b11111e9d3aeda0b6035d55d WHIRLPOOL 3582cc846695ca580a4bcd31db8079f32d3cb0d84b8fa1afeb0b210d7004642bf58eab42cafd552f360a5e20b546e554cf5420b7dd2e8cefa5b956a9453215e2
 EBUILD pymol-1.7.0.1.ebuild 2541 SHA256 ab47b988c61132017846e34515a52eedb07daed8880dd2dd9487d95acf03317c SHA512 c6d058deb85d3814dce5ce74f633c7b197fd933b301980f5677e8dac38a244054639e9e319d7f0bde31ae9e1bf28ec9b1a2c7eff98dddef280553e0a43568197 WHIRLPOOL 1f3b54ca2e6c195fb409d4dc75e282519e35db9bd2cfdbd0102d528a9218356efbef352ff7ba08a96005c5b1e3ed8a7a3383b77fbf3f76d7050422eba6139246
 EBUILD pymol-1.7.4.0.ebuild 2818 SHA256 80a385b4ce0e158386269b7c87c208d0bf0ba304e3a0bbaee33651b46e301237 SHA512 4e137fb23a48c61c6f812ed509b77ebc241f9496ef17770c079d0900da9cbe46658162f26357ee11b76e29bee9323959fe1772a53073d5329c0fb2cf0b715d7d WHIRLPOOL b3fc6b37550ebe9ca3c705f1562e8a096617e8355b13477129fa081bea42a97f6f26e70c0cb301d6fbc10fe293dc1e12b872290b6ffa95d64a2fd450117dc30a
-MISC ChangeLog 9133 SHA256 8ce9de0a06ab1ba39beb5baf9cf22eb83cb1d98969ff1fc9b2d6136a4430ed7a SHA512 7b9cb61f4ad4020445cd1446bd00a990579e011d000128cde977033a71a2866d7cb27abc649dfcad4a94cbb3dae0eea2d5ca2b8e1f0c763dad4aeb8ef9a9b9cc WHIRLPOOL 1128808e9d59a6d3747592d320d82f8899effa2fd83d13d53274c0b1bf26b88b41207307e8af36a0e16623dcaa1a6d444b302203a9009bdaaadc58532949edbb
+EBUILD pymol-1.7.6.0.ebuild 3185 SHA256 e8fcf8842ea9a3a898ac4b2bd3b0d9f258593615cd2604a9f2c3400c469f7105 SHA512 9c5eb85168bbbd17028ecb92eaf6032b46195c57fef2fcd3eebd4e1681ea0568bb8b3db73e497d9dc4911e56a158edf5802cbefc15862d22a01348ea873a8149 WHIRLPOOL 9d27ffe179e716a960ab29c08a7a0ad08a216a40dfb39d2c37d35c874e1b48545a4d009343deb2d750dc1e3c8582d6a1773a0b51b95727c98d8ecb15ee20e6ca
+MISC ChangeLog 9249 SHA256 af3906e14160cb5ebb7eb322d61264deb2f63dc91b37ebf057b04dd2ab7d4e23 SHA512 5570faf21c13381e4ae5b9ef9b2616967f1d364f5f6a9983b3229fb91613b1e6b10f9db1a7327bbeb6ab806250b8b4a83ca9b23c2f384e849d42d45920c28344 WHIRLPOOL 4aed75a9d1b61fbe2c66e0370931d2792ec0cb4cdd1dca0d1f5660dbe0febc4e98ca6c2f5ffe3364d77e4ccf5d238aac477170395594193c332247db3c0e80c6
 MISC metadata.xml 376 SHA256 4de13f45628d433a0e4fe6be267845e0337af9a3ddcafc04f889203b072dedbe SHA512 a10bdede05d83e9833dab7a4f3066cfd9e85e938dae32df09fea3df7be3d5cff63b2e20c476ad1dc8d1adff2c785e9510ee428814c0045ecf3a02c8c06cab025 WHIRLPOOL c065b66cd575bbcbdc9727cdfa25b62bcb41f7e00a94f44b3942d3c1ee9faf867749efcd5e0c9e6611c6566c43f63ace25a5d0ddee2dec534eb6de47cc537f17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVI+vmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVSHepXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNYUQAKLWU5DhcpXfRGJ6+hL1Xv7y
-exio7kpvvuTMUN0JYoMNqo12/JhivBZay7ojgr4nBob3Rc+p2Iste1ql9fplRWRQ
-gZqa1GV/wAx9ZIf2b/h3v/Pgurrqm4Txi5Z0aB6PtsBRLDveKrVXsfD+X8u66qVr
-yeEgsPKBjeD0CLEzztvEBW8gI14JuGuAnb8qRg96oVbMShfaOYqn6Z+KusA68om6
-tiBVWGA5d93NNWYTW2hU/ayALLP5aEFsokVBJDMZpM9j5aYoE6zGwDJOjU2OZ7S6
-lZiOXa+0lmE/v5Rt84lWN8k5ywMRCC8Du2T7TgDyFh27Df3gf4smdNszcB4izQOk
-jy4jAAfddeqPhmcZ/miC57vA1OTbvQeT0PGgHvQBXK07a9YZLukQVoIvSAFB3CgH
-xzX5oBXHcSh/0VJ+cEYJRPZ3cSsi5EbjjPKWEFwK16DFdywnARdikpaR1Hz00elb
-COLjJLYvW51kuxoXSTMyln2RI4FwtA5Q+sRxK50nCWwOotwts7b7War56IYMvd+a
-CvuMX56SDNfQWZZXnUztFVFtibLh1pp06Ocyl4Y+EgxevIeTK4yW9gU0mEXCpg8S
-UST90l8qEaiSZ0PPDYDiSPGUbb4YVwDUa/GuBuSOlY2eKCtCvb5K3Me5tLSr8ZXc
-k7jCFsPKNEpKJi7kYCY+
-=uzTR
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirs9oP/3Hwg/EacQKtPQPNcSCRdEJW
+VCpG0vD+W/m+Byd/fj/LEYK+Zk/v8CQiRUDxVZ1JLisj2+aOu0HPXmqAnAROnSDj
+ZJij9NGb+F9ikfXyBIWL0fXjxViFo8W/6JBXSl4y2oqc59Zz7QvTq0o3emzy9nqJ
+URJubq/GgQXKjfbkm/DNofFuI5xL2S1IIoINfTrwoHjF5GkI/MawiumE+hVSMnbw
+G6Ed1QV64kS3D44SOYHf42RqFl+kjyOROiVeUUYaO0R840dBoULexnIuZK0H+Wbp
+2rclDYQHHklP2JBmaXxG6xxauc+E+J2ucRGms32BwpzzTU9b9otykwy0rPvUtAvO
+1Iv5Vp259wLpsNnaRrzrK+Zok5q5pjtEbM9P2sVDKiz7wwTurY0QVKgtSVLkMBBr
+h5FPAAW1rHxKUXqzEu4tOverSuhdBFpQ947IBThI/Wfy6+kdHP75ITtXye7JOoNm
+SlVJv70UTh/UR/sCUASJ7ZF902WpTxD3v1sH2AHZb9ZIBwgaruyqdGePaBGZ2Vwi
+Udr3SsdjuSWedAoFUKyq80GswySRICGMjqDpJ5/MtEdb/bP+kpHc/8SUFKcaN77j
+zpG2mjRMhNphSfwJPIf9PagiCDJsCFfkEgBBoQmZCl7S/m2Dyp6b6j9cceLSIBnp
+6ynrUp69DywvLFYqKKmk
+=o7+U
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.7.6.0.ebuild b/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
new file mode 100644
index 000000000000..48406b7fe4c0
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.7.6.0.ebuild,v 1.1 2015/05/05 07:56:30 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 fdo-mime flag-o-matic 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
+# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
+
+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/pyopengl[${PYTHON_USEDEP}]
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew
+	media-libs/libpng:0=
+	media-video/mpeg-tools
+	sys-libs/zlib
+	virtual/pmw[${PYTHON_USEDEP}]
+	apbs? (
+		sci-chemistry/apbs[${PYTHON_USEDEP}]
+		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
+		!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
+
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
+
+	append-cxxflags -std=c++0x
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
+
+	sed \
+		-e '1d' \
+		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
+		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
+		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
+		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	sed \
+		-e '1i#!/usr/bin/env python' \
+		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
+
+	python_foreach_impl python_doscript "${T}"/${PN}
+
+	# 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="${EPREFIX}/usr/share/pymol"
+		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 ${PN} PyMol ${PN} \
+		"Graphics;Education;Science;Chemistry;" \
+		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
+
+	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
+}