Cleanup of forgotten files, fixes bug 274865

Added myself as maintainer
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

6 files changed, 12 insertions, 80 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 78dcb6559711..43a6a84656ce 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,13 @@
 # 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.49 2010/01/31 22:11:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.50 2010/01/31 22:30:16 jlec Exp $
+
+  31 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  -files/1.1/pymol-1.1-r2-data-path.patch,
+  -files/1.1/pymol-1.1-r2-shaders.patch, -files/1.1/apbs-070604.patch.bz2,
+  -files/1.1/nosplash-gentoo.patch:
+  Cleanup of forgotten files, fixes bug 274865
+  Added myself as maintainer
 
   31 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net> pymol-1.2.1.ebuild,
   pymol-1.2.2.ebuild, metadata.xml:
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 4981a03f2fb4..d4e8c7ed0fea 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.1/apbs-070604.patch.bz2 20149 RMD160 886070ebd93b9ac0738c978b3a5fee816916bca9 SHA1 2ef35c7d6662d88a8c2468f9851827a7f3150380 SHA256 b3fc123c4810fe95c1b6ab93ac2dd45bdf6cc48caccd4f26ec2a825fd78cd440
-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
@@ -19,12 +15,12 @@ EBUILD pymol-0.99_rc10.ebuild 2125 RMD160 92cb22b6566abc10a6d5f02d6b45be0316f212
 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 10577 RMD160 0c549c3c13057cd81b1e0cd2d895ece5bb48a8e1 SHA1 3cdde7d3a4baf5f45320d77e97589d982891062b SHA256 fc25ec10e69c6fff757ce7b6b9c262e31d26780264052cc9f0ac61aa16e04dd2
+MISC ChangeLog 10865 RMD160 021016fc7e97a74ca588f97f1ec7da6659ac009f SHA1 c5729a857369f95fbc6bb1e9efbd5ccecd5b65f8 SHA256 09c855123a1197d3ee1ada8453b627b40e0b44fef4d417f8a3f022546db6ef0e
 MISC metadata.xml 383 RMD160 9b651daa7448b05fea3b0dc03fc96c9b9a5d90f1 SHA1 8807745ce53ad59f5a1728b9c04a0adbda7aacdd SHA256 72e1f2597a44dbb2fb2f856730d84384954c122570219433cfa45a6d7b2942dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktmACYACgkQgAnW8HDreRZrdgCfSORLoVH/+TU/i2Nimm0W/8VF
-Qa4An1J3BRXr3uWuCmpU9LGJuzSAU+5t
-=3XsO
+iEYEARECAAYFAktmBH0ACgkQgAnW8HDreRZCCACeOxo70HOkspoTCBEPMvCljezp
+V2wAnRX+zQZECxxfe7RfwXZGB11skNur
+=hDI9
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/1.1/apbs-070604.patch.bz2 b/sci-chemistry/pymol/files/1.1/apbs-070604.patch.bz2
deleted file mode 100644
index f6c6e778e93e..000000000000
--- a/sci-chemistry/pymol/files/1.1/apbs-070604.patch.bz2
+++ /dev/null
diff --git a/sci-chemistry/pymol/files/1.1/nosplash-gentoo.patch b/sci-chemistry/pymol/files/1.1/nosplash-gentoo.patch
deleted file mode 100644
index 0ef65b1d80fd..000000000000
--- a/sci-chemistry/pymol/files/1.1/nosplash-gentoo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- modules/pymol/invocation.py.orig	2008-06-26 20:55:25.000000000 +0200
-+++ modules/pymol/invocation.py	2008-06-26 20:56:06.000000000 +0200
-@@ -373,6 +373,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:
--            options.deferred.insert(0,"_do__ cmd.splash(1)")
-         
diff --git a/sci-chemistry/pymol/files/1.1/pymol-1.1-r2-data-path.patch b/sci-chemistry/pymol/files/1.1/pymol-1.1-r2-data-path.patch
deleted file mode 100644
index 329b68292877..000000000000
--- a/sci-chemistry/pymol/files/1.1/pymol-1.1-r2-data-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN pymol-9999.orig/modules/pymol/commanding.py pymol-9999/modules/pymol/commanding.py
---- pymol-9999.orig/modules/pymol/commanding.py	2008-01-11 13:23:32.000000000 +0100
-+++ pymol-9999/modules/pymol/commanding.py	2008-01-11 13:22:57.000000000 +0100
-@@ -198,11 +198,11 @@
-                 _self.unlock(0,_self)
-             r = DEFAULT_SUCCESS
-             if show_splash==1: # generic / open-source
--                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png")
-+                png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png")
-             elif show_splash==2: # evaluation builds
--                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png")
-+                png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png")
-             else: # incentive builds
--                png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png")
-+                png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png")
-             if os.path.exists(png_path):
-                 _self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path)
-         else:
-#diff -urN pymol-9999.orig/modules/pymol/fitting.py pymol-9999/modules/pymol/fitting.py
-#--- pymol-9999.orig/modules/pymol/fitting.py	2008-01-11 13:23:32.000000000 +0100
-#+++ pymol-9999/modules/pymol/fitting.py	2008-01-11 13:23:00.000000000 +0100
-#@@ -68,7 +68,7 @@
-#         if string.lower(matrix)=='none':
-#             matrix=''
-#         if len(matrix):
-#-            mfile = cmd.exp_path("$PYMOL_PATH/data/pymol/matrices/"+matrix)
-#+            mfile = cmd.exp_path("$PYMOL_DATA/pymol/matrices/"+matrix)
-#         else:
-#             mfile = ''        
-#         # delete existing alignment object (if asked to reset it)
-#@@ -135,7 +135,7 @@
-#         if string.lower(matrix)=='none':
-#             matrix=''
-#         if len(matrix):
-#-            mfile = cmd.exp_path("$PYMOL_PATH/data/pymol/matrices/"+matrix)
-#+            mfile = cmd.exp_path("$PYMOL_DATA/pymol/matrices/"+matrix)
-#         else:
-#             mfile = ''
-#         if object==None: object=''
-diff -urN pymol-9999.orig/modules/pymol/importing.py pymol-9999/modules/pymol/importing.py
---- pymol-9999.orig/modules/pymol/importing.py	2008-01-11 13:23:32.000000000 +0100
-+++ pymol-9999/modules/pymol/importing.py	2008-01-11 13:23:02.000000000 +0100
-@@ -171,7 +171,7 @@
-         r = DEFAULT_ERROR
-         
-         
--        tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
-+        tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png",
-                       'pymol' : 'pymol',
-                       'rgb' : 'rgb' }
- 
diff --git a/sci-chemistry/pymol/files/1.1/pymol-1.1-r2-shaders.patch b/sci-chemistry/pymol/files/1.1/pymol-1.1-r2-shaders.patch
deleted file mode 100644
index 7f4a24f48243..000000000000
--- a/sci-chemistry/pymol/files/1.1/pymol-1.1-r2-shaders.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uarN pymol-9999.orig/setup.py pymol-9999/setup.py
---- pymol-9999.orig/setup.py	2008-06-18 11:47:58.000000000 +0200
-+++ pymol-9999/setup.py	2008-06-18 11:48:52.000000000 +0200
-@@ -143,6 +143,7 @@
-     def_macros=[("_PYMOL_MODULE",None),
-                     ("_PYMOL_INLINE",None),
-                     ("_PYMOL_FREETYPE",None),
-+                    ("_PYMOL_OPENGL_SHADERS",None),
- # Numeric Python support                    
- #                        ("_PYMOL_NUMPY",None),
- # VMD plugin support