From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QwyqO-0006KN-I7 for garchives@archives.gentoo.org; Fri, 26 Aug 2011 16:01:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E36D21C08D; Fri, 26 Aug 2011 16:01:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3022121C08D for ; Fri, 26 Aug 2011 16:01:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E9071B4036 for ; Fri, 26 Aug 2011 16:01:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B04B480040 for ; Fri, 26 Aug 2011 16:01:01 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <7b50469d9a21a586cfb76f7b4fc21937379bc1b0.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/files/pymol-9999-prefix.patch sci-chemistry/pymol/files/pymol-9999-shaders.patch X-VCS-Directories: sci-chemistry/pymol/ sci-chemistry/pymol/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 7b50469d9a21a586cfb76f7b4fc21937379bc1b0 Date: Fri, 26 Aug 2011 16:01:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 01f80ebf05865c35646b82ab32fa4647 commit: 7b50469d9a21a586cfb76f7b4fc21937379bc1b0 Author: Justin Lecher gentoo org> AuthorDate: Thu Aug 18 10:10:06 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Aug 18 10:10:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D7b50469d 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/ChangeLo= g 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: $ =20 + 18 Aug 2011; Justin Lecher files/pymol-9999-prefix.p= atch, + files/pymol-9999-shaders.patch: + Fixed patches + 22 Jul 2011; Justin Lecher 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-chem= istry/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=3D=3D'darwin': +Index: setup.py +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- setup.py (revision 3963) ++++ setup.py (working copy) +@@ -101,7 +101,7 @@ + # + # REMEMEBER to use "./ext/bin/python ..." + # +- EXT =3D os.getcwd()+"/ext" ++ EXT =3D "@GENTOO_PORTAGE_EPREFIX@/usr" + inc_dirs=3D["ov/src", + "layer0","layer1","layer2", + "layer3","layer4","layer5",=20 +@@ -121,7 +121,7 @@ ] ext_comp_args=3D[] ext_link_args=3D[ -- "-L/usr/X11R6/lib", "-lGL", "-lXxf86vm", -+ "-L@GENTOO_PORTAGE_EPREFIX@/usr/lib", "-lGL", "-lXxf86v= m", +- "-L/usr/X11R6/lib64", "-lGL", "-lXxf86vm", ++ "-lGL", "-lXxf86vm", "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype" ] #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D -@@ -120,7 +120,7 @@ else: # linux or other unix +@@ -129,7 +129,7 @@ inc_dirs=3D["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 @@ ]=09 - pyogl_libs =3D ["GL","GLU","glut"] + pyogl_libs =3D ["GL","GLU","glut", "GLEW"] lib_dirs=3D[ -- "/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=3D[("_PYMOL_MODULE",None), diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-che= mistry/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 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- layer0/ShaderMgr.c (revision 3963) ++++ layer0/ShaderMgr.c (working copy) +@@ -416,7 +416,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fil= eName) { FILE* f; long size; - char* buffer =3D NULL, *p, *pymol_path, *shader_path, *fullFile; + char* buffer =3D NULL, *p, *pymol_data, *shader_path, *fullFile; + size_t res; =20 PRINTFB(G, FB_ShaderMgr, FB_Debugging) - "CShaderMgr_ReadShaderFromDisk: fileName=3D'%s'\n", fileName -@@ -428,16 +428,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals = * G, const char * fileName) { +@@ -429,16 +429,16 @@ return NULL; } =20 - pymol_path =3D getenv("PYMOL_PATH"); - if (!pymol_path){ -+ pymol_data =3D getenv("PYMOL_DATA"); ++ pymol_path =3D getenv("PYMOL_DATA"); + if (!pymol_data){ PRINTFB(G, FB_ShaderMgr, FB_Warnings) - " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot rea= d shader config files from disk\n" ENDFB(G); @@ -38,7 +34,7 @@ index 4658b96..092aac8 100644 fullFile =3D strcat(fullFile, shader_path); fullFile =3D strcat(fullFile, fileName); =20 -@@ -446,7 +446,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * = G, const char * fileName) { +@@ -447,7 +447,7 @@ =20 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 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- 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 opt= imized shaders present; doesn't effect vol */