sci-chemistry/pymol: Version Bump

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 108 insertions, 6 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index f1b55436410d..2382f9cf54a2 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.100 2013/03/25 07:55:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.101 2013/06/12 08:10:49 jlec Exp $
+
+*pymol-1.6.0.0 (12 Jun 2013)
+
+  12 Jun 2013; Justin Lecher <jlec@gentoo.org> +pymol-1.6.0.0.ebuild:
+  Version Bump
 
 *pymol-1.6.0_rc1 (25 Mar 2013)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 9d1475d03069..bab96703adf6 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -12,15 +12,17 @@ AUX pymol-1.5.0.3-web.patch 545 SHA256 559fbf42497c33a0ec844a11d7cd89178a8e0bae4
 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-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
 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.ebuild 2337 SHA256 a6df3b85b342539aa4743164511f5c39361db0141cb3acffda7242bd1837d398 SHA512 104221e52fa572aadf58ecaaa817510fee4c7defe47ad826b9b8bbef416cad3be632624343ad38f6265c73ea51255dacbe1df4f19b912c680ea9f1a072b84853 WHIRLPOOL 54524d364491f913e66b4c0a3b5cc0eabf38afde975eedc38e0d8d5376a6bcf274ad0ef8a55c3f634ad59d9982221a8b78e59291fa0aea5e694d12821b2add62
 EBUILD pymol-1.6.0_rc1.ebuild 2270 SHA256 4a7a7bea1ce4c0c96c0dc6a2a624a33ab779b783776a6293b38a11d6c028a751 SHA512 826ee97eec01fe34ca34cfdee1c4a85e994e861297fbf7dd93b63e347aa83800c84f21aee8c7052d4930bc6a299fcab97d34ca7849e7ff80e5394c609beda2fd WHIRLPOOL 70ec2a72a1ace006b1d0b98958d22d916b60447a7383c0a7891db028c33ace1a12c649626428cc3aea1ef58632e646c04c1731332c7c638393253d3308427bc9
-MISC ChangeLog 4485 SHA256 29b124b9abb1f0aef1e67fb44c025e978f25efe1417df4650b8d44634925b5b7 SHA512 8424332adebde3f2dccc78c2ac62309727cb29301ac55250c735df28134fad3ce0b0b437596b85fe959074ec6b48ca12bb02e2f633864fc47a24566c78db7e5e WHIRLPOOL 8532f9a39dc23b2a949245336bb92cd062d4d1dda888fb9f3e07b3d797f9934db6815d550631264dbf59acde080e25bf82d1517b6b4b27651c7e8b08f897803d
+MISC ChangeLog 4601 SHA256 ee3c26b418dbcd068036413e2bf60a3bd0939732f7b9630f3090a6cd8add68e4 SHA512 458c134d4a0ba310938db1bc2dc7e87c1c2e87880d39a28732d5957981b37518eb7fa157fde3e9e51aeecdb0897118f1835c5d5abfb4beca70abd9a8eb6a6b49 WHIRLPOOL 458b9f46eb916c27db20fe1d7ed50658bae840a3d06d1c1340c3f45e5ddda29e63f319fac6f9d5d6a482dde1ef346a32eeb42b4a1496b10d2417bd6861c4017d
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlFQAvMACgkQgAnW8HDreRZutQCfbFtW/t9dGJ+9enB0fLSfEVAQ
-IUQAoK+Llx1uzx+rFDWHJ0S1rSpYuqHi
-=P54j
+iEYEAREKAAYFAlG4LQoACgkQgAnW8HDreRazUgCggkT6xxdwIeFvETB0DHiT/EOi
+umgAn3jVuq+eG0+loWHk1/6mMZw1uN/A
+=kF5i
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.6.0.0.ebuild b/sci-chemistry/pymol/pymol-1.6.0.0.ebuild
new file mode 100644
index 000000000000..9e0ccd8c2a83
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.6.0.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.6.0.0.ebuild,v 1.1 2013/06/12 08:10:49 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/${PN}-icons.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/pmw[${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
+	)
+	web? ( !dev-python/webpy )"
+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
+
+	doicon "${WORKDIR}"/${PN}.{xpm,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
+}