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)

6 files changed, 69 insertions, 39 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index e3f6e081c..b0071114e 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: $
 
+  22 Jul 2011; Justin Lecher <jlec@gentoo.org> 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 <jlec@gentoo.org> +files/9999-web.patch,
   pymol-9999.ebuild, metadata.xml:
   Fix collision with dev-python/webpy, #368947
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 24af34ec1..73814507d 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.3.0-vmd.patch 1286 RMD160 3587dbf9664747de1d10ad0039773ef9451f7488 SHA1 79dd6e0881edb905b5e098646e1de40224bcf6a6 SHA256 79f13530928bf00b6469a6fe473d1e743e22b25edd2a4ad6d53762ccac9ff318
 AUX 9999-vmd.patch 1414 RMD160 c7de92c73a0f91e6f95a7208b912cb6105f6d972 SHA1 51515e11cbaed06407238c0e900091174db1ff26 SHA256 320436783d1cfa4f94bd4fe57af4bdf7d3d200c951938d127d77b75d77bef7f0
@@ -9,14 +9,15 @@ AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c83
 AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de16 SHA1 5651438459920b74040330ec0b7d9ea14e63818c SHA256 c15e5c5d2a6b53b96c6a7fe0b717ac0f7d85c90aca3e5b02c8d8c34b9038cb68
 AUX pymol-9999-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
 AUX pymol-9999-prefix.patch 1183 RMD160 25a3e3fb1639e0c5cc93928b4fcba412a3e9b371 SHA1 3c61c3552a579a48883c61b646f05ce1f059744e SHA256 35b14c60163517debfdeae52b3be00bc0fc6ab96c58d2bf3efb65e22728522d4
