pymol bump to beta7

5 files changed, 156 insertions, 1 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 415c5e181..27e54bc17 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pymol-1.2_beta7 (15 Jun 2009)
+
+  15 Jun 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +pymol-1.2_beta7.ebuild, +files/pymol-1.2_beta7-data-path.patch,
+  +files/pymol-1.2_beta7-shaders.patch:
+  version bump
+
   10 Jun 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> pymol-9999.ebuild:
   rekeyword the live ebuild
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index a85caf50d..f97fe241c 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -2,9 +2,12 @@ AUX apbs-070604-r3550.patch.bz2 20283 RMD160 e7fc42934dea043000ba81e4f27b99b6062
 AUX nosplash-gentoo.patch 467 RMD160 a6be474aab95e8c8ffd37f509fe3d40cf4db23f7 SHA1 14862bab327fea0cdc8198070f01827d6f832899 SHA256 c4b5384485242165aa517fe2caf83241201c2354d5c964554f6d82c51ba7fba3
 AUX pymol-1.2_beta6-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
 AUX pymol-1.2_beta6-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
+AUX pymol-1.2_beta7-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
+AUX pymol-1.2_beta7-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
 AUX pymol-9999-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
 AUX pymol-9999-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
 EBUILD pymol-1.2_beta6-r1.ebuild 2463 RMD160 5ce316ea6babd7936a8313171d9bacf594392de2 SHA1 2a3cb40dd3924c8269f32a9335520c02a434d176 SHA256 1e294feb019e1a00c4888832272c215a7cb5d5bb808b529a53e28c393500f376
+EBUILD pymol-1.2_beta7.ebuild 2476 RMD160 930ebefaf3236ceee303bf04080a0be796130813 SHA1 1ccb9b38121ccb8d24191c2c08e8563182c1d46d SHA256 ff7f4250afce25b01be05e4871a04815fc40c9acd81b4ea5a30ce4f17c27a7bc
 EBUILD pymol-9999.ebuild 2458 RMD160 a8da526885b2cfc000393d1a70b49e8913ec9bdd SHA1 0cf024992d26778f57e5c784b2d1384f67fd55f9 SHA256 2877688226fb74d60d695d90d1932dbf7bd76e2ffd75b9288b04f69e122716c6
