sci-chemistry/pymol: Version Bump

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

3 files changed, 122 insertions, 15 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 31efda388b0e..7908d288b5ea 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.106 2014/01/26 08:03:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.107 2014/01/26 08:12:09 jlec Exp $
+
+*pymol-1.7.0.1 (26 Jan 2014)
+
+  26 Jan 2014; Justin Lecher <jlec@gentoo.org> +pymol-1.7.0.1.ebuild:
+  Version Bump
 
   26 Jan 2014; Justin Lecher <jlec@gentoo.org> pymol-1.5.0.3-r1.ebuild,
   pymol-1.5.0.3-r2.ebuild, pymol-1.6.0_rc1.ebuild, pymol-1.6.0.0.ebuild,
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index f9568aa3cac7..9067b7d65bde 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -15,6 +15,7 @@ AUX pymol-1.6.0.0-stereo.patch 1839 SHA256 accbb7e142d2f4709605d156c169146836d78
 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-1.7.0.1.tar.xz 6550492 SHA256 e8c6f6a465aec78171daf5cd981ebd1614dfa5e014e13c85a044cfbb591841c8 SHA512 a09277cd827f832c4f4e307f6117613d2ee8250643d129a5c34a30ceab2bfe8cea195c71a138fff09b6c69e9427153b917d7d3a7262d154ada5f323ec9635087 WHIRLPOOL 1803b55ade1b04de5963fd4a3bbe1354cda8759e15254c644952e25d7dcc904bc7b9fd91da75fdb8c6a96fd118a5a21bec9c8bba368744b44436747faca5cd9c
 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
@@ -25,22 +26,23 @@ EBUILD pymol-1.6.0.0-r2.ebuild 2444 SHA256 9580dab171e5c2d96596d443925728ca0522a
 EBUILD pymol-1.6.0.0.ebuild 2329 SHA256 72013c55e9e223c76a4643a8b423292b43e2e9e9e1b8271fa1d755c8583443f6 SHA512 1236f1a2da2b0c2e9c7d105c71ec56a96febe7181ba10dd9dcca2960e4f8fb5747721a21f0fa5e24f74d77ca5523248159272acfb5fdc4f1a3666a6954b07372 WHIRLPOOL 34c61d40893617b21c6d1c7ef0b52f9de4f7690fc7566db27105ddc46fa826143699a86e5de89a27c37886f8434b0036b62b356c7b3872468e030f43ddbf7a9c
 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
