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 1QszVz-00020s-Vx for garchives@archives.gentoo.org; Mon, 15 Aug 2011 15:55:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6877921C21C; Mon, 15 Aug 2011 15:55:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 28F5E21C21B for ; Mon, 15 Aug 2011 15:55:10 +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 8BE8C1B4056 for ; Mon, 15 Aug 2011 15:55:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B7EE080040 for ; Mon, 15 Aug 2011 15:55:08 +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: 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-setup.py.patch sci-chemistry/pymol/files/pymol-9999-shaders.patch sci-chemistry/pymol/metadata.xml sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/ sci-chemistry/pymol/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d5fe6f9794ab6175d9b31e6f98af156ca81a42f4 Date: Mon, 15 Aug 2011 15:55:08 +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: 9d9a5eb13eeaaa1cbc3c3ed31659303b commit: d5fe6f9794ab6175d9b31e6f98af156ca81a42f4 Author: Justin Lecher gentoo org> AuthorDate: Fri Jul 22 07:19:08 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Jul 22 07:19:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dd5fe6f97 Grap some fedora stuff, fix shadrers patch for current head (Portage version: 2.2.0_alpha46/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/pymol/ChangeLog | 5 +++ .../pymol/files/pymol-9999-setup.py.patch | 24 ++++++++++++++= + sci-chemistry/pymol/files/pymol-9999-shaders.patch | 32 +++++++++++---= ----- sci-chemistry/pymol/metadata.xml | 20 ++++++------ sci-chemistry/pymol/pymol-9999.ebuild | 10 ++---- 5 files changed, 60 insertions(+), 31 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLo= g index e3f6e08..b007111 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 22 Jul 2011; Justin Lecher pymol-9999.ebuild, + +files/pymol-9999-setup.py.patch, files/pymol-9999-shaders.patch, + metadata.xml: + Grap some fedora stuff, fix shadrers patch for current head + 02 Jun 2011; Justin Lecher +files/9999-web.patch, pymol-9999.ebuild, metadata.xml: Fix collision with dev-python/webpy, #368947 diff --git a/sci-chemistry/pymol/files/pymol-9999-setup.py.patch b/sci-ch= emistry/pymol/files/pymol-9999-setup.py.patch new file mode 100644 index 0000000..1267b96 --- /dev/null +++ b/sci-chemistry/pymol/files/pymol-9999-setup.py.patch @@ -0,0 +1,24 @@ + setup.py | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/setup.py b/setup.py +index b0f4dad..8c82722 100644 +--- a/setup.py ++++ b/setup.py +@@ -156,7 +156,7 @@ else: # linux or other unix + # ("_PYMOL_VMD_PLUGINS",None) + ("NO_MMLIBS",None), + ] +- ext_comp_args=3D["-ffast-math","-funroll-loops","-O3"] ++ ext_comp_args=3D[] + ext_link_args=3D[] + =20 + setup ( # Distribution meta-data +@@ -174,6 +174,7 @@ setup ( # Distribution meta-data + 'pmg_tk/skins', + 'pmg_tk/skins/normal', =20 + 'pmg_wx', ++ 'pymol2', + 'pymol', + 'pymol/contrib', =20 + 'pymol/opengl', diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-che= mistry/pymol/files/pymol-9999-shaders.patch index 2caac2d..a20bfe3 100644 --- a/sci-chemistry/pymol/files/pymol-9999-shaders.patch +++ b/sci-chemistry/pymol/files/pymol-9999-shaders.patch @@ -1,8 +1,12 @@ -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 3945) -+++ layer0/ShaderMgr.c (working copy) -@@ -400,7 +400,7 @@ + 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) char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fil= eName) { FILE* f; long size; @@ -11,7 +15,7 @@ Index: layer0/ShaderMgr.c =20 PRINTFB(G, FB_ShaderMgr, FB_Debugging) "CShaderMgr_ReadShaderFromDisk: fileName=3D'%s'\n", fileName -@@ -412,16 +412,16 @@ +@@ -428,16 +428,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals = * G, const char * fileName) { return NULL; } =20 @@ -20,8 +24,8 @@ Index: layer0/ShaderMgr.c + pymol_data =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", fileName ENDFB(G); -+ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot rea= d shader config files from disk\n", fileName ENDFB(G); +- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot rea= d shader config files from disk\n" ENDFB(G); ++ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot rea= d shader config files from disk\n" ENDFB(G); return NULL; } /* make this a setting */ @@ -34,7 +38,7 @@ Index: layer0/ShaderMgr.c fullFile =3D strcat(fullFile, shader_path); fullFile =3D strcat(fullFile, fileName); =20 -@@ -430,7 +430,7 @@ +@@ -446,7 +446,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * = G, const char * fileName) { =20 if (!f) { PRINTFB(G, FB_ShaderMgr, FB_Errors) @@ -43,11 +47,11 @@ Index: layer0/ShaderMgr.c return NULL; } else { PRINTFB(G, FB_ShaderMgr, FB_Blather) -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 3945) -+++ layer1/Setting.c (working copy) -@@ -3990,7 +3990,7 @@ +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 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 */ diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metad= ata.xml index 58b73ca..1a70ddc 100644 --- a/sci-chemistry/pymol/metadata.xml +++ b/sci-chemistry/pymol/metadata.xml @@ -1,13 +1,13 @@ -sci-chemistry - - jlec@gentoo.org - - - Pymol supprt for sci-chemistry/apbs - Enable numpy support for Pymol - Builds molfile plugin support - Install Pymodule needed for web app support - + sci-chemistry + + jlec@gentoo.org + + + Pymol supprt for sci-chemistry/apbs + Enable numpy support for Pymol + Builds molfile plugin support + Install Pymodule needed for web app support + diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/= pymol-9999.ebuild index 62a7a60..edfdbf2 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -43,22 +43,18 @@ RDEPEND=3D"${DEPEND}" src_prepare() { epatch \ "${FILESDIR}"/${P}-data-path.patch \ - "${FILESDIR}"/${P}-shaders.patch + "${FILESDIR}"/${P}-shaders.patch \ + "${FILESDIR}"/${P}-setup.py.patch =20 use web || epatch "${FILESDIR}"/${PV}-web.patch =20 epatch "${FILESDIR}"/${P}-prefix.patch && \ - eprefixify setup.py + eprefixify setup.py =20 # Turn off splash screen. Please do make a project contribution # if you are able though. #299020 epatch "${FILESDIR}"/nosplash-gentoo.patch =20 - # Respect CFLAGS - sed -i \ - -e "s:\(ext_comp_args=3D\).*:\1[]:g" \ - "${S}"/setup.py || die "Failed running sed on setup.py" - use vmd && epatch "${FILESDIR}"/${PV}-vmd.patch =20 use numpy && \