Adding pymol-0.99_rc10 which now depends on virtual/glut instead of media-libs/glut.

Package-Manager: portage-2.1.2.7

5 files changed, 164 insertions, 5 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index b822500b4eaf..629f63d098ed 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.25 2007/06/01 17:34:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.26 2007/06/06 18:26:40 je_fro Exp $
+
+*pymol-0.99_rc10 (06 Jun 2007)
+
+  06 Jun 2007; Jeff Gardner <je_fro@gentoo.org>
+  +files/pymol-0.99_rc10-data-path.patch, +pymol-0.99_rc10.ebuild:
+  Adding pymol-0.99_rc10 which now depends on virtual/glut instead of
+  media-libs/glut.
 
   01 Jun 2007; nixnut <nixnut@gentoo.org> pymol-0.99_rc6-r2.ebuild:
   Stable on ppc wrt bug 176831
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index ec924942643d..c522d8c09f91 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -6,6 +6,10 @@ AUX nosplash-gentoo.patch 332 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 SH
 MD5 929741dc2da6577e6e99c5542d68dbd5 files/nosplash-gentoo.patch 332
 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 files/nosplash-gentoo.patch 332
 SHA256 5e0761591eeea90bcaa06a72c210a80ba46f2542ff985f8dd893af112254a890 files/nosplash-gentoo.patch 332
+AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea SHA1 7a3585d14431b7840eff8f6ee0a5d8324049ff77 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de
+MD5 ef6d1169828c5bfdab08ddd59bb6dcf6 files/pymol-0.99_rc10-data-path.patch 2969
+RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea files/pymol-0.99_rc10-data-path.patch 2969
+SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de files/pymol-0.99_rc10-data-path.patch 2969
 AUX pymol-0.99_rc6-data-path.patch 2473 RMD160 76847259270179d6b4196d816da777efb9f83698 SHA1 ec41297decfa365363d86f073c3dd04778bece1e SHA256 93714e86fc9ce8137b5ff06b4f1e5897740de1ed80d577f6874d95ea65cc142d
 MD5 035c32a87c619d2c2cf6c0d7466d92e0 files/pymol-0.99_rc6-data-path.patch 2473
 RMD160 76847259270179d6b4196d816da777efb9f83698 files/pymol-0.99_rc6-data-path.patch 2473
@@ -32,6 +36,10 @@ EBUILD pymol-0.98.ebuild 1174 RMD160 f88513abbcd1b960185a4509b98d0a71221804ae SH
 MD5 ec0393b6d2c86e79fc592c2e1db78249 pymol-0.98.ebuild 1174
 RMD160 f88513abbcd1b960185a4509b98d0a71221804ae pymol-0.98.ebuild 1174
 SHA256 5818246a9e4412ebaa3ddda88652ce062594bf4df40556d357d395831d7f550a pymol-0.98.ebuild 1174
+EBUILD pymol-0.99_rc10.ebuild 2155 RMD160 4f073fe507c390991cc1e009637d4a3504943cc3 SHA1 072205f18f0e08535e6c79ceca2d2f194546720d SHA256 d3112a74073a324c5b3fb12dfcaf8217efc49b59ffaff74d4bcbf37f751e11c3
+MD5 c5f4f4ff1f1d96bc6a9c3cef97b2afde pymol-0.99_rc10.ebuild 2155
+RMD160 4f073fe507c390991cc1e009637d4a3504943cc3 pymol-0.99_rc10.ebuild 2155
+SHA256 d3112a74073a324c5b3fb12dfcaf8217efc49b59ffaff74d4bcbf37f751e11c3 pymol-0.99_rc10.ebuild 2155
 EBUILD pymol-0.99_rc6-r2.ebuild 2249 RMD160 e9880c17c713ea7a662d66f413826867e0488a9d SHA1 1f8b294c2207233f3f8cbb02e64589e16e77fd97 SHA256 f1e5aad775ff6eda2898fdf0fce73f0ce42a7bb4259696a2a3468f4b94e49a15
 MD5 d6952c3d9892e84d4a115697e97cac7f pymol-0.99_rc6-r2.ebuild 2249
 RMD160 e9880c17c713ea7a662d66f413826867e0488a9d pymol-0.99_rc6-r2.ebuild 2249
