aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-12-05 17:58:47 +0100
committerJustin Lecher <jlec@gentoo.org>2011-12-05 17:58:47 +0100
commit812ffb36524400002afd40fc6c2f12b4822ec8e9 (patch)
tree3e3b93ec923f57d1c6d80e8dea272f7946711534 /sci-chemistry/pymol
parentsci-physics/root: fix afs patch (diff)
downloadsci-812ffb36524400002afd40fc6c2f12b4822ec8e9.tar.gz
sci-812ffb36524400002afd40fc6c2f12b4822ec8e9.tar.bz2
sci-812ffb36524400002afd40fc6c2f12b4822ec8e9.zip
Fix pymol-9999-setup.py.patch for current HEAD
(Portage version: 2.2.0_alpha79/git/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-chemistry/pymol')
-rw-r--r--sci-chemistry/pymol/ChangeLog3
-rw-r--r--sci-chemistry/pymol/Manifest10
-rw-r--r--sci-chemistry/pymol/files/pymol-9999-setup.py.patch17
3 files changed, 15 insertions, 15 deletions
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 5560aa799..0a9b65eac 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Dec 2011; Justin Lecher <jlec@gentoo.org> files/pymol-9999-setup.py.patch:
+ Fix pymol-9999-setup.py.patch for current HEAD
+
29 Aug 2011; Justin Lecher <jlec@gentoo.org> files/pymol-9999-shaders.patch:
Latest changes on HEAD
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 0025cc93b..cd001bc4b 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -9,15 +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 1427 RMD160 061fd51b5e47de3ca1884f8adbcc7c9eae1218ec SHA1 6d4a1725f23272e7929a0fd40553c62b6e72fa2f SHA256 aadf448fb5f97c19a309f4bde083b5c83174941aa18765e22e89d7de48f61d32
-AUX pymol-9999-setup.py.patch 749 RMD160 e041e224e44eaf5e82262d2f782742087f4e89f1 SHA1 6cb0c06b09657da391f5a94092781502a2fdfb7b SHA256 232afaac87db6980ab6b1e8b05315bd2bf129e16ad579757695ae7fae0fdfb62
+AUX pymol-9999-setup.py.patch 669 RMD160 463d6e40922510c397e540314dccc0f182cde2d1 SHA1 36861f703bfb524c4737c8805cc42878530335b3 SHA256 6ed5a12afe4fbc34013f72acd45211f3a3726924457ea605e979c53608325bfb
AUX pymol-9999-shaders.patch 2438 RMD160 13ca55998a1709e24920e01becad477b37e17b14 SHA1 418efb480f5427581cde3e557c9f80e11e99ab43 SHA256 58399ddfee1819304623971d5d620548e706d5ac564132071967905a3a90be7b
EBUILD pymol-9999.ebuild 2439 RMD160 97e45cacf354183545ed063046445e6067d39867 SHA1 50f1ac1da012dea7c3fd4d78f193cfc1c44e793e SHA256 62da9356a9077815ad0be788df81c6f56b60a3194dd68ff79cbc9da3c65b2ecb
-MISC ChangeLog 9051 RMD160 31bbc498d741e9b5b9640176f254aff9dd9dc671 SHA1 f78fac816b246d7dd8d8731b5bdd3f02d21f0c45 SHA256 107f7e505888b8f33711c261999e2d3c6897830fe9bd0c05beda9e9d7e46477d
+MISC ChangeLog 9181 RMD160 8fa70bbbc94fc1facdae27b4a3d17f7a67a1c708 SHA1 dce031e3777a551e49e6517d92710bd777532808 SHA256 f27f8427c8404ee5a30b85a09d370795dd1f63fbb110e28a650a1bac59608f26
MISC metadata.xml 421 RMD160 47f0258f6a689ca91fc0bbc10eac47e79f48606d SHA1 c833595aa7b0df3d0777188e3eacbf0c9092a1ef SHA256 9d804ad34b63d00d0afe85bd18969bd1917f96c6328eb31ac5d3a26a4e860b21
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEAREKAAYFAk5bq40ACgkQgAnW8HDreRYXJgCbBcU/fgepqe3iJEvxoGylSdaq
-LHUAnRrLow/R4699UdvOnXFA8+kDIx9O
-=0OGa
+iEYEAREKAAYFAk7c+EcACgkQgAnW8HDreRaN8ACgs1xKOKrFVDwV9rrYWTANLKl4
+74AAoLOxWz/qAlFkkH13nzlq+1DoVyto
+=LW3u
-----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
index 1267b967c..01efe301b 100644
--- a/sci-chemistry/pymol/files/pymol-9999-setup.py.patch
+++ b/sci-chemistry/pymol/files/pymol-9999-setup.py.patch
@@ -1,20 +1,17 @@
- 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
+Index: setup.py
+===================================================================
+--- setup.py (revision 3972)
++++ setup.py (working copy)
+@@ -156,7 +156,7 @@
# ("_PYMOL_VMD_PLUGINS",None)
("NO_MMLIBS",None),
]
-- ext_comp_args=["-ffast-math","-funroll-loops","-O3"]
+- ext_comp_args=["-ffast-math","-funroll-loops","-O3","-g"]
+ ext_comp_args=[]
ext_link_args=[]
setup ( # Distribution meta-data
-@@ -174,6 +174,7 @@ setup ( # Distribution meta-data
+@@ -174,6 +174,7 @@
'pmg_tk/skins',
'pmg_tk/skins/normal',
'pmg_wx',