aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-03-31 12:55:19 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-03-31 12:55:19 +0200
commitf4a494223c8d7b2c82286ff7ff36aa0a27e37c68 (patch)
treebeda085de5482d295f50c2b004ab67196ca9a344
parentUSE lua added to cara (diff)
downloadsci-f4a494223c8d7b2c82286ff7ff36aa0a27e37c68.tar.gz
sci-f4a494223c8d7b2c82286ff7ff36aa0a27e37c68.tar.bz2
sci-f4a494223c8d7b2c82286ff7ff36aa0a27e37c68.zip
pymol version cleanup and patch fix
-rw-r--r--sci-chemistry/pymol/Manifest10
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch51
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta3-shaders.patch11
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch51
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta4-shaders.patch11
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch45
-rw-r--r--sci-chemistry/pymol/pymol-1.2_beta3.ebuild116
-rw-r--r--sci-chemistry/pymol/pymol-1.2_beta4.ebuild116
-rw-r--r--sci-chemistry/pymol/pymol-1.2_beta5.ebuild2
9 files changed, 15 insertions, 398 deletions
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index ee381ef47..00973817c 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,13 +1,7 @@
AUX apbs-070604-r3550.patch.bz2 20283 RMD160 e7fc42934dea043000ba81e4f27b99b6062e4b12 SHA1 1708de792a53ac4819dfe4ec11cc9ee54b3d5fb9 SHA256 ad8ce064ee2ce3310f862b60b8f762ef713f9952fef0ebd329204a2d25b42db5
AUX nosplash-gentoo.patch 467 RMD160 a6be474aab95e8c8ffd37f509fe3d40cf4db23f7 SHA1 14862bab327fea0cdc8198070f01827d6f832899 SHA256 c4b5384485242165aa517fe2caf83241201c2354d5c964554f6d82c51ba7fba3
-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
-AUX pymol-1.2_beta5-data-path.patch 2584 RMD160 c5fdd7884241a493578be5a2b658ac0cd0bff000 SHA1 1e4cd368ad08b87627ef465fad4ca96dcfbef00b SHA256 39e06459105969e0156bfe71f61bdccd3da4c8d7f2ba6e783aa34e63dc62b0a7
+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
-EBUILD pymol-1.2_beta3.ebuild 2854 RMD160 6bb2614dfc7eb87d226f356aaa75d2cacf4848a4 SHA1 d64d83f0172a0ee523ef0c8a41b0d6eada936743 SHA256 3207a38f26f2f5271823ab095fbc8b566672b69daad226d0a93f46a34aaeaef2
-EBUILD pymol-1.2_beta4.ebuild 2853 RMD160 a8e4f5d3bccd2138d90a401d031cb14451f4bbc1 SHA1 5149d856591de44529af59df2387eb1b3795974c SHA256 3972401082184f7c5f2626144c12d504ddb52feffd94710ba95436c76e78bb8c
-EBUILD pymol-1.2_beta5.ebuild 2853 RMD160 34db030b000243c978e5c60116b2650d03c86eb6 SHA1 a59ebb32fe1115e16705e1c111e4208c3fb33616 SHA256 7c2133ec1227d759209d89afed64e625b14f864c5a3d6c125b502f396c0a4b6b
+EBUILD pymol-1.2_beta5.ebuild 2853 RMD160 bc0e45d2353dceea7b21b2cb52a3b0551e040283 SHA1 c161f90b592452190692c94cfe505575673e545b SHA256 c45c1149973d67ca9bd8c40b56cd9383decd7f78339487ec5f972738d7278448
MISC ChangeLog 1308 RMD160 f2ab3375abca3a6dcf29569555a36a66e06d6180 SHA1 e60c44b737f06bbe3c77a4cd7120ddaeb28438f6 SHA256 eca5774c5e96432ecbdc5b056d41348bc37ab4d8a59ea09ac655747f107a34f8
MISC metadata.xml 297 RMD160 431061f6875f90a251ae90c5fc5be499da78c9d8 SHA1 b01c71fad62ac24b76a45536f6ddeae3904558dd SHA256 fbe32692a4ff6e595966ca094d9d12912952aaeb639d248fdbd0ed2a9a088d75
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch
deleted file mode 100644
index 329b68292..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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_beta3-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_beta3-shaders.patch
deleted file mode 100644
index 7f4a24f48..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta3-shaders.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/files/pymol-1.2_beta4-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch
deleted file mode 100644
index 329b68292..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 7f4a24f48..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta4-shaders.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/files/pymol-1.2_beta5-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch
index 329b68292..86c3fe1f1 100644
--- a/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch
@@ -1,7 +1,7 @@
-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 @@
+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
@@ -16,36 +16,15 @@ diff -urN pymol-9999.orig/modules/pymol/commanding.py pymol-9999/modules/pymol/c
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 @@
+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' }
-
+ 'pymol' : 'pymol',
+ 'rgb' : 'rgb' }
+
diff --git a/sci-chemistry/pymol/pymol-1.2_beta3.ebuild b/sci-chemistry/pymol/pymol-1.2_beta3.ebuild
deleted file mode 100644
index f35723593..000000000
--- a/sci-chemistry/pymol/pymol-1.2_beta3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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@3613"
-
-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
-}
diff --git a/sci-chemistry/pymol/pymol-1.2_beta4.ebuild b/sci-chemistry/pymol/pymol-1.2_beta4.ebuild
deleted file mode 100644
index 64a0932e3..000000000
--- a/sci-chemistry/pymol/pymol-1.2_beta4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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@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
- >=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
-}
diff --git a/sci-chemistry/pymol/pymol-1.2_beta5.ebuild b/sci-chemistry/pymol/pymol-1.2_beta5.ebuild
index 6edf6952b..e7d150904 100644
--- a/sci-chemistry/pymol/pymol-1.2_beta5.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2_beta5.ebuild
@@ -9,7 +9,7 @@ APBS_PATCH="070604-r3550"
inherit distutils subversion
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@3621"
+ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@3689"
DESCRIPTION="A Python-extensible molecular graphics system."
HOMEPAGE="http://pymol.sourceforge.net/"