sci-chemistry/pymol: Version BUmp

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

3 files changed, 130 insertions, 16 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 7128e69055c6..84e698dd8b66 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.122 2014/11/21 08:57:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.123 2014/12/04 08:48:11 jlec Exp $
+
+*pymol-1.7.4.0 (04 Dec 2014)
+
+  04 Dec 2014; Justin Lecher <jlec@gentoo.org> +pymol-1.7.4.0.ebuild:
+  Version BUmp
 
 *pymol-1.7.3.4 (21 Nov 2014)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 2bccb4ed3cb9..171a9b31bf4d 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -29,6 +29,7 @@ DIST pymol-1.7.3.0.tar.xz 6505060 SHA256 0a4f89a5cfd19859804794842bc0eb51554d86f
 DIST pymol-1.7.3.1.tar.xz 6516580 SHA256 688a4fc07bb88e80bd757ef9c6f9fadd3b2e09ef76cf4032e1119acb06d14d7e SHA512 2cc710ab772189e6eba38a3e44552f43fc53c3014379536139702bd24923ae85630ad2658ac4e4690820145f4cef4146d28025701d98e4c1540cc523c2553fd1 WHIRLPOOL f2d38ec9497d5a10982c00f07176acbeca0513057ff592dcd68ea27663d4dab386f423fad9686a624b420e11e7861f1d5db3a8ab8b5f978e6044d616c2d81392
 DIST pymol-1.7.3.2.tar.xz 6526988 SHA256 ed29e9d10d66015ca4211b0c1bbb0755dd73a5d6d9382f560708adb5f66d732a SHA512 9c7da95a0ba39cdccf66118c4792fea8b9bd016c50e6d5b07e7d7a25eb2fefca7514404f53ddb89af4622edeef17167d4a7c5955ee75b7a936b728fa8e92de6d WHIRLPOOL d51779b66c216b34a440e2d234b6824644c206f1144a9b20a7baec1b74b4dd30dbd42168aa453cd2b86d0d8ce46244a722849e9dc686b102fcf15f02ac5ed5d5
 DIST pymol-1.7.3.4.tar.xz 6526772 SHA256 68b89e07c6b04c1493b7af784a60bd74f71cd1decc260873d8221d9482552930 SHA512 8fd7aca344b1ffe90e0e434b2c11215cbcf1873c410e82eb44d386cb59296e1a6714ef58eb10fd450689f5fb1f6171aa1502a9b74935d8be8a1c54ba43c05c1e WHIRLPOOL 2e01a1a433d1acc4e152a7ef6e6d2b8ef2bcc7c9b7b1747976c17bfef15bcd73e8716401f43f0ba6b75a11af193d8b72de2756f60a677d9e054ffb5370b0cf95
+DIST pymol-1.7.4.0.tar.xz 6528964 SHA256 5a732aeb8a02797a185f54c3bd8bb477a1a11976eb9f982f6cf79ce887ce3a4a SHA512 fa53e90413cb1e02797a30b21b4254901504edc029104567fd2d4c5ef630eb8c2eb9f5065b2b9e65f657aaa30ca8ac85c3314c6c7fbb89148d89a9a0964de3cf WHIRLPOOL 1467a9746abe60e371162e6065253fbb23453f80a4757a18936f5b6509f63657b7073ee5e118c7e4faf333371cd38c78917e1f4b0a3a684b4807972546180d69
 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
@@ -50,24 +51,25 @@ EBUILD pymol-1.7.3.0.ebuild 2590 SHA256 41a7158fd607a267f3f670e96482a5428b8da416
 EBUILD pymol-1.7.3.1.ebuild 2773 SHA256 d53a6204866d76c3a6eed1cf17243463fe77c31bf910d252faf58d0d2c104b90 SHA512 ec233aea7f21645ce08be3ee85eaa3bd9e0da03c5c83bdfc45df7192eb855225f599aa874436d737f354dfade4fcc6feabf52281f7d16a7321c4950b27c2bc25 WHIRLPOOL f4b5aab663650f6a009dad439972f83320e80c1f9199c4a5c094bcddbce6a9ba408808479a0f02d700b46e294a2c52768cf561a30e34c7616b54a6b477dd14c6
 EBUILD pymol-1.7.3.2.ebuild 2898 SHA256 c89a5ec7aa7bcb9c1f1f70ba59f9727cb46d496c01cf55373bd07c03118ad043 SHA512 2bcdda5839383d45de57aa4180b8dc65d7a03fb190ab48245be03337a34d68a863e1a9a2500a279f5b650ec8543920a47c2bff45cad995293ced86ae6cd1d8cc WHIRLPOOL 78166ba2fbfa89e182d90777ed7cab99ecadea128baf672a6d3ec18c824209c6c2fdc91e62410137d86d737897ac50dd9730de3cfe368b40f2ea12d47f391370
 EBUILD pymol-1.7.3.4.ebuild 2818 SHA256 47b644e61d5357d75c5c1614b86a1f18e782bc466051d4aa0dccd89d0e1f974e SHA512 244c62be72f06a7a994a246e499bb4acdd2f138bcb3da51a4fecd8377da1a33328261480310e66fd48ef2c8972ebe927213e2dc70155ab2e0252616a286ebd0d WHIRLPOOL 37cfdf272a42f0a27e057a0e5dad175f8b16de46f317241fddffc9c5b5e13df070d05c2169dd11a5974fe5ec954eda79a21040c3e1b36565214d7ac002778ac6
