summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-05-06 07:59:31 +0000
committerJustin Lecher <jlec@gentoo.org>2011-05-06 07:59:31 +0000
commit177206f5ea89861bb37e9e78164a250e49cec01e (patch)
tree065a7a5e79a72f576daf3ada88e97309c77aae3a /sci-chemistry
parentRemove myself as explicit python-twitter maintainer. (diff)
downloadhistorical-177206f5ea89861bb37e9e78164a250e49cec01e.tar.gz
historical-177206f5ea89861bb37e9e78164a250e49cec01e.tar.bz2
historical-177206f5ea89861bb37e9e78164a250e49cec01e.zip
Version Bump, notified by euscan; cleaned old
Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/pymol/ChangeLog9
-rw-r--r--sci-chemistry/pymol/Manifest18
-rw-r--r--sci-chemistry/pymol/files/1.4.1-data-path.patch87
-rw-r--r--sci-chemistry/pymol/files/1.4.1-shaders.patch58
-rw-r--r--sci-chemistry/pymol/pymol-1.3.0.ebuild104
-rw-r--r--sci-chemistry/pymol/pymol-1.3.1_pre3924.ebuild105
-rw-r--r--sci-chemistry/pymol/pymol-1.4.1.ebuild (renamed from sci-chemistry/pymol/pymol-1.4_beta1.ebuild)11
7 files changed, 165 insertions, 227 deletions
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index efa1bcba930e..b49fd6595b49 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-chemistry/pymol
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.77 2011/04/05 06:39:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.78 2011/05/06 07:59:31 jlec Exp $
+
+*pymol-1.4.1 (06 May 2011)
+
+ 06 May 2011; Justin Lecher <jlec@gentoo.org> +files/1.4.1-data-path.patch,
+ -pymol-1.3.0.ebuild, -pymol-1.3.1_pre3924.ebuild, -pymol-1.4_beta1.ebuild,
+ +pymol-1.4.1.ebuild, +files/1.4.1-shaders.patch:
+ Version Bump, notified by euscan; cleaned old
05 Apr 2011; Justin Lecher <jlec@gentoo.org> pymol-1.4_beta1.ebuild:
Cleaned unneeded SRC_URI entries
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index f3be8cd4710a..2075b950457c 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -9,25 +9,23 @@ AUX 1.2.2-prefix.patch 1183 RMD160 25a3e3fb1639e0c5cc93928b4fcba412a3e9b371 SHA1
AUX 1.3.0-vmd.patch 1286 RMD160 3587dbf9664747de1d10ad0039773ef9451f7488 SHA1 79dd6e0881edb905b5e098646e1de40224bcf6a6 SHA256 79f13530928bf00b6469a6fe473d1e743e22b25edd2a4ad6d53762ccac9ff318
AUX 1.4-shaders.patch 2851 RMD160 3e2f6e8a3c930d1e11e99760e619767ed4d71718 SHA1 8b214a10dfedf7e3cb55c7c77eaff95b7478e5e5 SHA256 bcd30eb9e18195d5d05d902df4497abfc6b786e9f4e418e9c71ebb1c3dca0bf1
AUX 1.4-vmd.patch 1414 RMD160 c7de92c73a0f91e6f95a7208b912cb6105f6d972 SHA1 51515e11cbaed06407238c0e900091174db1ff26 SHA256 320436783d1cfa4f94bd4fe57af4bdf7d3d200c951938d127d77b75d77bef7f0
+AUX 1.4.1-data-path.patch 3898 RMD160 842548be0710bb4f80791fdb98654b36cb777e84 SHA1 f3dedae4a97ee4916ca7ce4733506d6b8221e79f SHA256 911f69cb428f91a284102580b73f771648f6a1a059a53c1bcc31c51ab492b010
+AUX 1.4.1-shaders.patch 2507 RMD160 2dea0805fcc8a993d7f5fa8668257be860c7d5e8 SHA1 4548f93fbe92a511dc0d2425c86402a776567cb4 SHA256 b0cbb5bc81bb8f85bef8cbb6cd76f91b02b076ef5798075e152626becf3b5ae5
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 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
-DIST pymol-1.3.1_pre3924.tar.gz 8185908 RMD160 5bfa82a088fbbbfab43b4d47223f075be17b41a9 SHA1 b02c0fda4e324c4630efba534b95f1e906d95d7c SHA256 9e742edc846c3bea335a07845eadffabed48815dede63d331bbbe79486f3b0ec
DIST pymol-1.3.1_pre3925-r1.tar.gz 8185909 RMD160 fcd6bdcedda369af7d51c41fc708c69a878b1aa1 SHA1 990b1acd0d5c84f7b93dc1c9a550f95b74c67e4b SHA256 74d3a3dd1972e2f47458e80c3d157871c361ad81119c76d1edd40b5e491cb50e
-DIST pymol-v1.4b1.tar.bz2 9048089 RMD160 a08d3d0e0722fa1fe8700fdf9830ec23337d6e61 SHA1 9156e7808a0e21a53e0f0d7fb7b546fdfcd4d29e SHA256 2203bc507be19ec4b9c563b8616d58a3e4d59ec43e7c2cae93bb1e684a821293
+DIST pymol-1.4.1.tar.xz 6831544 RMD160 6478b14215d0c502bff3bdec0cae3c903a9004e0 SHA1 d4da217ebf2c059f4712f564b55daa81a839b259 SHA256 af020e3103360defa3749ed31c16938a00032d4c2bf40f8455c746919aeaffd6
EBUILD pymol-1.2.3-r1.ebuild 2640 RMD160 4bcb32f90a2bf09989eb26cac13ad3721ceb75ee SHA1 ea316d2d72403eb25a42fee514f9c071f6d56ded SHA256 b8f23630086279243568e51c847823f7067f7004db1bea7d06f9c9b1202e7147
-EBUILD pymol-1.3.0.ebuild 2570 RMD160 7486182996bdd206fbd30e505205f8fae087d045 SHA1 07a7c6040faab6ee470023ba979aff09d13158e4 SHA256 270a0e38e5463815661661d5ac302e3996a226e41371de05dce32c8d48123437
-EBUILD pymol-1.3.1_pre3924.ebuild 2617 RMD160 b729c2dfc5b13b97ce5bcb6422ac745b0d10ee1c SHA1 14ff465676de59b357fb8815f297fd39b10566bc SHA256 82f89722c3f381180a2ae7b71541dacdf4acb531b64119fb77b96330ffb290d7
EBUILD pymol-1.3.1_pre3925-r1.ebuild 2665 RMD160 b8177f66ab100629144671caaf32a598e6d829e0 SHA1 977e901972a2feff6da72c8c97835d96e2490559 SHA256 656c80da91ce83607e3baca1b9ba2379a0815d1a244f7926bbd6316460d74573
-EBUILD pymol-1.4_beta1.ebuild 2815 RMD160 758802b2c3ad2c93aed99494235993aac98ddf30 SHA1 757d7d1dfd807f6a464bcd90d17663e34b77de47 SHA256 87df920ba3e966db6274b74291c2dd7b4219d8bfeb5833291218ff12c2c0326b
-MISC ChangeLog 15130 RMD160 26c334c85c5aba9bb5a16b5746df0b0eee99c819 SHA1 46847c8c6fe186624b53cbe844476c6acf145752 SHA256 662c8a6349dd58d6ede054990114a77e61efed5b85d80f75fbbece04b059048d
+EBUILD pymol-1.4.1.ebuild 2694 RMD160 97b604c297e2bca39c5a0d045c65f60bb3e1cfa9 SHA1 d9ff8675900ca3a0347e43c0c01ec956b9189ca9 SHA256 fdbec8147b9c2284f2ab1b75b67d2a4cbd293dc21ba477f2df0b10c672ecc799
+MISC ChangeLog 15412 RMD160 1c8420e63464496f3ceec19014d3bcfafcede506 SHA1 6471b9bf7faaa51acee68c39b9495479021242c6 SHA256 145c093c2982c86bffdeb0090967b8ac9862b45944091a100e49032f521d7631
MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2auSIACgkQgAnW8HDreRZxIgCgutMfwCmIOi+zl2gNrZ3eC0Ce
-5kUAnjMng4ez5NnizrWDmTJHkCsKUjOe
-=cxvE
+iEYEARECAAYFAk3DqmgACgkQgAnW8HDreRa4awCgx5ryKrVUm8zJM4HBOpjPEKv2
+AoYAoLo7N8CiAgOs6VrItMJ65LZkiVYX
+=xRmc
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/1.4.1-data-path.patch b/sci-chemistry/pymol/files/1.4.1-data-path.patch
new file mode 100644
index 000000000000..903714cd223a
--- /dev/null
+++ b/sci-chemistry/pymol/files/1.4.1-data-path.patch
@@ -0,0 +1,87 @@
+ modules/chempy/__init__.py | 2 +-
+ modules/chempy/tinker/__init__.py | 2 +-
+ modules/pymol/commanding.py | 6 +++---
+ modules/pymol/importing.py | 2 +-
+ modules/pymol/wizard/mutagenesis.py | 4 ++--
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/modules/chempy/__init__.py b/modules/chempy/__init__.py
+index 998e8f8..02fe156 100644
+--- a/modules/chempy/__init__.py
++++ b/modules/chempy/__init__.py
+@@ -229,7 +229,7 @@ if os.environ.has_key('CHEMPY_DATA'): #
+ elif os.environ.has_key('PYMOL_DATA'):
+ path = os.environ['PYMOL_DATA'] + '/chempy/'
+ elif os.environ.has_key('PYMOL_PATH'):
+- path = os.environ['PYMOL_PATH'] + '/data/chempy/'
++ path = os.environ['PYMOL_PATH'] + '/chempy/'
+ elif os.environ.has_key('FREEMOL_MODULES'):
+ path = os.environ['FREEMOL_MODULES'] + '/chempy/'
+ else:
+diff --git a/modules/chempy/tinker/__init__.py b/modules/chempy/tinker/__init__.py
+index a2d8eb1..1e48f81 100644
+--- a/modules/chempy/tinker/__init__.py
++++ b/modules/chempy/tinker/__init__.py
+@@ -147,7 +147,7 @@ else:
+
+ if os.environ.has_key('PYMOL_PATH'):
+ pymol_path = os.environ['PYMOL_PATH']
+- test_path = pymol_path + '/data/chempy/tinker/'
++ test_path = pymol_path + '/chempy/tinker/'
+ if os.path.exists(test_path):
+ params_path = test_path
+
+diff --git a/modules/pymol/commanding.py b/modules/pymol/commanding.py
+index 5a202d0..5cb27a6 100644
+--- a/modules/pymol/commanding.py
++++ b/modules/pymol/commanding.py
+@@ -219,11 +219,11 @@ USAGE
+ _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 --git a/modules/pymol/importing.py b/modules/pymol/importing.py
+index 1ccf986..72ae9f3 100644
+--- a/modules/pymol/importing.py
++++ b/modules/pymol/importing.py
+@@ -191,7 +191,7 @@ SEE ALSO
+ '''
+ r = DEFAULT_ERROR
+
+- tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
++ tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png",
+ 'pymol' : 'pymol',
+ 'rgb' : 'rgb',
+ 'greyscale': 'greyscale' }
+diff --git a/modules/pymol/wizard/mutagenesis.py b/modules/pymol/wizard/mutagenesis.py
+index 8a5250d..6c1b26c 100644
+--- a/modules/pymol/wizard/mutagenesis.py
++++ b/modules/pymol/wizard/mutagenesis.py
+@@ -53,7 +53,7 @@ class Mutagenesis(Wizard):
+ self.dep = default_dep
+
+ self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+- "/data/chempy/sidechains/sc_bb_ind.pkl")
++ "/chempy/sidechains/sc_bb_ind.pkl")
+ self.load_library()
+ self.status = 0 # 0 no selection, 1 mutagenizing
+ self.bump_check = 1
+@@ -218,7 +218,7 @@ class Mutagenesis(Wizard):
+ if self.dep == 'dep':
+ if not hasattr(self,'dep_library'):
+ self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+- "/data/chempy/sidechains/sc_bb_dep.pkl")
++ "/chempy/sidechains/sc_bb_dep.pkl")
+
+ def set_mode(self,mode):
+ cmd=self.cmd
diff --git a/sci-chemistry/pymol/files/1.4.1-shaders.patch b/sci-chemistry/pymol/files/1.4.1-shaders.patch
new file mode 100644
index 000000000000..2caac2dc4bce
--- /dev/null
+++ b/sci-chemistry/pymol/files/1.4.1-shaders.patch
@@ -0,0 +1,58 @@
+Index: layer0/ShaderMgr.c
+===================================================================
+--- layer0/ShaderMgr.c (revision 3945)
++++ layer0/ShaderMgr.c (working copy)
+@@ -400,7 +400,7 @@
+ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) {
+ FILE* f;
+ long size;
+- char* buffer = NULL, *p, *pymol_path, *shader_path, *fullFile;
++ char* buffer = NULL, *p, *pymol_data, *shader_path, *fullFile;
+
+ PRINTFB(G, FB_ShaderMgr, FB_Debugging)
+ "CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName
+@@ -412,16 +412,16 @@
+ return NULL;
+ }
+
+- pymol_path = getenv("PYMOL_PATH");
+- if (!pymol_path){
++ pymol_data = getenv("PYMOL_DATA");
++ if (!pymol_data){
+ PRINTFB(G, FB_ShaderMgr, FB_Warnings)
+- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n", fileName ENDFB(G);
++ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n", fileName ENDFB(G);
+ return NULL;
+ }
+ /* make this a setting */
+- shader_path = "/data/shaders/";
+- fullFile = malloc( sizeof(char) * (strlen(pymol_path)+strlen(shader_path)+strlen(fileName)+1));
+- fullFile = strcpy(fullFile, pymol_path);
++ shader_path = "/shaders/";
++ fullFile = malloc( sizeof(char) * (strlen(pymol_data)+strlen(shader_path)+strlen(fileName)+1));
++ fullFile = strcpy(fullFile, pymol_data);
+ fullFile = strcat(fullFile, shader_path);
+ fullFile = strcat(fullFile, fileName);
+
+@@ -430,7 +430,7 @@
+
+ if (!f) {
+ PRINTFB(G, FB_ShaderMgr, FB_Errors)
+- " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_PATH='%s'\n", fullFile, pymol_path ENDFB(G);
++ " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_DATA='%s'\n", fullFile, pymol_data ENDFB(G);
+ return NULL;
+ } else {
+ PRINTFB(G, FB_ShaderMgr, FB_Blather)
+Index: layer1/Setting.c
+===================================================================
+--- layer1/Setting.c (revision 3945)
++++ layer1/Setting.c (working copy)
+@@ -3990,7 +3990,7 @@
+ set_b(I, cSetting_line_use_shader, 1);
+ set_b(I, cSetting_sphere_use_shader, 1);
+ set_b(I, cSetting_use_shaders, 0); /* disable by default until optimized shaders present; doesn't effect vol */
+- set_s(I, cSetting_shader_path, "data/shaders");
++ set_s(I, cSetting_shader_path, "shaders");
+ set_i(I, cSetting_volume_bit_depth, 8);
+ set_color(I, cSetting_volume_color, "-1");
+ set_f(I, cSetting_volume_layers, 256);
diff --git a/sci-chemistry/pymol/pymol-1.3.0.ebuild b/sci-chemistry/pymol/pymol-1.3.0.ebuild
deleted file mode 100644
index 0c44426dde69..000000000000
--- a/sci-chemistry/pymol/pymol-1.3.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.4 2010/09/19 19:32:44 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
- media-libs/freeglut
- 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."
-}
diff --git a/sci-chemistry/pymol/pymol-1.3.1_pre3924.ebuild b/sci-chemistry/pymol/pymol-1.3.1_pre3924.ebuild
deleted file mode 100644
index c86d2c4f7108..000000000000
--- a/sci-chemistry/pymol/pymol-1.3.1_pre3924.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.1_pre3924.ebuild,v 1.1 2010/10/22 08:36:38 jlec Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="tk"
-REV="3923"
-
-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"
-SRC_URI="mirror://gentoo/${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
- media-libs/freeglut
- 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}"/1.3.0-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."
-}
diff --git a/sci-chemistry/pymol/pymol-1.4_beta1.ebuild b/sci-chemistry/pymol/pymol-1.4.1.ebuild
index aaa83cce538f..c2a37b37235d 100644
--- a/sci-chemistry/pymol/pymol-1.4_beta1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.4_beta1.ebuild,v 1.2 2011/04/05 06:39:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.4.1.ebuild,v 1.1 2011/05/06 07:59:31 jlec Exp $
EAPI="3"
@@ -9,13 +9,12 @@ SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
PYTHON_USE_WITH="tk"
PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
-REV="3925"
inherit eutils distutils prefix versionator
DESCRIPTION="A Python-extensible molecular graphics system."
HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV/_beta/b}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
LICENSE="PSF-2.2"
SLOT="0"
@@ -39,12 +38,10 @@ DEPEND="
)"
RDEPEND="${DEPEND}"
-S="${WORKDIR}"/${PN}
-
src_prepare() {
epatch \
- "${FILESDIR}"/1.2.2-data-path.patch \
- "${FILESDIR}"/$(get_version_component_range 1-2)-shaders.patch
+ "${FILESDIR}"/${PV}-data-path.patch \
+ "${FILESDIR}"/${PV}-shaders.patch
epatch "${FILESDIR}"/1.2.2-prefix.patch && \
eprefixify setup.py