(#124994) Upstream doesn't understand how to tell people when an actual version is released, instead they silently push out a series of release candidates and call them all 0.99.

(Portage version: 2.1_pre5-r2)

4 files changed, 23 insertions, 8 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index cb0ebe6e13b0..0826ca1ed0c5 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.11 2006/03/03 17:32:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.12 2006/03/07 16:16:52 spyderous Exp $
+
+*pymol-0.99_rc6 (07 Mar 2006)
+
+  07 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +pymol-0.99_rc6.ebuild, -pymol-0.99.ebuild:
+  (#124994) Upstream doesn't understand how to tell people when an actual
+  version is released, instead they silently push out a series of release
+  candidates and call them all 0.99.
 
 *pymol-0.99 (03 Mar 2006)
 
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.99 b/sci-chemistry/pymol/files/digest-pymol-0.99
deleted file mode 100644
index cfc1dc544212..000000000000
--- a/sci-chemistry/pymol/files/digest-pymol-0.99
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1dfb4b943e6a8dba06f4446b8a185bae pymol-0_99rc1-src.tgz 4178605
-RMD160 68dab263e2032996a143853caf91850e573654c9 pymol-0_99rc1-src.tgz 4178605
-SHA256 1121d80d7268583db78f7f75e91669401239ab44e9319abdd970de1f81e12aab pymol-0_99rc1-src.tgz 4178605
diff --git a/sci-chemistry/pymol/files/digest-pymol-0.99_rc6 b/sci-chemistry/pymol/files/digest-pymol-0.99_rc6
new file mode 100644
index 000000000000..3a462090ec4e
--- /dev/null
+++ b/sci-chemistry/pymol/files/digest-pymol-0.99_rc6
@@ -0,0 +1,3 @@
+MD5 cb29385ab523f648d4db47a222b1d03e pymol-0_99rc6-src.tgz 4198816
+RMD160 e9dc568dd38fffd37f306adf7e7a109d81dd4477 pymol-0_99rc6-src.tgz 4198816
+SHA256 d56bebc1316fd3442c54dee5bc4b2979041943bf50a9b34b44839595fd1b9a59 pymol-0_99rc6-src.tgz 4198816
diff --git a/sci-chemistry/pymol/pymol-0.99.ebuild b/sci-chemistry/pymol/pymol-0.99_rc6.ebuild
index 60c646936335..8dc6b66afa02 100644
--- a/sci-chemistry/pymol/pymol-0.99.ebuild
+++ b/sci-chemistry/pymol/pymol-0.99_rc6.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99.ebuild,v 1.2 2006/03/04 00:23:27 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99_rc6.ebuild,v 1.1 2006/03/07 16:16:52 spyderous Exp $
 
 inherit distutils eutils multilib
 
-MY_P="${PN}-${PV/./_}rc1"
+MY_PV=${PV/_}
+MY_S_P="${PN}-${MY_PV}"
+MY_PV=${MY_PV/./_}
+MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pymol/${MY_P}-src.tgz"
@@ -12,7 +15,7 @@ SRC_URI="mirror://sourceforge/pymol/${MY_P}-src.tgz"
 LICENSE="PSF-2.2"
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 
 DEPEND="dev-lang/python
 	dev-python/pmw
@@ -21,10 +24,14 @@ DEPEND="dev-lang/python
 	media-libs/libpng
 	sys-libs/zlib
 	virtual/glut"
+S="${WORKDIR}/${MY_S_P}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	# Turn off splash screen.  Please do make a project contribution
+	# if you are able though.
+	[[ -n "$WANT_NOSPLASH" ]] && epatch ${FILESDIR}/nosplash-gentoo.patch
 
 	# Respect CFLAGS
 	sed -i \
@@ -59,7 +66,7 @@ EOF
 	mv examples ${D}/usr/share/doc/${PF}/
 
 	dodir /usr/share/pymol
-	mv tests ${D}/usr/share/pymol/
+	mv test ${D}/usr/share/pymol/
 	mv data ${D}/usr/share/pymol/
 	mv scripts ${D}/usr/share/pymol/
 }