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 1Q6hoG-00077U-VA for garchives@archives.gentoo.org; Mon, 04 Apr 2011 11:19:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D70471C056; Mon, 4 Apr 2011 11:18:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 97C621C056 for ; Mon, 4 Apr 2011 11:18:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DF161B406F for ; Mon, 4 Apr 2011 11:18:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7B1EE8006D for ; Mon, 4 Apr 2011 11:18:55 +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: <5bfc2f1fa057d2311f57dc3528fd45e2b177e49c.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/9999-vmd.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: 5bfc2f1fa057d2311f57dc3528fd45e2b177e49c Date: Mon, 4 Apr 2011 11:18:55 +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: 2d9857ee2570122fe4769bb17b52c9a9 commit: 5bfc2f1fa057d2311f57dc3528fd45e2b177e49c Author: Justin Lecher gentoo org> AuthorDate: Mon Apr 4 11:13:06 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Apr 4 11:13:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D5bfc2f1f Fix to latest head (Portage version: 2.2.0_alpha29/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/pymol/ChangeLog | 6 ++- sci-chemistry/pymol/files/9999-vmd.patch | 36 ++++++++++ sci-chemistry/pymol/files/pymol-9999-shaders.patch | 73 ++++++++++++++= +++--- sci-chemistry/pymol/metadata.xml | 1 - sci-chemistry/pymol/pymol-9999.ebuild | 46 ++++++------ 5 files changed, 126 insertions(+), 36 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLo= g index ad6be4e..256d96c 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-chemistry/pymol -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 04 Apr 2011; Justin Lecher +files/9999-vmd.patch, + pymol-9999.ebuild, files/pymol-9999-shaders.patch, metadata.xml: + Fix to latest head + 12 Nov 2010; Justin Lecher pymol-9999.ebuild: Synchonized with tree ebuild =20 diff --git a/sci-chemistry/pymol/files/9999-vmd.patch b/sci-chemistry/pym= ol/files/9999-vmd.patch new file mode 100644 index 0000000..2fd909f --- /dev/null +++ b/sci-chemistry/pymol/files/9999-vmd.patch @@ -0,0 +1,36 @@ + setup.py | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index b0f4dad..4ec5145 100644 +--- a/setup.py ++++ b/setup.py +@@ -132,8 +132,8 @@ else: # linux or other unix + "/usr/include/freetype2", + # "/users/warren/ext/include", + # VMD plugin support +-# "contrib/uiuc/plugins/include", +-# "contrib/uiuc/plugins/molfile_plugin/src", ++ "contrib/uiuc/plugins/include", ++ "contrib/uiuc/plugins/molfile_plugin/src", + "modules/cealign/src", + "modules/cealign/src/tnt", ] + libs=3D["GL","GLU","glut","png","z","freetype", "GLEW", +@@ -153,7 +153,7 @@ else: # linux or other unix + # Numeric Python support =20 + # ("_PYMOL_NUMPY",None), + # VMD plugin support =20 +-# ("_PYMOL_VMD_PLUGINS",None) ++ ("_PYMOL_VMD_PLUGINS",None), + ("NO_MMLIBS",None), + ] + ext_comp_args=3D["-ffast-math","-funroll-loops","-O3"] +@@ -307,7 +307,7 @@ setup ( # Distribution meta-data + "layer5/main.c" + # VMD plugin support + # switch the 0 to 1 to activate the additional source code +- ] + 0 * [ ++ ] + 1 * [ + # (incomplete support -- only TRJ, TRR, XTC, DCD so far...) + 'contrib/uiuc/plugins/molfile_plugin/src/PlugIOManagerInit.c', + 'contrib/uiuc/plugins/molfile_plugin/src/avsplugin.cpp', diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-che= mistry/pymol/files/pymol-9999-shaders.patch index 7f4a24f..853ebff 100644 --- a/sci-chemistry/pymol/files/pymol-9999-shaders.patch +++ b/sci-chemistry/pymol/files/pymol-9999-shaders.patch @@ -1,11 +1,62 @@ -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=3D[("_PYMOL_MODULE",None), - ("_PYMOL_INLINE",None), - ("_PYMOL_FREETYPE",None), -+ ("_PYMOL_OPENGL_SHADERS",None), - # Numeric Python support =20 - # ("_PYMOL_NUMPY",None), - # VMD plugin support =20 + 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 929167f..ecb4130 100644 +--- a/layer0/ShaderMgr.c ++++ b/layer0/ShaderMgr.c +@@ -386,7 +386,7 @@ int CShaderMgr_ShadersPresent(CShaderMgr * I) + 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; +=20 + PRINTFB(G, FB_ShaderMgr, FB_Debugging) + "CShaderMgr_ReadShaderFromDisk: fileName=3D'%s'\n", fileName +@@ -398,16 +398,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals = * G, const char * fileName) { + return NULL; + } + =20 +- pymol_path =3D getenv("PYMOL_PATH"); +- if (!pymol_path){ ++ 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 (%s) from disk\n", fileName ENDFB(G); ++ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot rea= d shader config files (%s) from disk\n", fileName ENDFB(G); + return NULL; + } + /* make this a setting */ +- shader_path =3D "/data/shaders/"; +- fullFile =3D malloc( sizeof(char) * (strlen(pymol_path)+strlen(shader= _path)+strlen(fileName)+1)); +- fullFile =3D strcpy(fullFile, pymol_path); ++ shader_path =3D "/shaders/"; ++ fullFile =3D malloc( sizeof(char) * (strlen(pymol_data)+strlen(shader= _path)+strlen(fileName)+1)); ++ fullFile =3D strcpy(fullFile, pymol_data); + fullFile =3D strcat(fullFile, shader_path); + fullFile =3D strcat(fullFile, fileName); +=20 +@@ -416,7 +416,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * = G, const char * fileName) { +=20 + if (!f) { + PRINTFB(G, FB_ShaderMgr, FB_Errors) +- " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_P= ATH=3D'%s'\n", fullFile, pymol_path ENDFB(G); ++ " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_D= ATA=3D'%s'\n", fullFile, pymol_data ENDFB(G); + return NULL; + } else { + PRINTFB(G, FB_ShaderMgr, FB_Blather) +diff --git a/layer1/Setting.c b/layer1/Setting.c +index 3aa0b8d..f9b5789 100644 +--- a/layer1/Setting.c ++++ b/layer1/Setting.c +@@ -3956,7 +3956,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 */ +- set_s(I, cSetting_shader_path, "data/shaders"); ++ set_s(I, cSetting_shader_path, "shaders"); + set_i(I, cSetting_volume_bit_depth, 8); + set_color(I, cSetting_volume_color, "-1"); + set_f(I, cSetting_volume_layers, 256); diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metad= ata.xml index cc50a5b..ad86c00 100644 --- a/sci-chemistry/pymol/metadata.xml +++ b/sci-chemistry/pymol/metadata.xml @@ -6,7 +6,6 @@ Pymol supprt for sci-chemistry/apbs - Enable shaders support for Pymol Enable numpy support for Pymol Builds molfile plugin support diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/= pymol-9999.ebuild index 0fda201..38477a3 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.3-r1.eb= uild,v 1.3 2010/03/23 13:54:53 fauli Exp $ +# $Header: $ =20 EAPI=3D"3" =20 @@ -11,37 +11,39 @@ PYTHON_USE_WITH=3D"tk" PYTHON_MODNAME=3D"${PN} chempy pmg_tk pmg_wx" =20 =20 -inherit eutils distutils prefix subversion - -ESVN_REPO_URI=3D"https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/p= ymol" +inherit eutils distutils prefix subversion versionator =20 DESCRIPTION=3D"A Python-extensible molecular graphics system." HOMEPAGE=3D"http://pymol.sourceforge.net/" SRC_URI=3D"" +ESVN_REPO_URI=3D"https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/p= ymol" =20 LICENSE=3D"PSF-2.2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE=3D"apbs numpy shaders vmd" +IUSE=3D"apbs numpy vmd" =20 DEPEND=3D" - dev-python/numpy - dev-python/pmw - media-libs/freetype:2 - media-libs/libpng - media-video/mpeg-tools - sys-libs/zlib - media-libs/freeglut - apbs? ( - dev-libs/maloc - sci-chemistry/apbs - sci-chemistry/pdb2pqr - sci-chemistry/pymol-apbs-plugin - )" + dev-python/numpy + dev-python/pmw + media-libs/freetype:2 + media-libs/glew + media-libs/libpng + media-video/mpeg-tools + sys-libs/zlib + media-libs/freeglut + apbs? ( + dev-libs/maloc + sci-chemistry/apbs + sci-chemistry/pdb2pqr + sci-chemistry/pymol-apbs-plugin + )" RDEPEND=3D"${DEPEND}" =20 src_prepare() { - epatch "${FILESDIR}"/${P}-data-path.patch + epatch \ + "${FILESDIR}"/${P}-data-path.patch \ + "${FILESDIR}"/${P}-shaders.patch =20 epatch "${FILESDIR}"/${P}-prefix.patch && \ eprefixify setup.py @@ -55,9 +57,7 @@ src_prepare() { -e "s:\(ext_comp_args=3D\).*:\1[]:g" \ "${S}"/setup.py || die "Failed running sed on setup.py" =20 - use shaders && epatch "${FILESDIR}"/${PN}-1.2.2-shaders.patch - - use vmd && epatch "${FILESDIR}"/1.3.0-vmd.patch + use vmd && epatch "${FILESDIR}"/${PV}-vmd.patch =20 use numpy && \ sed \