We don't install the splash window until we have a gentoo community

contribution, fixes bug 299020
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 18 insertions, 13 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 43a6a84656ce..8e3da3dcf330 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.50 2010/01/31 22:30:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.51 2010/02/01 20:42:43 jlec Exp $
+
+  01 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> pymol-1.2.1.ebuild,
+  pymol-1.2.2.ebuild:
+  We don't install the splash window until we have a gentoo community
+  contribution, fixes bug 299020
 
   31 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
   -files/1.1/pymol-1.1-r2-data-path.patch,
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index d4e8c7ed0fea..87e8b571191c 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -13,14 +13,14 @@ DIST pymol-1.2.1.tar.gz 8276264 RMD160 0b888ef9dfc91057077248bd388327dd9d3ff15b
 DIST pymol-1.2.2.tar.gz 8280622 RMD160 e1246c98843fe004e50b5158c0be204a321fc983 SHA1 0d7e564b92564fb3f3db93b8700195f360226ea7 SHA256 15cd754317fff2fc975de1d8bf521f86227eba6674120ef336b819be80b0d7d9
 EBUILD pymol-0.99_rc10.ebuild 2125 RMD160 92cb22b6566abc10a6d5f02d6b45be0316f2126d SHA1 4dfd6793fd7b1ee3bd90b12e0ed9c1ded007cb03 SHA256 3a9eb60ad0fff94a55d8614f5ade15225298a05d31efb4de0e1f0aa092d94b24
 EBUILD pymol-1.0-r1.ebuild 2114 RMD160 26354ebc9e4bf91327f0631cf415eb08989bdd89 SHA1 1bb01c6daf8a44a11670dc0c12f63bdb08c136c3 SHA256 30356fe8bc8fc8183c2b04ea7179682476c8bda5673b29f04d2107a41fc37d1d
-EBUILD pymol-1.2.1.ebuild 2961 RMD160 dc191cb2bcd322a43d26bf7a3b12dbd75aaba4a6 SHA1 824ef3891d312cc88829041fabfc68d81f9d13fc SHA256 08f50213234f2d0af60cb2a10cb44748bb3d91d90e13fd6842ba89a12ecedcf5
-EBUILD pymol-1.2.2.ebuild 2964 RMD160 ce3fd30bfbb0bbbc2b50da8f1639c8d71ad3911d SHA1 32b54bd63770111c6f2e5e4e10f9e7c0383e5be0 SHA256 16fab2fdecbf742044258ad4e378678a3a4ae3b88063a204980021ebf4b9b15f
-MISC ChangeLog 10865 RMD160 021016fc7e97a74ca588f97f1ec7da6659ac009f SHA1 c5729a857369f95fbc6bb1e9efbd5ccecd5b65f8 SHA256 09c855123a1197d3ee1ada8453b627b40e0b44fef4d417f8a3f022546db6ef0e
+EBUILD pymol-1.2.1.ebuild 2942 RMD160 fc9da549ce07958ad813f9622814e6c7aca4327d SHA1 e727a52d05f1f410cec64706d130cbe70df638b0 SHA256 c57a294f924fd37fb335e33ec8fe81f2d56a185e9cb0d758b3a762d5af57c8b9
+EBUILD pymol-1.2.2.ebuild 2945 RMD160 421d6ced353225153563779ed46c40a8e8c75811 SHA1 98bff4c5795ce50efa012cc9cf7c61b11b7889b7 SHA256 f2a56b8f7fe120f168b91a73c0e0e441046c28584a898a7d1c2021d337937d87
+MISC ChangeLog 11065 RMD160 52741a70f0d83200c18859d447461f523da732a0 SHA1 585d5450a1f1f56c5277cfe20769ef975cce609d SHA256 53ddc587ec7a152464286e0fc45a564d5336ba0e270715fc8e840dc657065ef2
 MISC metadata.xml 383 RMD160 9b651daa7448b05fea3b0dc03fc96c9b9a5d90f1 SHA1 8807745ce53ad59f5a1728b9c04a0adbda7aacdd SHA256 72e1f2597a44dbb2fb2f856730d84384954c122570219433cfa45a6d7b2942dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktmBH0ACgkQgAnW8HDreRZCCACeOxo70HOkspoTCBEPMvCljezp
-V2wAnRX+zQZECxxfe7RfwXZGB11skNur
-=hDI9
+iEYEARECAAYFAktnPMkACgkQgAnW8HDreRZ2YwCfX2c0vPBN7HwKGMKANKiEQBF+
+o2gAoNEaVP+GxWLMCicwJDxABOmzzH/9
+=Haf7
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.2.1.ebuild b/sci-chemistry/pymol/pymol-1.2.1.ebuild
index 126e166109e2..275a05aa9a68 100644
--- a/sci-chemistry/pymol/pymol-1.2.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.6 2010/01/31 22:11:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.7 2010/02/01 20:42:43 jlec Exp $
 
 EAPI="2"
 
@@ -45,8 +45,8 @@ src_prepare() {
 		|| die "Failed to apply data-path.patch"
 
 	# Turn off splash screen.  Please do make a project contribution
-	# if you are able though.
-	[[ -n ${WANT_SPLASH} ]] || epatch "${FILESDIR}"/${PV}/nosplash-gentoo.patch
+	# if you are able though. #299020
+	epatch "${FILESDIR}"/${PV}/nosplash-gentoo.patch
 
 	# Respect CFLAGS
 	sed -i \
diff --git a/sci-chemistry/pymol/pymol-1.2.2.ebuild b/sci-chemistry/pymol/pymol-1.2.2.ebuild
index 4b88f6302183..1ce9b313cafe 100644
--- a/sci-chemistry/pymol/pymol-1.2.2.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.2.ebuild,v 1.3 2010/01/31 22:11:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.2.ebuild,v 1.4 2010/02/01 20:42:43 jlec Exp $
 
 EAPI="2"
 
@@ -45,8 +45,8 @@ src_prepare() {
 		|| die "Failed to apply data-path.patch"
 
 	# Turn off splash screen.  Please do make a project contribution
-	# if you are able though.
-	[[ -n ${WANT_SPLASH} ]] || epatch "${FILESDIR}"/1.2.1/nosplash-gentoo.patch
+	# if you are able though. #299020
+	epatch "${FILESDIR}"/1.2.1/nosplash-gentoo.patch
 
 	# Respect CFLAGS
 	sed -i \