sci-chemistry/pymol version bump to 1.2beta4

5 files changed, 186 insertions, 3 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index a885f63d7..b0dc4e8cc 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_beta4 (23 Feb 2009)
+
+  23 Feb 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/pymol-1.2_beta4-data-path.patch,
+  +files/pymol-1.2_beta4-shaders.patch, +pymol-1.2_beta4.ebuild:
+  bumped to beta4 @ revision 3615
+
   20 Feb 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
   +sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch,
   +sci-chemistry/pymol/files/pymol-1.2_beta3-shaders.patch:
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 5e9f87ee5..7e0f315d6 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -4,7 +4,9 @@ AUX pymol-1.2_beta2-data-path.patch 2584 RMD160 c5fdd7884241a493578be5a2b658ac0c
 AUX pymol-1.2_beta2-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
 AUX pymol-1.2_beta3-data-path.patch 2584 RMD160 c5fdd7884241a493578be5a2b658ac0cd0bff000 SHA1 1e4cd368ad08b87627ef465fad4ca96dcfbef00b SHA256 39e06459105969e0156bfe71f61bdccd3da4c8d7f2ba6e783aa34e63dc62b0a7
 AUX pymol-1.2_beta3-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
+AUX pymol-1.2_beta4-data-path.patch 2584 RMD160 c5fdd7884241a493578be5a2b658ac0cd0bff000 SHA1 1e4cd368ad08b87627ef465fad4ca96dcfbef00b SHA256 39e06459105969e0156bfe71f61bdccd3da4c8d7f2ba6e783aa34e63dc62b0a7
+AUX pymol-1.2_beta4-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
 EBUILD pymol-1.2_beta2.ebuild 2758 RMD160 073aed8dcc3012a1b921ed53f1dd83bfa39f391a SHA1 e206d6f2b7b39b559868c62022914cf5dbcea420 SHA256 276b9ea9c4c4ce9c07f931b46005dddafff6df871e76f761ba411e4cd24f7e44
