sci-chemistry/pymol: Version Bump

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

3 files changed, 122 insertions, 17 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index c0196b345f6e..855be012bdd3 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pymol
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.103 2013/07/16 09:12:21 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.104 2014/01/15 07:42:51 jlec Exp $
+
+*pymol-1.7.0.0 (15 Jan 2014)
+
+  15 Jan 2014; Justin Lecher <jlec@gentoo.org> +pymol-1.7.0.0.ebuild:
+  Version Bump
 
 *pymol-1.6.0.0-r2 (16 Jul 2013)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 37037029a99e..9eb4d077caaf 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -14,30 +14,33 @@ AUX pymol-1.6.0.0-labels.patch 17150 SHA256 b1385696a5f781e51adcd61774362f76c4f8
 AUX pymol-1.6.0.0-stereo.patch 1839 SHA256 accbb7e142d2f4709605d156c169146836d78d29514af5eeffc5c6121d5e056c SHA512 bd32c26dce36b2a44613470f20ef8916111acc20f6525185b9c4b33c25b03efea4ee00f35ab391f8c12874d3bc9e1be665b5706864e660c85b2432b97a9c80b8 WHIRLPOOL 16a30e3830c17420bc53dc86191dbf6b366be94ef5484798e945600b3fc97f83df742d7cdbcbcfa574cb4a4e7c9ff5501f7301d1f33c3a11682f99aadd52dd82
 DIST pymol-1.5.0.3.tar.xz 7412080 SHA256 b304c2839bc944bd2619403474d36cb846b372ba281c8f05931d3f155a0aec7a SHA512 a3f1dd3089fa4158840f2cb8c3848ef70284d1f859429cfab6ac9b00f649d7274a3ac7697a7fb4996d7643068a916f9ad7b1952c5ff27003cedcc7c89e795485 WHIRLPOOL 82788bf6fce52d76ff00d1d7243e8f3962027b4512addaf0fc2f881aaf5f0da6582cb3b3b56a178ed36572947273a999be3d67ba49845eb887da6cf242c5b5f3
 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-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
 EBUILD pymol-1.5.0.3-r1.ebuild 3131 SHA256 3381ef60e5dc156116f2ca0e8cd9631c58d38e188f7de4b00e91a39b099f50e3 SHA512 4a34c1416d871da56dc8d753ad46b97a0167dd63a14919d59e601143ad60236b8267b0d779fecc970e1e5b4c8ce1716cca8d125977b92af1d8adf7e2a045f1e0 WHIRLPOOL a05f2b444bb281b78d4199c23c462663d3184735cd66c946f2d32e673593f442876027b142e0cdf6206247574b539526e7aff7f6863f4ce97f878cd783828fe8
 EBUILD pymol-1.5.0.3-r2.ebuild 3048 SHA256 10f44dc1054724a3abf111b5232bbcbf18920066778afdeb965da10bbc7e92e5 SHA512 31441e2cd38615bf977273e5ad7114a99a6680bc9e096625724eef4c71a53186e2d84e41977fc95650728cd0dd0201f3081af42d31019029a24b9154f85d2490 WHIRLPOOL 46cef085836c28f9b41693af62c9a2f5371f6cd54b8bd00013fb799a1cd7c04016a2934728dc0128693b8ddd7be78a22947283c490aa9f2c3ca5fc0fa604e6c6
 EBUILD pymol-1.6.0.0-r1.ebuild 2419 SHA256 7bd6cebcd5d308e5facd47705b857689da698359fef1c866346880f1470470ee SHA512 0a599151b7bcf6f8de25f2f15bdf5a4d80e1c25e94ba5cf5311c608d7a2d2dda4eb3f52af5525a4a8c6c3d4e7b600db28f490f3119fc26b901725b307d058601 WHIRLPOOL 2ca9788e2031f62dc803648e86f7cb2d681e1dcde7efbaac00d7dcb04a73dca1109b3682ab237e4ba68a37f908e16d5d51c4e10e316fa60ae367535404e86db5
 EBUILD pymol-1.6.0.0-r2.ebuild 2452 SHA256 01f212ffafbd5030f0dcbf6a47af22002a876a8cd4c5fcef5cfa67bca42eff80 SHA512 a621d6a9017a31bd0816df591890bfbc3de7e315ba21ad22a9145fae2d5802f8fa23608e703a0dc2bffd1227d2f8b75ad046956a83ac4f70af7eb6d1392e708a WHIRLPOOL 3c6f2e4667acbcecfcc25c51ca6d14d14774166c4b1dbb77874127ae536c4bbbec722babb904795faae191655c7c856ecf843c3fb509e3826fc5088e67b28422
 EBUILD pymol-1.6.0.0.ebuild 2337 SHA256 a6df3b85b342539aa4743164511f5c39361db0141cb3acffda7242bd1837d398 SHA512 104221e52fa572aadf58ecaaa817510fee4c7defe47ad826b9b8bbef416cad3be632624343ad38f6265c73ea51255dacbe1df4f19b912c680ea9f1a072b84853 WHIRLPOOL 54524d364491f913e66b4c0a3b5cc0eabf38afde975eedc38e0d8d5376a6bcf274ad0ef8a55c3f634ad59d9982221a8b78e59291fa0aea5e694d12821b2add62
 EBUILD pymol-1.6.0_rc1.ebuild 2270 SHA256 4a7a7bea1ce4c0c96c0dc6a2a624a33ab779b783776a6293b38a11d6c028a751 SHA512 826ee97eec01fe34ca34cfdee1c4a85e994e861297fbf7dd93b63e347aa83800c84f21aee8c7052d4930bc6a299fcab97d34ca7849e7ff80e5394c609beda2fd WHIRLPOOL 70ec2a72a1ace006b1d0b98958d22d916b60447a7383c0a7891db028c33ace1a12c649626428cc3aea1ef58632e646c04c1731332c7c638393253d3308427bc9
