fix nosplash patch

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 19 insertions, 5 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index b637d10b40dd..2fd975bfe785 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.43 2009/08/02 14:58:31 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.44 2009/08/02 17:12:03 je_fro Exp $
+
+  02 Aug 2009; Jeff Gardner <je_fro@gentoo.org>
+  +files/1.2.1/nosplash-gentoo.patch, pymol-1.2.1.ebuild:
+  Fix nosplash patch
 
 *pymol-1.2.1 (02 Aug 2009)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 49d6e16fb331..bf806691b0d1 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -2,6 +2,7 @@ AUX 1.1/apbs-070604.patch.bz2 20149 RMD160 886070ebd93b9ac0738c978b3a5fee816916b
 AUX 1.1/nosplash-gentoo.patch 467 RMD160 a6be474aab95e8c8ffd37f509fe3d40cf4db23f7 SHA1 14862bab327fea0cdc8198070f01827d6f832899 SHA256 c4b5384485242165aa517fe2caf83241201c2354d5c964554f6d82c51ba7fba3
 AUX 1.1/pymol-1.1-r2-data-path.patch 2584 RMD160 c5fdd7884241a493578be5a2b658ac0cd0bff000 SHA1 1e4cd368ad08b87627ef465fad4ca96dcfbef00b SHA256 39e06459105969e0156bfe71f61bdccd3da4c8d7f2ba6e783aa34e63dc62b0a7
 AUX 1.1/pymol-1.1-r2-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
+AUX 1.2.1/nosplash-gentoo.patch 485 RMD160 3b3d85ffe14a253e54c4ff89b210cf35effe7aee SHA1 627affce7ee9763e308cf6dee70b831e09bd829d SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27
 AUX 1.2.1/pymol-1.2.1-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
 AUX 1.2.1/pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
 AUX nosplash-gentoo.patch 332 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 SHA1 275a325f7a9bb076bea72897fd6dd5ed1b014390 SHA256 5e0761591eeea90bcaa06a72c210a80ba46f2542ff985f8dd893af112254a890
@@ -11,6 +12,6 @@ DIST apbs_tools.py.090618.bz2 21329 RMD160 80baed718524dfbaff2f0a3b7263fc75c55bf
 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.1-r2.ebuild 3228 RMD160 043fca3d53bad75d9342f2a2fe621cc8b2717a5e SHA1 d4f55783362a9b02e35e1ce5bfe8aeb7f017086f SHA256 af621fe505490733ddbdf5bfd4c97fb69ef6c95bdefd7daa0c779d6421460449
-EBUILD pymol-1.2.1.ebuild 2969 RMD160 c2d98ec20cf7d6c424ac817e63c3fb58040a884c SHA1 88c983af2bcf7bc3293df92f225c409d494aa24d SHA256 4a69773417d086e230c6120466ba0636bbd0177b84a7c1a6a52d47144760a5e4
-MISC ChangeLog 9577 RMD160 bfe20d3a824633a08e0cda3e7260f239589a0c72 SHA1 766de67f5e5213bcfa214bff68ebd1c70c28ed50 SHA256 7aa381a0478791017e7deafee19e41ed82778d0cdfaef2fd6021ecd1081c168e
+EBUILD pymol-1.2.1.ebuild 2975 RMD160 a966d0388dfea3abf7dcc9d56f020237809cda19 SHA1 4fb82fb7878e20825da98512e32fa3df4f1da0f0 SHA256 e2afc6862e838c26cde64994a0da348860db2d4c85a47e408e669d80a4d01533
+MISC ChangeLog 9705 RMD160 3faa4502c167b1cbc0ad44d9ae19898605888007 SHA1 1e097fd906c388bd0c08847c39603c08576b4733 SHA256 21bb0ed427c4cba1957b49bb2e1b4c8bd75d1f03be3bc36255b640f92d4f85b0
 MISC metadata.xml 327 RMD160 d44a69d538eb2125e431b5690abeb3a2fddc425d SHA1 d65dff362b78fc32fa382ff4644e98149da0be5a SHA256 0ec76fa228418dc19e62626f28c73ce3341bce42208ea98704226f5f12cccc0c
diff --git a/sci-chemistry/pymol/files/1.2.1/nosplash-gentoo.patch b/sci-chemistry/pymol/files/1.2.1/nosplash-gentoo.patch
new file mode 100644
index 000000000000..3125b285696c
--- /dev/null
+++ b/sci-chemistry/pymol/files/1.2.1/nosplash-gentoo.patch
@@ -0,0 +1,9 @@
+--- modules/pymol/invocation.py	2009-06-25 17:26:27.000000000 +0200
++++ modules/pymol/invocation.py.new	2009-06-25 17:41:57.000000000 +0200
+@@ -395,6 +395,4 @@
+         if loaded_something and (options.after_load_script!=""):
+             options.deferred.append(options.after_load_script)
+         options.deferred.extend(final_actions)
+-        if options.show_splash and not options.no_gui and not restricted:
+-            options.deferred.insert(0,"_do__ cmd.splash(1)")
+         
diff --git a/sci-chemistry/pymol/pymol-1.2.1.ebuild b/sci-chemistry/pymol/pymol-1.2.1.ebuild
index e7e1fb391e1e..da8f89964242 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-2009 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.1 2009/08/02 14:58:31 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.2 2009/08/02 17:12:03 je_fro Exp $
 
 EAPI="2"
 
@@ -48,7 +48,7 @@ src_prepare() {
 
 	# Turn off splash screen.  Please do make a project contribution
 	# if you are able though.
-	[[ -n ${WANT_SPLASH} ]] || epatch "${FILESDIR}"/nosplash-gentoo.patch
+	[[ -n ${WANT_SPLASH} ]] || epatch "${FILESDIR}"/${PV}/nosplash-gentoo.patch
 
 	# Respect CFLAGS
 	sed -i \