committed new version, + marked 0.86 and 0.88 stable

6 files changed, 72 insertions, 6 deletions

diff --git a/app-sci/pymol/ChangeLog b/app-sci/pymol/ChangeLog
index 8aca899c9bae..56a2a4eecc22 100644
--- a/app-sci/pymol/ChangeLog
+++ b/app-sci/pymol/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for app-sci/pymol
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.5 2003/06/20 04:53:29 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.6 2003/07/24 01:12:59 george Exp $
+
+*pymol-0.90 (23 Jul 2003)
+
+  23 Jul 2003; George Shapovalov <george@gentoo.org> pymol-0.90, files/setup.py-gentoo.patch :
+  new version + fix for setup.py, (#24967)
+  thanks to Ben Cornett <acornet@emory.edu> for the update
 
 *pymol-0.88 (29 Jun 2003)
 
-  19 Jun 2003; George Shapovalov <george@gentoo.org> pymol-0.88.ebuild, files/{files/digest-pymol-0.88,nosplash-gentoo.patch,setup2.py-gentoo.patch} :
+  19 Jun 2003; George Shapovalov <george@gentoo.org> pymol-0.88.ebuild, files/{digest-pymol-0.88,nosplash-gentoo.patch,setup2.py-gentoo.patch} :
   new version (#22235)
   now uses distutils for python
   thanks to Todd Geders <geders@purdue.edu> for update notification 
diff --git a/app-sci/pymol/Manifest b/app-sci/pymol/Manifest
index 2db0b512144f..39b5d58ad058 100644
--- a/app-sci/pymol/Manifest
+++ b/app-sci/pymol/Manifest
@@ -1,11 +1,14 @@
+MD5 1c7553ff6e6ab922e69a310c58331c9b pymol-0.90.ebuild 1118
 MD5 2c5d9b7dc44664677e1454dc7dd5f7ee pymol-0.86.ebuild 1259
-MD5 55042ae7de682e2f677de2a2441bad35 pymol-0.88.ebuild 1019
+MD5 4d45ce944393c2ce6e5ad5a9b4d6ba94 pymol-0.88.ebuild 1017
 MD5 b049103d28a5200db1b96c5de9b9b561 pymol-0.82.ebuild 1265
-MD5 f7c02cdae4c623c179565b3f91edfbf6 ChangeLog 1137
+MD5 10dbda77b8e2b2e991d881f7a0ec17a9 ChangeLog 1356
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 34d172ef31b5038e071b634d4e645cf1 files/pymol-gentoo.diff 1566
 MD5 72d88a2e8fb425d0dc86fb9b3d5239de files/digest-pymol-0.82 64
 MD5 38bed98126e8d0cfbcd3ee77b20d9171 files/digest-pymol-0.86 64
 MD5 bc61462df500f324f8ba07a1c1f7bdf4 files/digest-pymol-0.88 64
+MD5 6970b70ab3710cde34e422cba7cce5c2 files/digest-pymol-0.90 64
 MD5 929741dc2da6577e6e99c5542d68dbd5 files/nosplash-gentoo.patch 332
+MD5 e42746bf581479c61ff1e7cc5b978edd files/setup.py-gentoo.patch 311
 MD5 af2da92225ab57969d18d16ed60324ce files/setup2.py-gentoo.patch 493
diff --git a/app-sci/pymol/files/digest-pymol-0.90 b/app-sci/pymol/files/digest-pymol-0.90
new file mode 100644
index 000000000000..5d6062d88f16
--- /dev/null
+++ b/app-sci/pymol/files/digest-pymol-0.90
@@ -0,0 +1 @@
+MD5 be181d10df622b011725d9541da22070 pymol-0_90-src.tgz 2134293
diff --git a/app-sci/pymol/files/setup.py-gentoo.patch b/app-sci/pymol/files/setup.py-gentoo.patch
new file mode 100644
index 000000000000..d67559643594
--- /dev/null
+++ b/app-sci/pymol/files/setup.py-gentoo.patch
@@ -0,0 +1,10 @@
+--- pymol-0.90/setup.py 2003-04-26 21:22:14.000000000 -0400
++++ pymol-0.90.new/setup.py     2003-07-21 09:39:51.000000000 -0400
+@@ -71,6 +71,7 @@
+    "layer0/Map.c",
+    "layer0/Match.c",
+    "layer0/Matrix.c",
++   "layer0/MemoryCache.c",
+    "layer0/MemoryDebug.c",
+    "layer0/MyPNG.c",
+    "layer0/Parse.c",
diff --git a/app-sci/pymol/pymol-0.88.ebuild b/app-sci/pymol/pymol-0.88.ebuild
index cad2bf72d14b..cdc03126a935 100644
--- a/app-sci/pymol/pymol-0.88.ebuild
+++ b/app-sci/pymol/pymol-0.88.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.88.ebuild,v 1.1 2003/06/20 04:53:29 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.88.ebuild,v 1.2 2003/07/24 01:12:59 george Exp $
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://pymol.sf.net"
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND="dev-lang/python
diff --git a/app-sci/pymol/pymol-0.90.ebuild b/app-sci/pymol/pymol-0.90.ebuild
new file mode 100644
index 000000000000..aa9d87637d41
--- /dev/null
+++ b/app-sci/pymol/pymol-0.90.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.90.ebuild,v 1.1 2003/07/24 01:12:59 george Exp $
+
+DESCRIPTION="A Python-extensible molecular graphics system."
+SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
+HOMEPAGE="http://pymol.sf.net"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="dev-lang/python
+	dev-python/pmw
+	dev-python/Numeric
+	dev-lang/tk
+	media-libs/libpng
+	sys-libs/zlib
+	media-libs/glut"
+
+inherit distutils
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/setup.py-gentoo.patch
+	epatch ${FILESDIR}/setup2.py-gentoo.patch
+	# Turn off splash screen.  Please do make a project contribution
+	# if you are able though.
+	[[ -n "$WANT_NOSPLASH" ]] && epatch ${FILESDIR}/nosplash-gentoo.patch
+}
+
+src_install() {
+	distutils_src_install
+	cd ${S}
+	${python} setup2.py
+
+	local sedexp="s:${D%/}::g"
+	sed -e ${sedexp} pymol.com > pymol
+	exeinto /usr/bin
+	doexe pymol
+	dodoc DEVELOPERS CHANGES
+	#install examples
+	mv examples ${D}/usr/share/doc/${PF}
+}