-MISC ChangeLog 5460 SHA256 eee3fdae4ab6f7f0bf4dc96209264ee2fc536a7230072563570ac7c965ba4d21 SHA512 9806e0f41441c74448bf1b52cc0d7d90e98c509f5a33655249f9e366d6b3d49016c974fc0148bd0f1e60eb33eaf3586dd3af953577183748617c1002b64b03e3 WHIRLPOOL b0a4d8b912a08b189e65d592ce1fdcd4b5778d07d80969683a2df72954dbaa8ff7654c262e11c9a4f085bb477ec90980f64edb7b862127f314a10e905d36a595
+EBUILD pymol-1.7.0.1.ebuild 2553 SHA256 7fd10ccbf59cb01c992353b8a7363959c9f789f596fff9ebf61f91171fb35714 SHA512 c90dab7fdd09e0e9e38b811126423c1d36ec2f793443fca7d0e40522510bcac7be0359cbed6b190a706cb4de8c6b071f6a1e80c8477f19a8563f8cae569a73a4 WHIRLPOOL 0bf7d047e4774afa0e51f4c61c24458c3396c3ed888d78077dd2d1b8c2eb7c3bfccdf12b4edbb168bf6b17315f04855cc290e4efac24f8175b96f41218656bba
+MISC ChangeLog 5576 SHA256 8fd990b21a16329351635192e448f7c297f3545b6b6c00a7053ab49c23df7fd4 SHA512 d87f5b0886799b2983caac8768734b98ba4c0cd544ce3a8d9c1c396e925c5b622242533098b7e10a663d3926ec651077033eef4982c395b4771bbc45d74c64a9 WHIRLPOOL d2948e953cb4cf518fcb1e767fe33d8ab9452f1915647359de987fbf3f47a3bd009541c204cb92cc3079b38e2c6bf22dcddc8f16b531a6e28c11e8b9b3d61db4
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS5MFHAAoJELnU8jG9FVirNPcP+wbCPv2Agncn5WmFnGdi6PAv
-aDCiaff2nO4VE4utGmh50pmlYnoOusUMQuyoJc92frcGNCUhihCaZHBgpDiZ5xfR
-qHlC3s5bNIZF4jG/CwNlRpvaHCoG0JXHiRUprWGRXyT1fx7LpPVH9XYOnVh/Lw8c
-SMumFO5HSHtJCLlygAqijFBQJMWjTY2RSvXxG9UEYco1lSUn1L1rOLutsc+vBg4r
-3FZkdmZ9rmlKVsNanlkSGtGQRCs2sgeLew8GGpxKzpBEo+IEsvsp/hUmh/CRQ39r
-NwhDxBR7m2AIjG6Yc1B2dCrrr645cMf/MtY7xHP3/nb69iLKDJULqMHpE0932x3D
-ACAwgxqifzhXkv3PgBwzOjs9aG9XBXI3cdaZhZ4lAkEKIz4NA6KPxrFfJ4Kw0BEL
-V90MQkKMC5Lk4tmZ8C+8bV2Ewcbj0E6Txsz11nDGd4DPzLfpZ3EEodYPIrLofVoi
-Ko/YVA/GbYFxjcqTrFWmFcfB2LSyd0beZ7FHzMxvbdcK0RJ0neDMPPIC2NTmsnt2
-f32xs/DgcUiaEFHZFwXXUJ58NgVFj4aUm//2BOYh+YIs2djO01/ZNRojLsWO8AC9
-mev4ebdx2CD/m5jwaVPKpnnteSzQDPIbxZ5iWGUxRPnbbewEnM2gDr2nrReA2GyF
-BhKHScc9lWrkTbe8mors
-=y19S
+iQIcBAEBCgAGBQJS5MNaAAoJELnU8jG9FVirancP/3rb/iLPNWRmah88l322Jrtm
+wv2EVp1Sr6P3hLiZMFI/Q8toVLgvCYBY2hahdzCm0EEwGH54bmo2f3nXRxQgqwyB
+9f2p7kJcPTGbJ9qiO8W/njrKNRW7j+L1exqSRmY9z4p9SST7rvP1x6bYNZH2eryQ
+ZzeSkQWc2IlREWAzkRq/4TH9fJkPAtWBgTR/iOKKINdJDkH2O/eHhRyF6DC2n1ul
+y9hYr3GB0Y8/vrXM8bRLqQFFUA6LO0fHOWFhnBnvNdrVB3pQb9TJ94kSPbh4nfBy
+M4OVLifqdtCZ46f5O8+FuNQRStAWejI2SemwUmT+LZMxlo9k+kySrXqpRIeHMdea
+FfiPWGtUQFsBT4pQha4A5/rDKQB5gDcm0aPSivQkNTBrO1nya8zVc+youUbi+y3s
+MRL4ULspX8dgsTXzLMtje0xJ60NDIAyaaZZf3WG8mcK9dW2h6lrjZc9S8b1IcEqr
++HZsw9Vuua5LWBPCQQ8lAOVNmdMVmfuQTVHX6se+u75pAMxMz42bGGS6mJ6pP9vy
+LdJ9NQaemxwLccGvVEEfZFCZQ0JQ7Hw0lmKxZ4XjPlFOLmAwrYOJ8fh3Ma0Bta45
+CPjQxYokn70b1xx5y8A67mf9vV1J2YxYY1OVNbQuE/Bf8S4G7UVTDYiZp5gqw3e+
+qaBLI1splLfh414feV76
+=xnz5
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild b/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
new file mode 100644
index 000000000000..132f0cab83d2
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.0.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.0.1.ebuild,v 1.1 2014/01/26 08:12:09 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
+}