-AUX pymol-9999-shaders.patch 2507 RMD160 2dea0805fcc8a993d7f5fa8668257be860c7d5e8 SHA1 4548f93fbe92a511dc0d2425c86402a776567cb4 SHA256 b0cbb5bc81bb8f85bef8cbb6cd76f91b02b076ef5798075e152626becf3b5ae5
-EBUILD pymol-9999.ebuild 2526 RMD160 cdb42c39304cb1e7ca73def85fc2d4d5a1e26ba9 SHA1 55664aeede4145ab9d3aeeb7b75624a811f96e10 SHA256 3124a3a90289923e8d547b01cff91463458bfd6d45cf39fefa5685a52cddbaa9
-MISC ChangeLog 8604 RMD160 d085a62a6690f5aa7eabc496aafdd96b5b4083b0 SHA1 b47fdc5ef58d8a5ebba1db7ba2095e612aa2f9d6 SHA256 3c4f6b370b0a42f0a2404fc98ffea677494ba4dec4f2b5846a205a23de418d32
-MISC metadata.xml 412 RMD160 dba8c0b7439c44e31e3e05207272c6e46c8fc0c3 SHA1 7eb3a638d6c1d7b05345af61d50e4a6caf0dfe42 SHA256 0b991b292dc1b6c0abd145e78db118e4705d81195b1b48d5d485f5b0709e48a7
+AUX pymol-9999-setup.py.patch 749 RMD160 e041e224e44eaf5e82262d2f782742087f4e89f1 SHA1 6cb0c06b09657da391f5a94092781502a2fdfb7b SHA256 232afaac87db6980ab6b1e8b05315bd2bf129e16ad579757695ae7fae0fdfb62
+AUX pymol-9999-shaders.patch 2821 RMD160 5f0dc87ab80dcc9be8b3f1570ec5aa0e0c835cf0 SHA1 46890d9d8f1514d9325fd74a593d077b65310ea6 SHA256 7f3d949fc88b43bada790de7ce8ad7163096d798b31c8867af3518dd46285373
+EBUILD pymol-9999.ebuild 2439 RMD160 97e45cacf354183545ed063046445e6067d39867 SHA1 50f1ac1da012dea7c3fd4d78f193cfc1c44e793e SHA256 62da9356a9077815ad0be788df81c6f56b60a3194dd68ff79cbc9da3c65b2ecb
+MISC ChangeLog 8817 RMD160 e3144d06205781a7efb7895f49ee42b9f10df405 SHA1 e3b17d2bd4472d3ebacfb844fee1e402976e415a SHA256 0088a2dabab0f8c34c8970482cebe22d7166f45a5dd8a182e63bb805a677bb3e
+MISC metadata.xml 421 RMD160 47f0258f6a689ca91fc0bbc10eac47e79f48606d SHA1 c833595aa7b0df3d0777188e3eacbf0c9092a1ef SHA256 9d804ad34b63d00d0afe85bd18969bd1917f96c6328eb31ac5d3a26a4e860b21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4Ei8IACgkQgAnW8HDreRZ+PQCdGu/AcF7jG2GUrLwQjdOZWBxn
-w2kAn0na/71UEt2vB5DqpIuqCeVY9OYE
-=ngk/
+iEYEAREKAAYFAk4pJGwACgkQgAnW8HDreRYaXACfeUcNfVrCxjqBsPO6X+OPTxFB
+nv8AoLwkycWGgbb5eL/txTlB1YoUenD1
+=diS+
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/pymol-9999-setup.py.patch b/sci-chemistry/pymol/files/pymol-9999-setup.py.patch
new file mode 100644
index 000000000..1267b967c
--- /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=["-ffast-math","-funroll-loops","-O3"]
++    ext_comp_args=[]
+     ext_link_args=[]
+   
+ setup ( # Distribution meta-data
+@@ -174,6 +174,7 @@ setup ( # Distribution meta-data
+                 'pmg_tk/skins',
+                 'pmg_tk/skins/normal',                    
+                 'pmg_wx',
++                'pymol2',
+                 'pymol',
+                 'pymol/contrib',                
+                 'pymol/opengl',
diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-chemistry/pymol/files/pymol-9999-shaders.patch
index 2caac2dc4..a20bfe319 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
-===================================================================
---- 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 * fileName) {
    FILE* f;
    long size;
@@ -11,7 +15,7 @@ Index: layer0/ShaderMgr.c
  
    PRINTFB(G, FB_ShaderMgr, FB_Debugging)
      "CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName
-@@ -412,16 +412,16 @@
+@@ -428,16 +428,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) {
      return NULL;
    }
    
@@ -20,8 +24,8 @@ Index: layer0/ShaderMgr.c
 +  pymol_data = getenv("PYMOL_DATA");
 +  if (!pymol_data){
      PRINTFB(G, FB_ShaderMgr, FB_Warnings)
--      " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n", fileName ENDFB(G);
-+      " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n", fileName ENDFB(G);
+-      " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n" ENDFB(G);
++      " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n" ENDFB(G);
      return NULL;
    }
    /* make this a setting */
@@ -34,7 +38,7 @@ Index: layer0/ShaderMgr.c
    fullFile = strcat(fullFile, shader_path);
    fullFile = strcat(fullFile, fileName);
  
-@@ -430,7 +430,7 @@
+@@ -446,7 +446,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) {
  
    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
-===================================================================
---- 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 optimized shaders present; doesn't effect vol */
diff --git a/sci-chemistry/pymol/metadata.xml b/sci-chemistry/pymol/metadata.xml
index 58b73caef..1a70ddcdf 100644
--- a/sci-chemistry/pymol/metadata.xml
+++ b/sci-chemistry/pymol/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='apbs'>Pymol supprt for sci-chemistry/apbs</flag>
-	<flag name='numpy'>Enable numpy support for Pymol</flag>
-	<flag name='vmd'>Builds molfile plugin support</flag>
-	<flag name="web">Install Pymodule needed for web app support</flag>
-</use>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="apbs">Pymol supprt for sci-chemistry/apbs</flag>
+		<flag name="numpy">Enable numpy support for Pymol</flag>
+		<flag name="vmd">Builds molfile plugin support</flag>
+		<flag name="web">Install Pymodule needed for web app support</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 62a7a60b7..edfdbf28a 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -43,22 +43,18 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-data-path.patch \
-		"${FILESDIR}"/${P}-shaders.patch
+		"${FILESDIR}"/${P}-shaders.patch \
+		"${FILESDIR}"/${P}-setup.py.patch
 
 	use web || epatch "${FILESDIR}"/${PV}-web.patch
 
 	epatch "${FILESDIR}"/${P}-prefix.patch && \
-	eprefixify setup.py
+		eprefixify setup.py
 
 	# Turn off splash screen.  Please do make a project contribution
 	# if you are able though. #299020
 	epatch "${FILESDIR}"/nosplash-gentoo.patch
 
-	# Respect CFLAGS
-	sed -i \
-		-e "s:\(ext_comp_args=\).*:\1[]:g" \
-		"${S}"/setup.py || die "Failed running sed on setup.py"
-
 	use vmd && epatch "${FILESDIR}"/${PV}-vmd.patch
 
 	use numpy && \