aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-chemistry/pymol/ChangeLog7
-rw-r--r--sci-chemistry/pymol/Manifest5
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta6-data-path.patch30
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta6-shaders.patch11
-rw-r--r--sci-chemistry/pymol/pymol-1.2_beta6.ebuild116
5 files changed, 168 insertions, 1 deletions
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index e302bc0a0..86fd098f0 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_beta6 (12 Apr 2009)
+
+ 12 Apr 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ +files/pymol-1.2_beta6-data-path.patch,
+ +files/pymol-1.2_beta6-shaders.patch, +pymol-1.2_beta6.ebuild:
+ version bump to beta 6
+
18 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
pymol-1.2_beta3.ebuild, pymol-1.2_beta4.ebuild, pymol-1.2_beta5.ebuild:
fix of missing APBS_PSIZE
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 00973817c..82e79faae 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -2,6 +2,9 @@ AUX apbs-070604-r3550.patch.bz2 20283 RMD160 e7fc42934dea043000ba81e4f27b99b6062
AUX nosplash-gentoo.patch 467 RMD160 a6be474aab95e8c8ffd37f509fe3d40cf4db23f7 SHA1 14862bab327fea0cdc8198070f01827d6f832899 SHA256 c4b5384485242165aa517fe2caf83241201c2354d5c964554f6d82c51ba7fba3
AUX pymol-1.2_beta5-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
AUX pymol-1.2_beta5-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
+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
EBUILD pymol-1.2_beta5.ebuild 2853 RMD160 bc0e45d2353dceea7b21b2cb52a3b0551e040283 SHA1 c161f90b592452190692c94cfe505575673e545b SHA256 c45c1149973d67ca9bd8c40b56cd9383decd7f78339487ec5f972738d7278448
-MISC ChangeLog 1308 RMD160 f2ab3375abca3a6dcf29569555a36a66e06d6180 SHA1 e60c44b737f06bbe3c77a4cd7120ddaeb28438f6 SHA256 eca5774c5e96432ecbdc5b056d41348bc37ab4d8a59ea09ac655747f107a34f8
+EBUILD pymol-1.2_beta6.ebuild 2853 RMD160 3d584d1a45f6bfbe2835cf2ef6512c9ecd1009ae SHA1 92f4314ddece9b534c323e4342bbdab72f3dc807 SHA256 2c494a45c8d1a3ade42ed80e74ca185afd6d51f29e2d1702b8ca48e5a914547a
+MISC ChangeLog 1530 RMD160 626b311eadacbf5f5e3737ef7915d85cc52745e2 SHA1 077e8b864c801bbd140bb8ff5274eb4e57cb8fcc SHA256 ef7fb3c5e59928d1e369ba285ad43f220e50c9997ded0c9553e86dfba17ce789
MISC metadata.xml 297 RMD160 431061f6875f90a251ae90c5fc5be499da78c9d8 SHA1 b01c71fad62ac24b76a45536f6ddeae3904558dd SHA256 fbe32692a4ff6e595966ca094d9d12912952aaeb639d248fdbd0ed2a9a088d75
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta6-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta6-data-path.patch
new file mode 100644
index 000000000..86c3fe1f1
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta6-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_beta6-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_beta6-shaders.patch
new file mode 100644
index 000000000..7f4a24f48
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta6-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_beta6.ebuild b/sci-chemistry/pymol/pymol-1.2_beta6.ebuild
new file mode 100644
index 000000000..fb8c98c5a
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.2_beta6.ebuild
@@ -0,0 +1,116 @@
+# 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"
+
+inherit distutils subversion
+
+ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@3704"
+
+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
+ >=dev-lang/python-2.4[tk]
+ media-libs/libpng
+ sys-libs/zlib
+ virtual/glut
+ apbs? ( dev-libs/maloc
+ sci-chemistry/apbs
+ sci-chemistry/pdb2pqr
+ )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup(){
+ 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
+
+ use apbs && \
+ echo "APBS_PSIZE=$(python_get_sitedir)/pdb2pqr/src/psize.py" >> "${T}"/20pymol
+
+ 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
+}