Version Bump, fixes for usage of python.eclass

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 154 insertions, 7 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index cb15a8826e54..4ed37e366017 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,12 @@
 # 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.63 2010/06/09 06:49:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.64 2010/06/09 07:04:48 jlec Exp $
+
+*pymol-1.3.0 (09 Jun 2010)
+
+  09 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/1.3.0-vmd.patch,
+  pymol-1.2.3-r1.ebuild, +pymol-1.3.0.ebuild:
+  Version Bump, fixes for usage of python.eclass
 
   09 Jun 2010; Justin Lecher <jlec@gentoo.org> -pymol-1.0-r1.ebuild,
   -files/pymol-1.0-r1-data-path.patch, -pymol-1.2.2.ebuild,
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 0ad51d15d52f..c5c78d5cba9d 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -6,21 +6,24 @@ AUX 1.2.1/pymol-1.2.1-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c
 AUX 1.2.1/pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
 AUX 1.2.2-data-path.patch 3361 RMD160 ece520d476cc13a312ba3976902fda9dedf7758d SHA1 3a03308d74372bf8fe62cbe804711bdb58895f8d SHA256 da9dfec59b09b2fd6bad5f0188589a0d04c28296651add308acd35d159f60947
 AUX 1.2.2-prefix.patch 1183 RMD160 25a3e3fb1639e0c5cc93928b4fcba412a3e9b371 SHA1 3c61c3552a579a48883c61b646f05ce1f059744e SHA256 35b14c60163517debfdeae52b3be00bc0fc6ab96c58d2bf3efb65e22728522d4
+AUX 1.3.0-vmd.patch 1286 RMD160 3587dbf9664747de1d10ad0039773ef9451f7488 SHA1 79dd6e0881edb905b5e098646e1de40224bcf6a6 SHA256 79f13530928bf00b6469a6fe473d1e743e22b25edd2a4ad6d53762ccac9ff318
 AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea SHA1 7a3585d14431b7840eff8f6ee0a5d8324049ff77 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de
 AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de16 SHA1 5651438459920b74040330ec0b7d9ea14e63818c SHA256 c15e5c5d2a6b53b96c6a7fe0b717ac0f7d85c90aca3e5b02c8d8c34b9038cb68
 AUX pymol-1.2.2-vmd.patch 1250 RMD160 fa5064d842099cd43e951278220b80fba170c5ec SHA1 2381931650169a841cf41fd38a1b870c0a896745 SHA256 d3688f57f32912ace20a3344dc49530a48963454dcc5a9aafe45d4b6be269525
 DIST apbs_tools.py.090618.bz2 21329 RMD160 80baed718524dfbaff2f0a3b7263fc75c55bf1d9 SHA1 e2c69bb150679f137ba7ff2cfcd0fe2da000612b SHA256 604803ed58f1827b76cbf5f3b58c35859d31c68d51481da4b37e08a1c0656d6e
 DIST pymol-1.2.1.tar.gz 8276264 RMD160 0b888ef9dfc91057077248bd388327dd9d3ff15b SHA1 2fb71dd69fbfffd2a6b2804766e410c6167be066 SHA256 f8b38fce8b56015c9e40f8af20fe69ae14b758fa2d3578a62ac9d26e97426e78
 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
 EBUILD pymol-0.99_rc10.ebuild 2125 RMD160 92cb22b6566abc10a6d5f02d6b45be0316f2126d SHA1 4dfd6793fd7b1ee3bd90b12e0ed9c1ded007cb03 SHA256 3a9eb60ad0fff94a55d8614f5ade15225298a05d31efb4de0e1f0aa092d94b24
 EBUILD pymol-1.2.1.ebuild 2948 RMD160 e5894b3e057f178dec0ecebf7ae40301ab392239 SHA1 0658797816610b8de962cd7640db3e359f8579c0 SHA256 fe9f60d348ca7b1a4e04cb17235724ee1e614a77eafed3e53c8aeed868a5f296
