| 1 |
jlec 10/02/18 13:23:50 |
| 2 |
|
| 3 |
Added: 1.2.2-prefix.patch |
| 4 |
Log: |
| 5 |
Fixed usage of pathon eclass, EAPI=3 and PREFIX ready fixes, keyworded for amd64-linux & x86-linux |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/pymol/files/1.2.2-prefix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.2-prefix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.2-prefix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 1.2.2-prefix.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/setup.py b/setup.py |
| 17 |
index 197f827..b39c129 100644 |
| 18 |
--- a/setup.py |
| 19 |
+++ b/setup.py |
| 20 |
@@ -112,7 +112,7 @@ elif sys.platform=='darwin': |
| 21 |
] |
| 22 |
ext_comp_args=[] |
| 23 |
ext_link_args=[ |
| 24 |
- "-L/usr/X11R6/lib", "-lGL", "-lXxf86vm", |
| 25 |
+ "-L@GENTOO_PORTAGE_EPREFIX@/usr/lib", "-lGL", "-lXxf86vm", |
| 26 |
"-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype" |
| 27 |
] |
| 28 |
#============================================================================ |
| 29 |
@@ -120,7 +120,7 @@ else: # linux or other unix |
| 30 |
inc_dirs=["ov/src", |
| 31 |
"layer0","layer1","layer2", |
| 32 |
"layer3","layer4","layer5", |
| 33 |
- "/usr/include/freetype2", |
| 34 |
+ "@GENTOO_PORTAGE_EPREFIX@/usr/include/freetype2", |
| 35 |
# "/users/warren/ext/include", |
| 36 |
# VMD plugin support |
| 37 |
# "contrib/uiuc/plugins/include", |
| 38 |
@@ -131,7 +131,7 @@ else: # linux or other unix |
| 39 |
] |
| 40 |
pyogl_libs = ["GL","GLU","glut"] |
| 41 |
lib_dirs=[ |
| 42 |
- "/usr/X11R6/lib", |
| 43 |
+ "@GENTOO_PORTAGE_EPREFIX@/usr/lib", |
| 44 |
# "/users/warren/pymol/ext/lib" |
| 45 |
] |
| 46 |
def_macros=[("_PYMOL_MODULE",None), |
Archives