sci-chemistry/pymol: Move to new python eclasses, #453572

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x70EB7916

3 files changed, 133 insertions, 6 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index a83c6c81f772..0a8be6df600d 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.97 2013/01/22 19:10:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.98 2013/01/30 08:51:20 jlec Exp $
+
+*pymol-1.5.0.3-r2 (30 Jan 2013)
+
+  30 Jan 2013; Justin Lecher <jlec@gentoo.org> +pymol-1.5.0.3-r2.ebuild:
+  Move to new python eclasses, #453572
 
   22 Jan 2013; Justin Lecher <jlec@gentoo.org> pymol-1.5.0.3-r1.ebuild,
   metadata.xml:
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 615e484e297d..a06bc284feff 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.2.1/nosplash-gentoo.patch 485 SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27 SHA512 a47022fb97e176ca9f6abbab9a738cf3d59a6d7257d867ffdc7091fb726e24089e7e1523a902524e1f77eab7453c0ca2163716c365f1f8c3b5d58a0820d07828 WHIRLPOOL c80681a27ab1d99404e9d7ce94fe07a639e3c971a75177bd0c3232a45540e69d08f614c5ca72dbadfa4a066029581936f06cc8919ab375c1ddf3b66fd56f05de
 AUX pymol-1.5.0.1-data-path.patch 6765 SHA256 ad3ba9a519cc2a97c37868ce4d27a9868710be0dd32687327abd920c57db8661 SHA512 df17c40757012cffa4e63a740b9548b4b07bd81a691896c174850713fce8ec4a80bd6a035a03343c04e433ae9d09706c2d3e2b13d16d0fc6049708100025951d WHIRLPOOL b9f46b71f1c803b1c00976672a94984b786bc2b2d94c6dc10769c09113ece255bf14c0540cd106fa3c835b77cb51a34759507a3ec4674d5d307d467696a56565
@@ -12,12 +12,13 @@ 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-icons.tar.xz 38100 SHA256 03500f28256f67abfbb7d08b798b11aaa208f0ae1473ef2a7205b3c012ddb06a SHA512 5af51014d4fcbc85ef1fecd7667224709c9305b9b72bfdfd89ece2b4420fa8a81bf8c85fcc5903e2a670f44403f12764808f6a16ef42f111bbd0e7ed8e412d54 WHIRLPOOL 6104d378928c56b39f8cbe29184629b73f87da09e81e41ddc08b9b291876f1a30ccaf9ec257f47798c6d03253816f80c14567073c419fa48dd1520fa3fa58ecd
 EBUILD pymol-1.5.0.3-r1.ebuild 3131 SHA256 3381ef60e5dc156116f2ca0e8cd9631c58d38e188f7de4b00e91a39b099f50e3 SHA512 4a34c1416d871da56dc8d753ad46b97a0167dd63a14919d59e601143ad60236b8267b0d779fecc970e1e5b4c8ce1716cca8d125977b92af1d8adf7e2a045f1e0 WHIRLPOOL a05f2b444bb281b78d4199c23c462663d3184735cd66c946f2d32e673593f442876027b142e0cdf6206247574b539526e7aff7f6863f4ce97f878cd783828fe8