-EBUILD pymol-1.2.3-r1.ebuild 2612 RMD160 b86f1b565c63044733b4aa342e6dccce149df5c6 SHA1 07ff82936953597697acee2173118da61fdc8511 SHA256 3e0fb145318bdf1ad1faf33efe84f7c6cda75cf54e080818cbe144d3688db98b
-MISC ChangeLog 13051 RMD160 b89ec055617622734027be2074261f592635d7a8 SHA1 64064bb26aa47563a0a2ed8e977ee5242babe3de SHA256 45f1c5874e55b347a8359a83f892544f45762c9bd18926926efdb50d78c26280
+EBUILD pymol-1.2.3-r1.ebuild 2634 RMD160 1c3fcad44b69e3df0b9f6e0dc5e0ff3d82822ee3 SHA1 77af289f50f30798227d4229ba175a4ec112a62f SHA256 306ab75001a6038b05f09f1cc7d285b050b6a6d9714a175aa12f0bd2665baebc
+EBUILD pymol-1.3.0.ebuild 2563 RMD160 34376677a524735b8a66e5708d101caec3b35a2b SHA1 4c997bd42c6ef68f912d0ffc8b021471b881aa1d SHA256 4e8134840493e05f89a53efc11a88a522e88f6e7871a55064598e40223bef098
+MISC ChangeLog 13246 RMD160 f9ae38568ec3e099d20560927917104566ee961a SHA1 b6f2babd90ef36d59f3147398376836163f30f81 SHA256 624ab781c75e6f6a4f8e1a9ce7072b3038a715414cc151a37381cee99fdc6ff0
 MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwPOZwACgkQgAnW8HDreRZcUwCfdd39IPgtSilSZAfLhk+KGdCM
-1b4AnjEkDdHyfReuPaC3p5sbEsf1oONX
-=Ovz6
+iEYEARECAAYFAkwPPRYACgkQgAnW8HDreRbJ4QCgpW6NgvMmSWilPw8UUcHfEL7a
+51kAoKmpJorNWW/OGiEm2dS9YFM2eigQ
+=70Du
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/1.3.0-vmd.patch b/sci-chemistry/pymol/files/1.3.0-vmd.patch
new file mode 100644
index 000000000000..0f34a02ea01b
--- /dev/null
+++ b/sci-chemistry/pymol/files/1.3.0-vmd.patch
@@ -0,0 +1,33 @@
+Index: setup.py
+===================================================================
+--- setup.py	(revision 3908)
++++ setup.py	(working copy)
+@@ -130,8 +130,8 @@
+               "/usr/include/freetype2",
+ #                 "/users/warren/ext/include",
+ # VMD plugin support
+-#              "contrib/uiuc/plugins/include",
+-#              "contrib/uiuc/plugins/molfile_plugin/src",
++              "contrib/uiuc/plugins/include",
++              "contrib/uiuc/plugins/molfile_plugin/src",
+               "modules/cealign/src",
+ 	      "modules/cealign/src/tnt", ]
+     libs=["GL","GLU","glut","png","z","freetype",
+@@ -151,7 +151,7 @@
+ # Numeric Python support                    
+ #                ("_PYMOL_NUMPY",None),
+ # VMD plugin support           
+-#               ("_PYMOL_VMD_PLUGINS",None)
++               ("_PYMOL_VMD_PLUGINS",None)
+                 ]
+     ext_comp_args=["-ffast-math","-funroll-loops","-O3"]
+     ext_link_args=[]
+@@ -299,7 +299,7 @@
+     "layer5/main.c"
+ # VMD plugin support
+     # switch the 0 to 1 to activate the additional source code
+-    ] + 0 * [
++    ] + 1 * [
+ # (incomplete support -- only TRJ, TRR, XTC, DCD so far...)
+     'contrib/uiuc/plugins/molfile_plugin/src/PlugIOManagerInit.c',
+     'contrib/uiuc/plugins/molfile_plugin/src/avsplugin.cpp',
diff --git a/sci-chemistry/pymol/pymol-1.2.3-r1.ebuild b/sci-chemistry/pymol/pymol-1.2.3-r1.ebuild
index e7574345d1e0..972ddd0e2075 100644
--- a/sci-chemistry/pymol/pymol-1.2.3-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2.3-r1.ebuild
@@ -1,10 +1,11 @@
 # 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.2.3-r1.ebuild,v 1.4 2010/05/16 12:52:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.3-r1.ebuild,v 1.5 2010/06/09 07:04:48 jlec Exp $
 
 EAPI="3"
 
 SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="tk"
 REV="3891"
 
diff --git a/sci-chemistry/pymol/pymol-1.3.0.ebuild b/sci-chemistry/pymol/pymol-1.3.0.ebuild
new file mode 100644
index 000000000000..b9f33c3468d1
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.3.0.ebuild
@@ -0,0 +1,104 @@
+# 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.0.ebuild,v 1.1 2010/06/09 07:04:48 jlec Exp $
+
+EAPI="3"
+
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="tk"
+REV="3909"
+
+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"
+
+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
+		virtual/glut
+		apbs? (
+			dev-libs/maloc
+			sci-chemistry/apbs
+			sci-chemistry/pdb2pqr
+			sci-chemistry/pymol-apbs-plugin
+		)"
+RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.* 2.4 2.5"
+
+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}"/${PV}-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."
+}