New version: 0.98. Removed obsolete versions.

(Portage version: 2.0.51.19)

7 files changed, 15 insertions, 59 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 3822b38dfc89..94b3ecfdd954 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.5 2005/05/13 18:04:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.6 2005/05/18 17:56:11 ribosome Exp $
+
+*pymol-0.98 (18 May 2005)
+
+  18 May 2005; Olivier Fisette <ribosome@gentoo.org> -pymol-0.90.ebuild,
+  -pymol-0.95.ebuild, +pymol-0.98.ebuild:
+  New version: 0.98. Removed obsolete versions.
 
   13 May 2005; Olivier Fisette <ribosome@gentoo.org> pymol-0.97.ebuild:
   Fixed multilib issue (bug #92103).
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 8066fc00ae22..54cd87bb2702 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,14 +1,12 @@
-MD5 8ca390e4c4cebbf9a13d0ad1c873b2de pymol-0.95.ebuild 1140
-MD5 6305e57aead6d7ccf8d2a5724f73c17f pymol-0.90.ebuild 1130
 MD5 52d42ffa320dc84612f2d119af428a87 pymol-0.97.ebuild 1134
 MD5 b55788c23a8af52dc98ede88bf488985 pymol-0.88.ebuild 1030
+MD5 859fc6c5fea8a784a41db733399aed09 pymol-0.98.ebuild 1135
 MD5 c4a3360304e27ac9791c325d153b960c ChangeLog 3095
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 34d172ef31b5038e071b634d4e645cf1 files/pymol-gentoo.diff 1566
 MD5 bc61462df500f324f8ba07a1c1f7bdf4 files/digest-pymol-0.88 64
-MD5 6970b70ab3710cde34e422cba7cce5c2 files/digest-pymol-0.90 64
-MD5 b674c205dd6279884c91077eec6e5442 files/digest-pymol-0.95 64
 MD5 cb324029606a6b5048895957143c7a44 files/digest-pymol-0.97 64
+MD5 2dbc83e197b07cf99e7b02a03555a3d6 files/digest-pymol-0.98 64
 MD5 1a6ba582a7928c370c8dfe44c8867e7c files/header_order.patch 905
 MD5 929741dc2da6577e6e99c5542d68dbd5 files/nosplash-gentoo.patch 332
 MD5 e42746bf581479c61ff1e7cc5b978edd files/setup.py-gentoo.patch 311
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.90 b/sci-chemistry/pymol/files/digest-pymol-0.90
deleted file mode 100644
index 5d6062d88f16..000000000000
--- a/sci-chemistry/pymol/files/digest-pymol-0.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be181d10df622b011725d9541da22070 pymol-0_90-src.tgz 2134293
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.95 b/sci-chemistry/pymol/files/digest-pymol-0.95
deleted file mode 100644
index 99112b99b7c5..000000000000
--- a/sci-chemistry/pymol/files/digest-pymol-0.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca5f7ee698bfec6218f45342bd925e56 pymol-0_95-src.tgz 2676518
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.98 b/sci-chemistry/pymol/files/digest-pymol-0.98
new file mode 100644
index 000000000000..6fe1d92faee5
--- /dev/null
+++ b/sci-chemistry/pymol/files/digest-pymol-0.98
@@ -0,0 +1 @@
+MD5 096cc1d06fa36eb1c8ad30560d06b81e pymol-0_98-src.tgz 3033733
diff --git a/sci-chemistry/pymol/pymol-0.95.ebuild b/sci-chemistry/pymol/pymol-0.95.ebuild
deleted file mode 100644
index 637d9e6895ad..000000000000
--- a/sci-chemistry/pymol/pymol-0.95.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.95.ebuild,v 1.2 2005/02/06 13:08:01 blubb Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="A Python-extensible molecular graphics system."
-HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
-
-LICENSE="PSF-2.2"
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="dev-lang/python
-	dev-python/pmw
-	dev-python/numeric
-	dev-lang/tk
-	media-libs/libpng
-	sys-libs/zlib
-	media-libs/glut"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/header_order.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}
-	PYTHONPATH=$(find ${D}/usr/lib -type d -name site-packages) ${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}
-}
diff --git a/sci-chemistry/pymol/pymol-0.90.ebuild b/sci-chemistry/pymol/pymol-0.98.ebuild
index 3b2d27bacd05..c15576342584 100644
--- a/sci-chemistry/pymol/pymol-0.90.ebuild
+++ b/sci-chemistry/pymol/pymol-0.98.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.90.ebuild,v 1.2 2005/02/06 13:08:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.98.ebuild,v 1.1 2005/05/18 17:56:11 ribosome Exp $
 
-inherit distutils eutils
+inherit distutils eutils multilib
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
 
 LICENSE="PSF-2.2"
-SLOT="0"
 IUSE=""
-KEYWORDS="x86 ~ppc"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 DEPEND="dev-lang/python
 	dev-python/pmw
@@ -24,8 +24,6 @@ DEPEND="dev-lang/python
 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
@@ -34,7 +32,7 @@ src_unpack() {
 src_install() {
 	distutils_src_install
 	cd ${S}
-	${python} setup2.py
+	PYTHONPATH=$(find ${D}/usr/$(get_libdir) -type d -name site-packages) ${python} setup2.py
 
 	local sedexp="s:${D%/}::g"
 	sed -e ${sedexp} pymol.com > pymol