Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/pymol/files: pymol-1.2.2-vmd.patch
Date: Mon, 01 Feb 2010 21:49:04
Message-Id: E1Nc48g-0000G6-DM@stork.gentoo.org
1 jlec 10/02/01 21:48:58
2
3 Added: pymol-1.2.2-vmd.patch
4 Log:
5 vmd and numpy added to IUSE
6 apbs plugin support now depends on sci-chemistry/pymol-apbs-plugin
7 (Portage version: 2.2_rc62/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-chemistry/pymol/files/pymol-1.2.2-vmd.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/pymol-1.2.2-vmd.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/pymol-1.2.2-vmd.patch?rev=1.1&content-type=text/plain
14
15 Index: pymol-1.2.2-vmd.patch
16 ===================================================================
17 Index: setup.py
18 ===================================================================
19 --- setup.py (revision 3887)
20 +++ setup.py (working copy)
21 @@ -123,8 +123,8 @@
22 "/usr/include/freetype2",
23 # "/users/warren/ext/include",
24 # VMD plugin support
25 -# "contrib/uiuc/plugins/include",
26 -# "contrib/uiuc/plugins/molfile_plugin/src",
27 + "contrib/uiuc/plugins/include",
28 + "contrib/uiuc/plugins/molfile_plugin/src",
29 ]
30 libs=["GL","GLU","glut","png","z","freetype",
31 # "Xxf86vm"
32 @@ -143,7 +143,7 @@
33 # Numeric Python support
34 # ("_PYMOL_NUMPY",None),
35 # VMD plugin support
36 -# ("_PYMOL_VMD_PLUGINS",None)
37 + ("_PYMOL_VMD_PLUGINS",None)
38 ]
39 ext_comp_args=["-ffast-math","-funroll-loops","-O3"]
40 ext_link_args=[]
41 @@ -290,7 +290,7 @@
42 "layer5/main.c"
43 # VMD plugin support
44 # switch the 0 to 1 to activate the additional source code
45 - ] + 0 * [
46 + ] + 1 * [
47 # (incomplete support -- only TRJ, TRR, XTC, DCD so far...)
48 'contrib/uiuc/plugins/molfile_plugin/src/PlugIOManagerInit.c',
49 'contrib/uiuc/plugins/molfile_plugin/src/avsplugin.cpp',