Version Bump, Python byte-compilation fix

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

3 files changed, 118 insertions, 5 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index a4f11d2c7e21..1145c10153b9 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.73 2010/10/22 08:36:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.74 2010/11/11 16:28:33 jlec Exp $
+
+*pymol-1.3.1_pre3925 (11 Nov 2010)
+
+  11 Nov 2010; Justin Lecher <jlec@gentoo.org> +pymol-1.3.1_pre3925.ebuild:
+  Version Bump, Python byte-compilation fix
 
 *pymol-1.3.1_pre3924 (22 Oct 2010)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 5d4eea04039d..611f3dfff5f9 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -13,15 +13,17 @@ AUX pymol-1.2.2-vmd.patch 1250 RMD160 fa5064d842099cd43e951278220b80fba170c5ec S
 DIST pymol-1.2.3.tar.gz 8281001 RMD160 125b4827b1ee5708ed28ac5bd8988a75b707ce4f SHA1 435dccba925298fa4865980a7139edcb8748accc SHA256 7d85e3e818ba357fa6df0db2248ef5555f84394559790e88e7003d602a20ab9f
 DIST pymol-1.3.0.tar.gz 8468105 RMD160 0681e0a2a565d4abfbf16d0d28bb2232eb9057b4 SHA1 a4f8f380e4af1e38b72f8b6e67eb0a48a6ad7131 SHA256 6810e2bc28c6fb949a10b22e1ef29851a570828b93b504d2bc4ac3eaa404b006
 DIST pymol-1.3.1_pre3924.tar.gz 8185908 RMD160 5bfa82a088fbbbfab43b4d47223f075be17b41a9 SHA1 b02c0fda4e324c4630efba534b95f1e906d95d7c SHA256 9e742edc846c3bea335a07845eadffabed48815dede63d331bbbe79486f3b0ec
+DIST pymol-1.3.1_pre3925.tar.gz 8185909 RMD160 da7fcdfa9904071fda98ee2f8c318ea9da7ec657 SHA1 6437a24ff2ffef3c498ebd9b0e87f0788b128cb9 SHA256 b20bcbd7a68c840852fd8defbc1a8305dc54d6dfd62ac7b2b47e77a67fb515da
 EBUILD pymol-1.2.3-r1.ebuild 2640 RMD160 4bcb32f90a2bf09989eb26cac13ad3721ceb75ee SHA1 ea316d2d72403eb25a42fee514f9c071f6d56ded SHA256 b8f23630086279243568e51c847823f7067f7004db1bea7d06f9c9b1202e7147
 EBUILD pymol-1.3.0.ebuild 2570 RMD160 7486182996bdd206fbd30e505205f8fae087d045 SHA1 07a7c6040faab6ee470023ba979aff09d13158e4 SHA256 270a0e38e5463815661661d5ac302e3996a226e41371de05dce32c8d48123437
 EBUILD pymol-1.3.1_pre3924.ebuild 2617 RMD160 b729c2dfc5b13b97ce5bcb6422ac745b0d10ee1c SHA1 14ff465676de59b357fb8815f297fd39b10566bc SHA256 82f89722c3f381180a2ae7b71541dacdf4acb531b64119fb77b96330ffb290d7
-MISC ChangeLog 14521 RMD160 04671b71cb73104709b55487008fa7680939d29e SHA1 2f183da35ebf0706f75a548da2e1229b5a3d43fe SHA256 27800458712238c6483440ab5e99705a4d3abda4dfea92223234a5e54a799ede
+EBUILD pymol-1.3.1_pre3925.ebuild 2661 RMD160 211cfee7065bc86b3159a9bfc921347cac9edbe3 SHA1 9c292d069d2f047f577b8db2f9bded1c10cfdd08 SHA256 201821dadc0643768aadf159ad03cd19bf99ba20a88e141a6499833ba884fd56
+MISC ChangeLog 14678 RMD160 fcb2e1f9730e9366a04f3132f46567b649cdef02 SHA1 899c75dd87dc7f196c19de44358bba75f36e2d9d SHA256 b35d750a591bc622e8830b96d40b37c3a37bd831d74a4a3ab4bd49cc87fc8548
 MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzBTRwACgkQgAnW8HDreRbA7QCeLCUqBFISGcDYqsy300VvpO4y
-mdkAoIcPXzYMu2ZQ9DU7nTjN3QmolE5z
-=pfb5
+iEYEARECAAYFAkzcGbcACgkQgAnW8HDreRZuXwCgz3kKX9onG1ROE4l2O7MqnBCA
+53gAn3lweMxyaKcK5rdXOPp9vLH9/uv0
+=Hcxz
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.3.1_pre3925.ebuild b/sci-chemistry/pymol/pymol-1.3.1_pre3925.ebuild
new file mode 100644
index 000000000000..ffe2e9284e21
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.3.1_pre3925.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.3.1_pre3925.ebuild,v 1.1 2010/11/11 16:28:33 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+PYTHON_USE_WITH="tk"
+PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
+REV="3923"
+
+inherit eutils distutils prefix
+
+DESCRIPTION="A Python-extensible molecular graphics system."
+HOMEPAGE="http://pymol.sourceforge.net/"
+#SRC_URI="http://pymol.svn.sourceforge.net/viewvc/pymol/trunk/pymol.tar.gz?view=tar&pathrev=${REV} -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="apbs numpy shaders vmd"
+
+DEPEND="
+		dev-python/numpy
+		dev-python/pmw
+		media-libs/freetype:2
+		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
+		)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.2.2-data-path.patch
+
+	epatch "${FILESDIR}"/1.2.2-prefix.patch && \
+	eprefixify setup.py
+
+	# Turn off splash screen.  Please do make a project contribution
+	# if you are able though. #299020
+	epatch "${FILESDIR}"/1.2.1/nosplash-gentoo.patch
+
+	# Respect CFLAGS
+	sed -i \
+		-e "s:\(ext_comp_args=\).*:\1[]:g" \
+		"${S}"/setup.py || die "Failed running sed on setup.py"
+
+	use shaders && epatch "${FILESDIR}"/${PN}-1.2.2-shaders.patch
+
+	use vmd && epatch "${FILESDIR}"/1.3.0-vmd.patch
+
+	use numpy && \
+		sed \
+			-e '/PYMOL_NUMPY/s:^#::g' \
+			-i setup.py
+
+	rm ./modules/pmg_tk/startup/apbs_tools.py || die
+
+	# python 3.* fix
+	# sed '452,465d' -i setup.py
+	distutils_src_prepare
+}
+
+src_configure() {
+	:
+}
+
+src_install() {
+	distutils_src_install
+
+	# 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 -f)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol || die "Failed to install env.d file."
+
+	cat >> "${T}"/pymol <<- EOF
+	#!/bin/sh
+	$(PYTHON -f) -O \${PYMOL_PATH}/__init__.py \$*
+	EOF
+
+	dobin "${T}"/pymol || die "Failed to install wrapper."
+
+	insinto /usr/share/pymol
+	doins -r test data scripts || die "no shared data"
+
+	insinto /usr/share/pymol/examples
+	doins -r examples || die "Failed to install docs."
+
+	dodoc DEVELOPERS README || die "Failed to install docs."
+}