pymol version cleanup and patch fix

5 files changed, 12 insertions, 157 deletions

diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta3-data-path.patch
deleted file mode 100644
index 329b68292..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta3-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/pymol-1.2_beta3-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_beta3-shaders.patch
deleted file mode 100644
index 7f4a24f48..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta3-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                    
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta4-data-path.patch
deleted file mode 100644
index 329b68292..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta4-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/pymol-1.2_beta4-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_beta4-shaders.patch
deleted file mode 100644
index 7f4a24f48..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2_beta4-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                    
diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch
index 329b68292..86c3fe1f1 100644
--- a/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch
+++ b/sci-chemistry/pymol/files/pymol-1.2_beta5-data-path.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -arNu -uarN pymol/modules/pymol/commanding.py pymol.new/modules/pymol/commanding.py
+--- pymol/modules/pymol/commanding.py	2009-03-31 12:43:14.585834066 +0200
++++ pymol.new/modules/pymol/commanding.py	2009-03-31 12:44:26.436354330 +0200
+@@ -219,11 +219,11 @@
                  _self.unlock(0,_self)
              r = DEFAULT_SUCCESS
              if show_splash==1: # generic / open-source
@@ -16,36 +16,15 @@ diff -urN pymol-9999.orig/modules/pymol/commanding.py pymol-9999/modules/pymol/c
              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 @@
+diff -arNu -uarN pymol/modules/pymol/importing.py pymol.new/modules/pymol/importing.py
+--- pymol/modules/pymol/importing.py	2009-03-31 12:43:14.546250540 +0200
++++ pymol.new/modules/pymol/importing.py	2009-03-31 12:44:48.876657949 +0200
+@@ -191,7 +191,7 @@
+     '''
          r = DEFAULT_ERROR
          
-         
 -        tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png",
 +        tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png",
-                       'pymol' : 'pymol',
-                       'rgb' : 'rgb' }
- 
+                    'pymol' : 'pymol',
+                    'rgb' : 'rgb' }
+