-MISC ChangeLog 4998 SHA256 3123b14b6e0a62350c8162ded013cd1c51a157cbda26a265d6be84e68c232c12 SHA512 101a26807e67bf580da6423e04542b1d8a9e8979e73420b4980ddb629db4156fda26466bc109aaf65034913d9bf64c0369643e5416f3aa272de8dc9a3199a2e1 WHIRLPOOL bb23836aad43a9d321b2f1fbf87f7f88fb452046c8618be6c8e3b06983370259764092e86d63bd3b16e514355ffced211d4e07452ceff52d321f62314c0e0157
+EBUILD pymol-1.7.0.0.ebuild 2445 SHA256 202d3b907d0793e29f90c085736e4b1fdb243e1668b8210d3bbd89c111ca88db SHA512 da7833c39e144300da328aec347676186e5e6883f36317df276eab65322ae782c0b2d5c0cba6f6c3601db73adc439e4aca2dff60d0afb130d985abadea7051a9 WHIRLPOOL 3a8d5401b058dbdf5769c41b506f831a4fe1a2c865d418ab7a002f3d2de02244407eca488e21137168ff374e5a2268dd5f2d42713f42e4360de70ecfbabf741b
+MISC ChangeLog 5114 SHA256 2bb8678d8b3d9abe0071e21632ffcf5fa772bcfd3d30dc4a072ee944cdbf6059 SHA512 a87147e718a6379f08e9df11f81c3d6cee8d7dc967b40a14b8951ac257028f655fb42cd52fccce7693aeb21dbb7f67ebe986fe0df786f6c204b898d7057942ef WHIRLPOOL 92b623fe80e47bd43511839207cd5d3d4cc5394134005cb67bb8287cb89636e127e9642d2cce89da0b205ea4bc3cd26e38380be7b37bcd146ec6aa2b78984a6a
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR5Q52AAoJELnU8jG9FVirx/cP/2pXOKRNjf7wudZE/ZL6pCPk
-3pxKlMvkLAoZ2A5PT7DfNCKs1XzlDYvhOL1sGnNbjoZdgX2JSBDMpaJzDUbEWdPs
-564ypD2JXg0UvugcYrFc8zpR6MdzgiRGrBCFug4ZaHrN2g7XxPotLB1DxVON+epc
-A+6QjYYWNQh2Ik7U40lfaj3ykcQ3lbwXISQAaeBvvddXhBJeqd+gzntPNqappJBR
-UryHD55rXPh8xaR5e2zUUrPoq4Dhj9f2I7lJsweqfrWYrur4u2tuXKCMsS9h4IHs
-2SlUToA5X7XpEF6Qw9/dt5NRBiZMay7B/TfPbounhZZoBHoeCY+85+4unFCVjbCk
-zasIPjH9EMv1IyDcb4KZv85XksIgwukKZXuSqr+Tw60ekveCv5DNX8V0Q4CSqBHz
-+dEatCbr1R+j1WELr+k5h8/ruaipN7tZdZ+mE70y3jSrl0ZiS2XcgFz6CLPqnZ6u
-9OA5iy6lm6pumH1uH4pBj2j0Slmn20C+Y+AiTeu1+ZSUyzmzjYjBDQ5KNYczFfL3
-mW52Synbxk11lkFY3sLSYdMtLUEVLc5e6qPHxdUwmCeA4tQXwMYef2RGWraYM2My
-Rz9iJENq1gjUw3AxE0V0MUjKopDufj2F7rIYAXR3bZSpdxxUp1WhYQSn4xNccyy8
-UG9VpbeYXjgXX5a0OKHm
-=zO8+
+iQIcBAEBCgAGBQJS1jv8AAoJELnU8jG9FVirK+gQAI8SA9eFuSUTRxOcmWF3oa60
+Og74jSLEzGB7LoUN29d/8OHjGoloFPmDf1YeNeKTQmQKihGVf4pXRjaBQpcG5ARO
+czwZNhdYLHEKIR0rgmS2pUmJoqrTu59UC7xp1DlDxUU8tNHk1rrr8PxdfDgBYZcO
+NPld/PGh5KSuG5Fn4OA0vzhdPGK5o4cAcVzbmHCGPpzxg4cuciLQDvzM4n6esT0k
+ZXAFB3jS/1ezsIVbHkJ2g9cqHieRF/jcUM6h/hpUxkEIeJfuaQAGVGu/m86ipvxY
+EiaiRLyVzV7f5SCSJy92/Q9dcyHTZ+F4WnUmz9CAfiWbbMD9saNj3KSznsqgRNNh
+6b8D80qXwEvNERkphSK+nobRcfYUFTuX8pEKsiVuYCDuRWlcFvF/j3kG6eZuTagF
+VVzmiZuUSP/DsCy2PPlGsCcJSUsGO4awetVRV/fyNV0hXzPBDwXMV5Hzq9fAS5ZN
+DlXOZypL8/I6U8cuAhbRkiGF68DGkDEcMnJ6q+vVxx+n1FIDoslqM7shMUhtQOAr
+IFFyica4HvIx8FfWjg8v1QyUAjri6L6o22nzLQEo7Qr0v9qX2HI6skpIjw2DeplI
+phat4/HuNH+tstFQX+AwffzyD6vaByBH5HVQq6CLE82c8UhrjvU8JIIIbsguB/7+
+0NjoFwKindfzP83GNNzG
+=pSTe
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.7.0.0.ebuild b/sci-chemistry/pymol/pymol-1.7.0.0.ebuild
new file mode 100644
index 000000000000..04d2642ac44a
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.0.0.ebuild
@@ -0,0 +1,97 @@
+# 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.0.ebuild,v 1.1 2014/01/15 07:42:51 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://pymol.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
+	http://dev.gentoo.org/~jlec/distfiles/${P}.png.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? (
+		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}"/${PN}
+
+python_prepare_all() {
+	sed \
+		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
+		-e "/ext_comp_args/s:=\[.*\]$:= \[\]: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}"/${P}.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
+}