-MISC ChangeLog 2300 RMD160 b89d6ca87423ac23ef882f2c4b4769cf9d6d2d0f SHA1 ca49b7e611dc488ad0a211d9e1a7b3e614563c42 SHA256 0d6131e1391bfe4e3341626da7685c110941d6bfba1b6c77863f5985dfa15c1e
+MISC ChangeLog 2512 RMD160 caaeccf4310e9ce141010c78115134157d2a8922 SHA1 586090943e5f65a6a0f36cb52b7ec7c5cd36d829 SHA256 ebd2bd1243dfef34a168bc8b383fae804747a2aebac3be86af4a18efc849437a
 MISC metadata.xml 297 RMD160 431061f6875f90a251ae90c5fc5be499da78c9d8 SHA1 b01c71fad62ac24b76a45536f6ddeae3904558dd SHA256 fbe32692a4ff6e595966ca094d9d12912952aaeb639d248fdbd0ed2a9a088d75
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta7-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta7-data-path.patch
new file mode 100644
index 000000000..86c3fe1f1
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta7-data-path.patch
@@ -0,0 +1,30 @@
+diff -arNu -uarN pymol/modules/pymol/commanding.py pymol.new/modules/pymol/commanding.py
+--- pymol/modules/pymol/commanding.py	2009-03-31 12:43:14.585834066 +0200
++++ pymol.new/modules/pymol/commanding.py	2009-03-31 12:44:26.436354330 +0200
+@@ -219,11 +219,11 @@
+                 _self.unlock(0,_self)
+             r = DEFAULT_SUCCESS
+             if show_splash==1: # generic / open-source
+-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png")
++                png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png")
+             elif show_splash==2: # evaluation builds
+-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png")
++                png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png")
+             else: # incentive builds
+-                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png")
++                png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png")
+             if os.path.exists(png_path):
+                 _self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path)
+         else:
+diff -arNu -uarN pymol/modules/pymol/importing.py pymol.new/modules/pymol/importing.py
+--- pymol/modules/pymol/importing.py	2009-03-31 12:43:14.546250540 +0200
++++ pymol.new/modules/pymol/importing.py	2009-03-31 12:44:48.876657949 +0200
+@@ -191,7 +191,7 @@
+     '''
+         r = DEFAULT_ERROR
+         
+-        tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
++        tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png",
+                    'pymol' : 'pymol',
+                    'rgb' : 'rgb' }
+         
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta7-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_beta7-shaders.patch
new file mode 100644
index 000000000..7f4a24f48
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta7-shaders.patch
@@ -0,0 +1,11 @@
+diff -uarN pymol-9999.orig/setup.py pymol-9999/setup.py
+--- pymol-9999.orig/setup.py	2008-06-18 11:47:58.000000000 +0200
++++ pymol-9999/setup.py	2008-06-18 11:48:52.000000000 +0200
+@@ -143,6 +143,7 @@
+     def_macros=[("_PYMOL_MODULE",None),
+                     ("_PYMOL_INLINE",None),
+                     ("_PYMOL_FREETYPE",None),
++                    ("_PYMOL_OPENGL_SHADERS",None),
+ # Numeric Python support                    
+ #                        ("_PYMOL_NUMPY",None),
+ # VMD plugin support                    
diff --git a/sci-chemistry/pymol/pymol-1.2_beta7.ebuild b/sci-chemistry/pymol/pymol-1.2_beta7.ebuild
new file mode 100644
index 000000000..a6e2cac1f
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.2_beta7.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+PYTHON_MODNAME="chempy pmg_tk pymol"
+APBS_PATCH="070604-r3550"
+REV="3732"
+
+inherit distutils subversion
+
+ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@${REV}"
+
+DESCRIPTION="A Python-extensible molecular graphics system."
+HOMEPAGE="http://pymol.sourceforge.net/"
+
+LICENSE="PSF-2.2"
+IUSE="apbs shaders"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pmw
+		dev-python/numpy
+		>=dev-lang/python-2.4[tk]
+		media-libs/libpng
+		sys-libs/zlib
+		virtual/glut
+		apbs? ( dev-libs/maloc
+				sci-chemistry/apbs
+				sci-chemistry/pdb2pqr
+		)"
+DEPEND="${RDEPEND}"
+
+pkg_setup(){
+	python_version
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-data-path.patch || die
+
+	# Turn off splash screen.  Please do make a project contribution
+	# if you are able though.
+	[[ -z "$WANT_NOSPLASH" ]] && epatch "${FILESDIR}"/nosplash-gentoo.patch
+
+	# Respect CFLAGS
+	sed -i \
+		-e "s:\(ext_comp_args=\).*:\1[]:g" \
+		"${S}"/setup.py
+
+	use shaders && epatch "${FILESDIR}"/${P}-shaders.patch
+
+	if use apbs; then
+		epatch "${FILESDIR}"/apbs-${APBS_PATCH}.patch.bz2
+		sed "s:LIBANDPYTHON:$(python_get_libdir):g" \
+			-i modules/pmg_tk/startup/apbs_tools.py || die
+	fi
+}
+
+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=$(python_get_sitedir)/${PN}
+		PYMOL_DATA="/usr/share/pymol/data"
+		PYMOL_SCRIPTS="/usr/share/pymol/scripts"
+	EOF
+
+	use apbs && \
+	echo "APBS_PSIZE=$(python_get_sitedir)/pdb2pqr/src/psize.py" >> "${T}"/20pymol
+
+	doenvd "${T}"/20pymol || die "Failed to install env.d file."
+
+	cat >> "${T}"/pymol <<- EOF
+	#!/bin/sh
+	${python} -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."
+
+	if ! use apbs; then
+		rm "${D}"$(python_get_sitedir)/pmg_tk/startup/apbs_tools.py
+	fi
+}
+
+pkg_postinst(){
+	distutils_pkg_postinst
+
+	# The apbs ebuild was just corrected and not bumped #213616
+	if use apbs; then
+		[ -e /usr/share/apbs-0.5* ] && \
+		ewarn "You need to reemerge sci-chemistry/apbs!"
+	fi
+}