-MISC ChangeLog 7661 SHA256 00031346ac1ca1ae9babb92d8d79300c8debc718477e8e77a6f764b852e94e0e SHA512 b8ccd211b2687d4aa09e79e47a9b687c056a4802929305f7ce2805137676a0135b80a4f4c942c49714dabb0579a255d7e3fcccdce91442532d414e5d69e5e4dd WHIRLPOOL 93504e42095d455bb0d6d51289ec6862ead17b39d0cdd549d30dab29b9892b5c529995a419cfd0c39b384bcdfa381f957396fdbe93c42cf212ed3f2d8b93c2a9
+EBUILD pymol-1.7.4.0.ebuild 2819 SHA256 20ba70e2fa1102dcb400e38d3e2c6c50263d4db84f4342c3f08c3c4d570ba571 SHA512 da4f8426a4ebb1bdb4b99ed50c0a3694906f54da5152a74d8da3b360c7418cc97d995acf834356bcb6755e2c3a69d554c571e612d4910b64ace0b1a41cfbf838 WHIRLPOOL 3ad66dd80bbd4d3f663080e3f1cb5f64dad07550a64af326a264f4f93e7c72cd92b8ef3d8e6178a152e9f99a1828bc3f841951476f5b1e52fd1ac1a4266964f1
+MISC ChangeLog 7777 SHA256 64f3e05488bfea2850473cc5b83399660ff083deeff82e421f0148ba581e95dc SHA512 1990cdc5edb4c5454053883d3cbab64d686837fed721a03d0de441ce702e97c14c415a9966a3334b6e4b710b0d60a0813687cd3925047d2e4cf35a0f355e1b38 WHIRLPOOL 0987acd886b9f642bd98545c6c1a80d9df97b97add2e492d5d23be29f23d889efa183a76e30893ddad0bb47bc3f48d7264c4794b22aa7d4ff419094aec06357f
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUbv6MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUgB/MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9CIP+gOMmA9JlIyCfZEFqVzoBjvp
-lAerNV0CL95dKKbN+UdiJW4nIUWA3aVKwrWwJIPZGBTk55HFTyaUY5BerMDh89+c
-YydIha5kmJQA7sC/8indhaCGfq8CxI56sVZlwXm94miW0N6hZUJq+zlmnjw9Qpsu
-HzILfeYyompnGIbRkIVla+EuzSl7sdMKnXKyomG5I2+LS9UdUbLvIb1YMjAbevqC
-TLr7wMu2vJr0sq/2ZkShRjRVWxvEKsMEV5EeFjWIbbxodmNUBAWOcrf7hCBo8GNV
-iQRfcKfilpal1AwJHTlNnrdji7guQFz3HY7ZFhxKZp22z86+8EVseqDJHys8xh1H
-1z7m4e6Jj7fM6VdMmwFEDS51g0GYBKqGJD0pVBZDlEWiQ3HKoTR6YUB0hhMUvZZv
-d4OJRgmX0ht3lmzt9nmBV+EaJ5nDG0EJFDN4EBA3EarjfDy1xQyR0vAmiUgxKQoH
-kagFn16lynwmbgVlMuDwRxb7BtGEAZC+K0sdrPn7XbwPuljd35RJSzLRrlCVYFVg
-svJ2rtMa3WMd0QEe0Ibnw42wFBFNxwxpGxMETEA2ABFzFhOURQwR2rzEeCsskKFf
-GhjBgX2ng/j5dTtFAthdOv+JqtaMdjmMso/tok2rFYEd/LW6kSh6GoqHOLQq2F2B
-E+w3Fui9re4GpTNL2xso
-=IJnN
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirYUEP/31v0UujsLqqSTXXHLlP0SxH
+LAofPEKdVrBOsBzdHTnShzpRU30jH09nET1YRJ1ZkGx6UMKxMnN5oCXMmZlBIFSl
+kBqvEA6kMCSaIN+zWD+hGeF6LXH4Zfi3X5N4le+ep9fXEYXcGorQnj4jW3r+dgcq
++9W3zit6PtFb63h8l+XqEoh20bwGzbijrrQ+AagxfV0c4k3eO5m04A1gpuc38eBi
+glp6mhFFNF4BCi6Z6bFF3v95/Rrhnz3ofoW8Ltb0SJN8KwjWZTjN7DQ2nSCKX5t6
+9EOF8p5K+obTJbQYrYm9guKtJnEOcFD779Msw+1k8Fx/biWjBuESFAAsD8NqBtVU
+dGDwnR6H7EHJzar8GlXCPlYa4YCQCPfT8BKpVITtULRqIzTPxfxzTF3IZy3T1zR8
+LCBCZH3GLShumpbvkTtlqGM0TlAZtWdqJkWu2Qxa8wENNiuPVbWO4a/Sg8IO9n9Z
+e08jYppi2ZPmaswMGURzHSo+n7maAx2t6onPFYKvbv9MV6WfQTTAPzyzdQjCv0ug
+B8vaeLni20j5idAYibzQXM8C9SguSEyMfPk5/eQfy7fwCSPfcDYDbUDHAaMwmRmm
+OjuXnUiiTyZHz0XXfxgfTclvgNvIFb5pkCTRll38kWXCagBTZt4PuoMd3hAj1ujR
+hKT14XupI6+jqX/doNAK
+=sXFq
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.7.4.0.ebuild b/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
new file mode 100644
index 000000000000..142fbdf605e9
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
@@ -0,0 +1,107 @@
+# 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.4.0.ebuild,v 1.1 2014/12/04 08:48:11 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
+# 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/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? (
+		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}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3.1-maeffplugin.cpp.patch
+	)
+
+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 ${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
+}
+