-EBUILD pymol-1.2_beta3.ebuild 2758 RMD160 15686ba2fb47553916fbc7aa1dee964685fa5f68 SHA1 56edee2165ec0b6330c73b6167f5754f43eaec04 SHA256 622668ba142bac4c6f3593d50faff0a39f28895477c6f0559cffebd56c30a4f2
-MISC ChangeLog 696 RMD160 2b83999020e8f0108ac945635b6d07445c3ebf80 SHA1 38efa2d4b4d8e923f702e6d685b0b32e4963056e SHA256 53ea6fe945af7b9c698342be7b4ac8a02ad7a9fd8d732129043379942970fee9
-MISC metadata.xml 297 RMD160 431061f6875f90a251ae90c5fc5be499da78c9d8 SHA1 b01c71fad62ac24b76a45536f6ddeae3904558dd SHA256 fbe32692a4ff6e595966ca094d9d12912952aaeb639d248fdbd0ed2a9a088d75
+EBUILD pymol-1.2_beta3.ebuild 2758 RMD160 9f18d713e51bb38c1ff365be522eea140f039fff SHA1 feecc3072cef0a9d8204ffbd9dfbd163db3d8a19 SHA256 306d59a7664d9a31f5bb6ac265b3ef486254e63e3879764894f7350f81baa168
+EBUILD pymol-1.2_beta4.ebuild 2758 RMD160 9e68702c63db77b4a1757dbe95b469fa8eb51dc9 SHA1 7dc82614e7be351b49bd4b7877301cd5a36a94fe SHA256 ece72017bfaf0464f7bc9876bc908436df0b886c026786ab1f0057f4dcd02205
+MISC ChangeLog 927 RMD160 2bbf4c78fa928fe37fa6a1f1fc3de6ab1d63ec82 SHA1 4f46ad7fd01b688111935d900fabcc850d2db53a SHA256 924b373763e407fb99655a3db859da8d2d8c4cade7ed7890cecf43257028ef42
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch
new file mode 100644
index 000000000..329b68292
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch
@@ -0,0 +1,51 @@
+diff -urN pymol-9999.orig/modules/pymol/commanding.py pymol-9999/modules/pymol/commanding.py
+--- pymol-9999.orig/modules/pymol/commanding.py	2008-01-11 13:23:32.000000000 +0100
++++ pymol-9999/modules/pymol/commanding.py	2008-01-11 13:22:57.000000000 +0100
+@@ -198,11 +198,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 -urN pymol-9999.orig/modules/pymol/fitting.py pymol-9999/modules/pymol/fitting.py
+#--- pymol-9999.orig/modules/pymol/fitting.py	2008-01-11 13:23:32.000000000 +0100
+#+++ pymol-9999/modules/pymol/fitting.py	2008-01-11 13:23:00.000000000 +0100
+#@@ -68,7 +68,7 @@
+#         if string.lower(matrix)=='none':
+#             matrix=''
+#         if len(matrix):
+#-            mfile = cmd.exp_path("$PYMOL_PATH/data/pymol/matrices/"+matrix)
+#+            mfile = cmd.exp_path("$PYMOL_DATA/pymol/matrices/"+matrix)
+#         else:
+#             mfile = ''        
+#         # delete existing alignment object (if asked to reset it)
+#@@ -135,7 +135,7 @@
+#         if string.lower(matrix)=='none':
+#             matrix=''
+#         if len(matrix):
+#-            mfile = cmd.exp_path("$PYMOL_PATH/data/pymol/matrices/"+matrix)
+#+            mfile = cmd.exp_path("$PYMOL_DATA/pymol/matrices/"+matrix)
+#         else:
+#             mfile = ''
+#         if object==None: object=''
+diff -urN pymol-9999.orig/modules/pymol/importing.py pymol-9999/modules/pymol/importing.py
+--- pymol-9999.orig/modules/pymol/importing.py	2008-01-11 13:23:32.000000000 +0100
++++ pymol-9999/modules/pymol/importing.py	2008-01-11 13:23:02.000000000 +0100
+@@ -171,7 +171,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_beta4-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_beta4-shaders.patch
new file mode 100644
index 000000000..7f4a24f48
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta4-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_beta4.ebuild b/sci-chemistry/pymol/pymol-1.2_beta4.ebuild
new file mode 100644
index 000000000..5d4a249ea
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.2_beta4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NEED_PYTHON=2.4
+PYTHON_MODNAME="chempy pmg_tk pymol"
+APBS_PATCH="070604-r3550"
+
+inherit distutils subversion
+
+ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@3615"
+
+DESCRIPTION="A Python-extensible molecular graphics system."
+HOMEPAGE="http://pymol.sourceforge.net/"
+
+LICENSE="PSF-2.2"
+IUSE="apbs shaders"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/pmw
+		dev-python/numpy
+		dev-lang/tk
+		media-libs/libpng
+		sys-libs/zlib
+		virtual/glut
+		apbs? ( dev-libs/maloc
+				sci-chemistry/apbs
+				sci-chemistry/pdb2pqr
+		)"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup(){
+	python_tkinter_exists
+	python_version
+}
+
+src_unpack() {
+	subversion_src_unpack
+
+	epatch "${FILESDIR}"/${PF}-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 ||die
+
+	# Respect CFLAGS
+	sed -i \
+		-e "s:\(ext_comp_args=\).*:\1[]:g" \
+		"${S}"/setup.py
+
+	if use shaders; then
+		epatch "${FILESDIR}"/${PF}-shaders.patch || die
+	fi
+
+	if use apbs; then
+		epatch "${FILESDIR}"/apbs-${APBS_PATCH}.patch.bz2
+		sed "s:LIBANDPYTHON:$(get_libdir)/python${PYVER}:g" \
+			-i modules/pmg_tk/startup/apbs_tools.py || die
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	cd "${S}"
+
+	#The following three lines probably do not do their jobs and should be
+	#changed
+	PYTHONPATH="${D}$(python_get_sitedir)" ${python} setup2.py
+
+	# 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)/pymol
+	PYMOL_DATA="/usr/share/pymol/data"
+	PYMOL_SCRIPTS="/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol || die "Failed to install env.d file."
+
+	# Make our own wrapper
+	cat >> "${T}"/pymol <<- EOF
+	#!/bin/sh
+	${python} -O \${PYMOL_PATH}/__init__.py \$*
+	EOF
+
+	if ! use apbs; then
+		rm "${D}"$(python_get_sitedir)/pmg_tk/startup/apbs_tools.py
+	fi
+
+	exeinto /usr/bin
+	doexe "${T}"/pymol || die "Failed to install wrapper."
+	dodoc DEVELOPERS || die "Failed to install docs."
+
+	mv examples "${D}"/usr/share/doc/${PF}/ || die "Failed moving docs."
+
+	dodir /usr/share/pymol
+	mv test "${D}"/usr/share/pymol/ || die "Failed moving test files."
+	mv data "${D}"/usr/share/pymol/ || die "Failed moving data files."
+	mv scripts "${D}"/usr/share/pymol/ || die "Failed moving scripts."
+}
+
+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
+}