[gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     7b50469d9a21a586cfb76f7b4fc21937379bc1b0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 10:10:06 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 10:10:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7b50469d

Fixed patches

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-chemistry/pymol/ChangeLog                      |    4 ++
 sci-chemistry/pymol/files/pymol-9999-prefix.patch  |   33 ++++++++++++-------
 sci-chemistry/pymol/files/pymol-9999-shaders.patch |   32 ++++++++-----------
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index b007111..e830989 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Aug 2011; Justin Lecher <jlec@gentoo.org> files/pymol-9999-prefix.patch,
+  files/pymol-9999-shaders.patch:
+  Fixed patches
+
   22 Jul 2011; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   +files/pymol-9999-setup.py.patch, files/pymol-9999-shaders.patch,
   metadata.xml:

diff --git a/sci-chemistry/pymol/files/pymol-9999-prefix.patch b/sci-chemistry/pymol/files/pymol-9999-prefix.patch
index 2118814..d417d97 100644
--- a/sci-chemistry/pymol/files/pymol-9999-prefix.patch
+++ b/sci-chemistry/pymol/files/pymol-9999-prefix.patch
@@ -1,17 +1,26 @@
-diff --git a/setup.py b/setup.py
-index 197f827..b39c129 100644
---- a/setup.py
-+++ b/setup.py
-@@ -112,7 +112,7 @@ elif sys.platform=='darwin':
+Index: setup.py
+===================================================================
+--- setup.py	(revision 3963)
++++ setup.py	(working copy)
+@@ -101,7 +101,7 @@
+         #
+         # REMEMEBER to use "./ext/bin/python ..."
+         #
+-        EXT = os.getcwd()+"/ext"
++        EXT = "@GENTOO_PORTAGE_EPREFIX@/usr"
+         inc_dirs=["ov/src",
+                   "layer0","layer1","layer2",
+                   "layer3","layer4","layer5", 
+@@ -121,7 +121,7 @@
                      ]
          ext_comp_args=[]
          ext_link_args=[
--	               "-L/usr/X11R6/lib", "-lGL", "-lXxf86vm",
-+	               "-L@GENTOO_PORTAGE_EPREFIX@/usr/lib", "-lGL", "-lXxf86vm",
+-	               "-L/usr/X11R6/lib64", "-lGL", "-lXxf86vm",
++	               "-lGL", "-lXxf86vm",
                     "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype"
                     ]
  #============================================================================
-@@ -120,7 +120,7 @@ else: # linux or other unix
+@@ -129,7 +129,7 @@
      inc_dirs=["ov/src",
                "layer0","layer1","layer2",
                "layer3","layer4","layer5",
@@ -20,12 +29,12 @@ index 197f827..b39c129 100644
  #                 "/users/warren/ext/include",
  # VMD plugin support
  #              "contrib/uiuc/plugins/include",
-@@ -131,7 +131,7 @@ else: # linux or other unix
+@@ -141,7 +141,7 @@
            ]	
-     pyogl_libs = ["GL","GLU","glut"]
+     pyogl_libs = ["GL","GLU","glut", "GLEW"]
      lib_dirs=[
--        "/usr/X11R6/lib",
-+        "@GENTOO_PORTAGE_EPREFIX@/usr/lib",
+-        "/usr/X11R6/lib64",
++        "@GENTOO_PORTAGE_EPREFIX@/usr/usr/X11R6/lib",
  #        "/users/warren/pymol/ext/lib"
          ]
      def_macros=[("_PYMOL_MODULE",None),

diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-chemistry/pymol/files/pymol-9999-shaders.patch
index a20bfe3..8517ebe 100644
--- a/sci-chemistry/pymol/files/pymol-9999-shaders.patch
+++ b/sci-chemistry/pymol/files/pymol-9999-shaders.patch
@@ -1,27 +1,23 @@
- layer0/ShaderMgr.c |   16 ++++++++--------
- layer1/Setting.c   |    2 +-
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c
-index 4658b96..092aac8 100644
---- a/layer0/ShaderMgr.c
-+++ b/layer0/ShaderMgr.c
-@@ -416,7 +416,7 @@ int CShaderMgr_ShadersPresent(CShaderMgr * I)
+Index: layer0/ShaderMgr.c
+===================================================================
+--- layer0/ShaderMgr.c	(revision 3963)
++++ layer0/ShaderMgr.c	(working copy)
+@@ -416,7 +416,7 @@
  char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) {
    FILE* f;
    long size;
 -  char* buffer = NULL, *p, *pymol_path, *shader_path, *fullFile;
 +  char* buffer = NULL, *p, *pymol_data, *shader_path, *fullFile;
+   size_t res;
  
    PRINTFB(G, FB_ShaderMgr, FB_Debugging)
-     "CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName
-@@ -428,16 +428,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) {
+@@ -429,16 +429,16 @@
      return NULL;
    }
    
 -  pymol_path = getenv("PYMOL_PATH");
 -  if (!pymol_path){
-+  pymol_data = getenv("PYMOL_DATA");
++  pymol_path = getenv("PYMOL_DATA");
 +  if (!pymol_data){
      PRINTFB(G, FB_ShaderMgr, FB_Warnings)
 -      " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n" ENDFB(G);
@@ -38,7 +34,7 @@ index 4658b96..092aac8 100644
    fullFile = strcat(fullFile, shader_path);
    fullFile = strcat(fullFile, fileName);
  
-@@ -446,7 +446,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) {
+@@ -447,7 +447,7 @@
  
    if (!f) {
      PRINTFB(G, FB_ShaderMgr, FB_Errors)
@@ -47,11 +43,11 @@ index 4658b96..092aac8 100644
      return NULL;
    } else {
      PRINTFB(G, FB_ShaderMgr, FB_Blather)
-diff --git a/layer1/Setting.c b/layer1/Setting.c
-index 29b6bc5..2a70835 100644
---- a/layer1/Setting.c
-+++ b/layer1/Setting.c
-@@ -3991,7 +3991,7 @@ void SettingInitGlobal(PyMOLGlobals * G, int alloc, int reset_gui, int use_defau
+Index: layer1/Setting.c
+===================================================================
+--- layer1/Setting.c	(revision 3963)
++++ layer1/Setting.c	(working copy)
+@@ -3991,7 +3991,7 @@
      set_b(I, cSetting_line_use_shader, 1);
      set_b(I, cSetting_sphere_use_shader, 1);
      set_b(I, cSetting_use_shaders, 0);  /* disable by default until optimized shaders present; doesn't effect vol */