-MISC ChangeLog 4104 SHA256 d6207d69b324ace08371f8e39951bf875d73a16fe0b84221c6bdd69f3bfaf083 SHA512 768ce38c1768688314d258179f1fc1b450c5cdf7a8ec6ad30f81fc0e3796ae49d523a5417302417c1de018bfb9fcd84c52f62a53c661d9fc1774171e33dead34 WHIRLPOOL a96083710924539e0a51fc6a1e805ed2e4de3404249a05948dbd657e82fa1034e4ad1956708a347c3b2de8ca34075b7e98ea24f222dbe914ada0c31dcbdae918
+EBUILD pymol-1.5.0.3-r2.ebuild 3041 SHA256 fc3c6ad3c876c3ec0856b2dd1340119aea86cae5859f265a47f620e2492e48b6 SHA512 02ab8702ac6f0a4ee3ec9603377cf7d3b6f7bbcc714a2269b3726f026ca5d94c166351d416c46ac3c40bdbc66ebc71a9783636f5a2903e75b9b023fe076db583 WHIRLPOOL 902eb46965d5cc9a4a638cde28665a867dbfac07199ab3e7b791aa470dab20be0baef0072b790c6ce2910ed1ddf3d133a9cc2927264f7e6dfafef298957f29d6
+MISC ChangeLog 4250 SHA256 30aba0ab699bdc84f32482a72a9d39e94acc8813bd27d07ace727060bbd6f4d8 SHA512 16bb7ae678fa7536b88de8de05d5f75d83b8d35b839a88b16ef5aece893128b53e4e607f989052b50a63bea20ecb81465494e5bad603c4e06842d2ac38efe0e0 WHIRLPOOL 0cfe78a61493602509a6815611742883516648368e4f743b2338993d248b6427530af09dde73795a4180c46881f97d9a612317d07527ed8150019f20d3100a38
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlD+5BoACgkQgAnW8HDreRYSxACfb0X6IXkCOSQ9rIAybEd8Tp6W
-sGcAn03+lYuwzwS+uobfacwYJFYKzwNL
-=UkxA
+iEYEAREIAAYFAlEI3wkACgkQgAnW8HDreRb1bACgp/m9/NtqTsOAthWwRbBJy+ng
+Ci0An0TezvF6rgZ0Bzrvd7Poj9yz9E7f
+=YSfA
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.5.0.3-r2.ebuild b/sci-chemistry/pymol/pymol-1.5.0.3-r2.ebuild
new file mode 100644
index 000000000000..8752c8f519a9
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.5.0.3-r2.ebuild
@@ -0,0 +1,121 @@
+# 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.5.0.3-r2.ebuild,v 1.1 2013/01/30 08:51:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 fdo-mime prefix versionator
+
+DESCRIPTION="A Python-extensible molecular graphics system"
+HOMEPAGE="http://pymol.sourceforge.net/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
+	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 numpy vmd web"
+
+DEPEND="
+	dev-python/numpy
+	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}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.0.1-setup.py.patch
+		"${FILESDIR}"/${PN}-1.5.0.1-data-path.patch
+		"${FILESDIR}"/${PN}-1.5.0.1-flags.patch
+		"${FILESDIR}"/${P}-prefix.patch
+		)
+
+	use web || PATCHES+=( "${FILESDIR}"/${P}-web.patch )
+	use vmd && PATCHES+=( "${FILESDIR}"/${PN}-1.5.0.1-vmd.patch )
+
+	if use numpy; then
+		sed \
+			-e '/PYMOL_NUMPY/s:^#::g' \
+			-i setup.py || die
+	fi
+
+	rm ./modules/pmg_tk/startup/apbs_tools.py || die
+
+	python_export python2_7 EPYTHON PYTHON_SITEDIR
+	echo "site_packages = \'$(python_get_sitedir)\'" > setup3.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
+
+	eprefixify setup.py
+}
+
+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="${EPREFIX}/$(python_get_sitedir)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
+	cat >> "${T}"/pymol <<- EOF
+	#!/bin/sh
+	${EPYTHON} -O \${PYMOL_PATH}/__init__.py -q \$*
+	EOF
+
+	dobin "${T}"/pymol
+
+	insinto /usr/share/pymol
+	doins -r test data scripts
+
+	insinto /usr/share/pymol/examples
+	doins -r examples
+
+	dodoc DEVELOPERS README
+
+	doicon "${WORKDIR}"/${PN}.{xpm,png}
+	make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;"
+}
+
+pkg_postinst() {
+	elog "\t USE=shaders was removed,"
+	elog "please use pymol config settings (~/.pymolrc)"
+	elog "\t set use_shaders, 1"
+	elog "in case of crashes, please deactivate this experimental feature by setting"
+	elog "\t set use_shaders, 0"
+	elog "\t set sphere_mode, 0"
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}