new version, uses distutils now

6 files changed, 87 insertions, 6 deletions

diff --git a/app-sci/pymol/ChangeLog b/app-sci/pymol/ChangeLog
index ac0c18dbb446..8aca899c9bae 100644
--- a/app-sci/pymol/ChangeLog
+++ b/app-sci/pymol/ChangeLog
@@ -1,14 +1,22 @@
 # 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.4 2003/02/12 05:18:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.5 2003/06/20 04:53:29 george Exp $
 
-*pymol-0.82.ebuild (05 Feb 2003)
+*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} :
+  new version (#22235)
+  now uses distutils for python
+  thanks to Todd Geders <geders@purdue.edu> for update notification 
+  and Ben Cornett <acornet@emory.edu>  for "distutilized" ebuild submission
+
+*pymol-0.86 (05 Feb 2003)
 
   05 Feb 2003; George Shapovalov <george@gentoo.org> pymol-0.86.ebuild, files/digest-pymol-0.86 :
   new version, (#13531)
   removed -funroll-loops from CFLAGS
 
-*pymol-0.82.ebuild (17 July 2002)
+*pymol-0.82 (17 July 2002)
 
   19 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> pymol-0.82.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
diff --git a/app-sci/pymol/Manifest b/app-sci/pymol/Manifest
index 1aa01c3bee67..c7d6a8d847de 100644
--- a/app-sci/pymol/Manifest
+++ b/app-sci/pymol/Manifest
@@ -1,6 +1,10 @@
-MD5 7ca903133bc37a4f88fdb1d7f07e64e0 ChangeLog 772
-MD5 b049103d28a5200db1b96c5de9b9b561 pymol-0.82.ebuild 1265
 MD5 2c5d9b7dc44664677e1454dc7dd5f7ee pymol-0.86.ebuild 1259
+MD5 55042ae7de682e2f677de2a2441bad35 pymol-0.88.ebuild 1019
+MD5 b049103d28a5200db1b96c5de9b9b561 pymol-0.82.ebuild 1265
+MD5 f7c02cdae4c623c179565b3f91edfbf6 ChangeLog 1137
+MD5 34d172ef31b5038e071b634d4e645cf1 files/pymol-gentoo.diff 1566
 MD5 72d88a2e8fb425d0dc86fb9b3d5239de files/digest-pymol-0.82 64
 MD5 38bed98126e8d0cfbcd3ee77b20d9171 files/digest-pymol-0.86 64
-MD5 34d172ef31b5038e071b634d4e645cf1 files/pymol-gentoo.diff 1566
+MD5 bc61462df500f324f8ba07a1c1f7bdf4 files/digest-pymol-0.88 64
+MD5 929741dc2da6577e6e99c5542d68dbd5 files/nosplash-gentoo.patch 332
+MD5 af2da92225ab57969d18d16ed60324ce files/setup2.py-gentoo.patch 493
diff --git a/app-sci/pymol/files/digest-pymol-0.88 b/app-sci/pymol/files/digest-pymol-0.88
new file mode 100644
index 000000000000..bea1a59ed9d6
--- /dev/null
+++ b/app-sci/pymol/files/digest-pymol-0.88
@@ -0,0 +1 @@
+MD5 22d56cde503191894cd17a2965981b63 pymol-0_88-src.tgz 2092837
diff --git a/app-sci/pymol/files/nosplash-gentoo.patch b/app-sci/pymol/files/nosplash-gentoo.patch
new file mode 100644
index 000000000000..202a7cf88083
--- /dev/null
+++ b/app-sci/pymol/files/nosplash-gentoo.patch
@@ -0,0 +1,8 @@
+--- modules/pymol/invocation.py.orig	2003-06-11 13:40:13.000000000 -0400
++++ modules/pymol/invocation.py	2003-06-11 13:40:29.000000000 -0400
+@@ -179,5 +179,3 @@
+ 
+          else:
+             options.deferred.append(a)
+-      if options.show_splash and not options.no_gui:
+-         options.deferred.insert(0,"_do__ cmd.splash(1)")
diff --git a/app-sci/pymol/files/setup2.py-gentoo.patch b/app-sci/pymol/files/setup2.py-gentoo.patch
new file mode 100644
index 000000000000..1d387eaa0f4c
--- /dev/null
+++ b/app-sci/pymol/files/setup2.py-gentoo.patch
@@ -0,0 +1,17 @@
+--- setup2.py.orig	2003-06-10 19:12:35.000000000 -0400
++++ setup2.py	2003-06-10 19:11:46.000000000 -0400
+@@ -12,6 +12,14 @@
+ import sys
+ from distutils import dir_util,file_util
+ 
++import os.path
++pmlibs = os.path.join(os.environ['D'],
++                      sys.prefix[1:],
++                      'lib/python%s' % sys.version[:3],
++                      'site-packages')
++sys.path.insert(0, pmlibs)
++
++
+ if sys.platform=='win32':
+    launch_script = "pymol.bat"
+ elif sys.platform=='cygwin':
diff --git a/app-sci/pymol/pymol-0.88.ebuild b/app-sci/pymol/pymol-0.88.ebuild
new file mode 100644
index 000000000000..cad2bf72d14b
--- /dev/null
+++ b/app-sci/pymol/pymol-0.88.ebuild
@@ -0,0 +1,43 @@
+# 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 $
+
+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}/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
+}