diff options
author | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-07-31 12:23:09 +0200 |
---|---|---|
committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-07-31 12:23:09 +0200 |
commit | 42dd7f847418d94d81ef780d9cc485cc1ba9841a (patch) | |
tree | 18509f0a007d43aeca6784b7c7a338bd6a0bd128 /sci-chemistry/pymol/files | |
parent | [sys-infiniband] Deps cleanup (diff) | |
download | sci-42dd7f847418d94d81ef780d9cc485cc1ba9841a.tar.gz sci-42dd7f847418d94d81ef780d9cc485cc1ba9841a.tar.bz2 sci-42dd7f847418d94d81ef780d9cc485cc1ba9841a.zip |
pymol cleanup to move to the tree as requested by fauli in bug 269119
Diffstat (limited to 'sci-chemistry/pymol/files')
-rw-r--r-- | sci-chemistry/pymol/files/1.2_beta8-nosplash-gentoo.patch | 9 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/apbs-070604-r3550.patch.bz2 | bin | 20283 -> 0 bytes | |||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2.0-data-path.patch (renamed from sci-chemistry/pymol/files/pymol-1.2_beta8-data-path.patch) | 0 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2.0-shaders.patch (renamed from sci-chemistry/pymol/files/pymol-1.2_beta8-shaders.patch) | 0 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2.1-data-path.patch (renamed from sci-chemistry/pymol/files/pymol-1.2_rc0-data-path.patch) | 0 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2.1-shaders.patch (renamed from sci-chemistry/pymol/files/pymol-1.2_rc1-shaders.patch) | 0 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2_rc0-shaders.patch | 11 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2_rc1-data-path.patch | 30 |
8 files changed, 0 insertions, 50 deletions
diff --git a/sci-chemistry/pymol/files/1.2_beta8-nosplash-gentoo.patch b/sci-chemistry/pymol/files/1.2_beta8-nosplash-gentoo.patch deleted file mode 100644 index 18f228524..000000000 --- a/sci-chemistry/pymol/files/1.2_beta8-nosplash-gentoo.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- modules/pymol/invocation.py 2009-06-30 14:27:39.000000000 +0200 -+++ modules/pymol/invocation.py.new 2009-06-30 14:30:01.000000000 +0200 -@@ -372,6 +372,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/apbs-070604-r3550.patch.bz2 b/sci-chemistry/pymol/files/apbs-070604-r3550.patch.bz2 Binary files differdeleted file mode 100644 index 396a4d26d..000000000 --- a/sci-chemistry/pymol/files/apbs-070604-r3550.patch.bz2 +++ /dev/null diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta8-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2.0-data-path.patch index 86c3fe1f1..86c3fe1f1 100644 --- a/sci-chemistry/pymol/files/pymol-1.2_beta8-data-path.patch +++ b/sci-chemistry/pymol/files/pymol-1.2.0-data-path.patch diff --git a/sci-chemistry/pymol/files/pymol-1.2_beta8-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2.0-shaders.patch index 7f4a24f48..7f4a24f48 100644 --- a/sci-chemistry/pymol/files/pymol-1.2_beta8-shaders.patch +++ b/sci-chemistry/pymol/files/pymol-1.2.0-shaders.patch diff --git a/sci-chemistry/pymol/files/pymol-1.2_rc0-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2.1-data-path.patch index 86c3fe1f1..86c3fe1f1 100644 --- a/sci-chemistry/pymol/files/pymol-1.2_rc0-data-path.patch +++ b/sci-chemistry/pymol/files/pymol-1.2.1-data-path.patch diff --git a/sci-chemistry/pymol/files/pymol-1.2_rc1-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2.1-shaders.patch index 06f756823..06f756823 100644 --- a/sci-chemistry/pymol/files/pymol-1.2_rc1-shaders.patch +++ b/sci-chemistry/pymol/files/pymol-1.2.1-shaders.patch diff --git a/sci-chemistry/pymol/files/pymol-1.2_rc0-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2_rc0-shaders.patch deleted file mode 100644 index 7f4a24f48..000000000 --- a/sci-chemistry/pymol/files/pymol-1.2_rc0-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_rc1-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2_rc1-data-path.patch deleted file mode 100644 index 86c3fe1f1..000000000 --- a/sci-chemistry/pymol/files/pymol-1.2_rc1-data-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 -- 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 -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' } - |