@@ -40,10 +48,10 @@ EBUILD pymol-0.99_rc8.ebuild 2157 RMD160 d8cccc8cb2751c1e79293d5d42a2b4140eab90c
 MD5 332bf0260ab7e634ab206f39d7009cdb pymol-0.99_rc8.ebuild 2157
 RMD160 d8cccc8cb2751c1e79293d5d42a2b4140eab90cc pymol-0.99_rc8.ebuild 2157
 SHA256 cdfca51040a46b536bc9b46f6f859ff243e2cfaff7929e14c50d4e19c0163df9 pymol-0.99_rc8.ebuild 2157
-MISC ChangeLog 6570 RMD160 172d4f3f9a544b9c6275bfce54375aaa6a982a43 SHA1 66333be729955c371cd028ae892fe90f101cfafb SHA256 7c3f5ea5f0026cd9526edbecfc8a074c65d5ddaf2bdd8c4d42103bb6c8a69ce8
-MD5 86bb1a0132fe149cb813e19eaef6e692 ChangeLog 6570
-RMD160 172d4f3f9a544b9c6275bfce54375aaa6a982a43 ChangeLog 6570
-SHA256 7c3f5ea5f0026cd9526edbecfc8a074c65d5ddaf2bdd8c4d42103bb6c8a69ce8 ChangeLog 6570
+MISC ChangeLog 6807 RMD160 4ed5d93b45ff785719bda659ac8404d024756c1a SHA1 73dbb39064ea72964e0405b19be9c12fac5979f7 SHA256 b3ee5c563e74eb56c145db0fe059a137ed3892e74d8ff3721c653d619742633b
+MD5 8fd70fd9e9c620180bd3383da5831fbe ChangeLog 6807
+RMD160 4ed5d93b45ff785719bda659ac8404d024756c1a ChangeLog 6807
+SHA256 b3ee5c563e74eb56c145db0fe059a137ed3892e74d8ff3721c653d619742633b ChangeLog 6807
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
@@ -51,6 +59,9 @@ SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 metadata
 MD5 204b478a3550545a53feaf38156dc322 files/digest-pymol-0.98 238
 RMD160 558bae7078997372581f7046465a3ddc7b2d114b files/digest-pymol-0.98 238
 SHA256 f6ee1c2e2a10e9b2d317a9fd3272616e39a00b51fa6af041c762eb130195ca92 files/digest-pymol-0.98 238
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-pymol-0.99_rc10 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-pymol-0.99_rc10 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-pymol-0.99_rc10 0
 MD5 925dc45d0ae6070f5506dffc1d100975 files/digest-pymol-0.99_rc6-r2 247
 RMD160 505a34a7bebbbdd2c60913ea3ec7cd41164eeaff files/digest-pymol-0.99_rc6-r2 247
 SHA256 4644dbddb3d8af1a2956282b351c228ded4ebb2fe628a571e0e929922a1b485a files/digest-pymol-0.99_rc6-r2 247
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.99_rc10 b/sci-chemistry/pymol/files/digest-pymol-0.99_rc10
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sci-chemistry/pymol/files/digest-pymol-0.99_rc10
diff --git a/sci-chemistry/pymol/files/pymol-0.99_rc10-data-path.patch b/sci-chemistry/pymol/files/pymol-0.99_rc10-data-path.patch
new file mode 100644
index 000000000000..286489ff8d58
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-0.99_rc10-data-path.patch
@@ -0,0 +1,64 @@
+--- pymol-0.99rc8/modules/pymol/commanding.py	2007-04-18 02:11:48.000000000 -0400
++++ commanding.py	2007-04-24 02:17:53.000000000 -0400
+@@ -129,11 +129,11 @@
+                 unlock(0)
+             r = DEFAULT_SUCCESS
+             if show_splash==1: # generic / open-source
+-                png_path = cmd.exp_path("$PYMOL_PATH/data/pymol/splash.png")
++                png_path = cmd.exp_path("$PYMOL_DATA/pymol/splash.png")
+             elif show_splash==2: # evaluation builds
+-                png_path = cmd.exp_path("$PYMOL_PATH/data/pymol/epymol.png")
++                png_path = cmd.exp_path("$PYMOL_DATA/pymol/epymol.png")
+             else: # incentive builds
+-                png_path = cmd.exp_path("$PYMOL_PATH/data/pymol/ipymol.png")
++                png_path = cmd.exp_path("$PYMOL_DATA/pymol/ipymol.png")
+             if os.path.exists(png_path):
+                 cmd.do("_ cmd.load_png('%s',0,quiet=1)"%png_path)
+         else:
+--- pymol-0.99rc8/modules/pymol/fitting.py	2007-04-18 02:11:48.000000000 -0400
++++ fitting.py	2007-04-24 02:18:07.000000000 -0400
+@@ -61,7 +61,7 @@
+         r = DEFAULT_ERROR
+         source = selector.process(source)
+         target = selector.process(target)
+-        mfile = cmd.exp_path("$PYMOL_PATH/data/pymol/matrices/"+matrix)
++        mfile = cmd.exp_path("$PYMOL_DATA/pymol/matrices/"+matrix)
+         if object==None: object=''
+         try:
+             lock()
+--- pymol-0.99rc8/modules/pymol/importing.py	2007-04-18 02:11:47.000000000 -0400
++++ importing.py	2007-04-24 02:18:46.000000000 -0400
+@@ -177,7 +177,7 @@
+         r = DEFAULT_ERROR
+         
+         
+-        tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
++        tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png",
+                       'pymol' : 'pymol',
+                       'rgb' : 'rgb' }
+ 
+--- pymol-0.99rc8/modules/pymol/wizard/mutagenesis.py	2007-04-18 02:11:50.000000000 -0400
++++ mutagenesis.py	2007-04-24 04:08:44.000000000 -0400
+@@ -35,8 +35,8 @@
+ 
+         self.dep = default_dep
+ 
+-        self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+
+-                                           "/data/chempy/sidechains/sc_bb_ind.pkl")
++        self.ind_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+
++                                           "/chempy/sidechains/sc_bb_ind.pkl")
+         self.load_library()
+         self.status = 0 # 0 no selection, 1 mutagenizing
+         self.bump_check = 1
+@@ -108,8 +108,8 @@
+     def load_library(self):
+         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")
++                self.dep_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+
++                                           "/chempy/sidechains/sc_bb_dep.pkl")
+             
+     def set_mode(self,mode):
+         if mode in self.modes:
+
diff --git a/sci-chemistry/pymol/pymol-0.99_rc10.ebuild b/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
new file mode 100644
index 000000000000..f5fd0160d707
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99_rc10.ebuild,v 1.1 2007/06/06 18:26:40 je_fro Exp $
+
+inherit distutils eutils multilib subversion
+
+ESVN_REPO_URI="https://svn.sourceforge.net/svnroot/pymol/branches/b099/pymol"
+ESVN_UPDATE_CMD="svn -r 2974 update"
+
+DESCRIPTION="A Python-extensible molecular graphics system."
+HOMEPAGE="http://pymol.sourceforge.net/"
+
+LICENSE="PSF-2.2"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-lang/python
+dev-python/pmw
+dev-python/numeric
+dev-lang/tk
+media-libs/libpng
+sys-libs/zlib
+virtual/glut"
+
+src_unpack() {
+	subversion_src_unpack
+
+	epatch "${FILESDIR}"/${P}-data-path.patch
+
+# Turn off splash screen.  Please do make a project contribution
+# if you are able.
+	[[ -n "$WANT_NOSPLASH" ]] && epatch "${FILESDIR}"/nosplash-gentoo.patch
+
+# Respect CFLAGS
+	sed -i \
+	-e "s:\(ext_comp_args=\).*:\1[]:g" \
+	"${S}"/setup.py
+}
+
+src_install() {
+	python_version
+
+	distutils_src_install
+	cd "${S}"
+
+#The following three lines probably do not do their jobs and should be
+#changed
+	PYTHONPATH="${D}/usr/$(get_libdir)/site-packages" ${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=/usr/$(get_libdir)/python${PYVER}/site-packages/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} \${PYMOL_PATH}/__init__.py \$*
+EOF
+
+		exeinto /usr/bin
+		doexe "${T}"/pymol || die "Failed to install wrapper."
+		dodoc DEVELOPERS CHANGES || 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."
+}