aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-08-29 17:09:01 +0200
committerJustin Lecher <jlec@gentoo.org>2011-08-29 17:09:01 +0200
commit8b78270e241be7c137bc274fc0ed20918dd616b1 (patch)
treefa3350e74ad6939e8a74519da1c0ba026d9655c7
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-8b78270e241be7c137bc274fc0ed20918dd616b1.tar.gz
sci-8b78270e241be7c137bc274fc0ed20918dd616b1.tar.bz2
sci-8b78270e241be7c137bc274fc0ed20918dd616b1.zip
Latest changes on HEAD
(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)
-rw-r--r--sci-chemistry/pymol/ChangeLog3
-rw-r--r--sci-chemistry/pymol/Manifest10
-rw-r--r--sci-chemistry/pymol/files/pymol-9999-shaders.patch2
3 files changed, 9 insertions, 6 deletions
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index e830989cf..5560aa799 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: $
+ 29 Aug 2011; Justin Lecher <jlec@gentoo.org> files/pymol-9999-shaders.patch:
+ Latest changes on HEAD
+
18 Aug 2011; Justin Lecher <jlec@gentoo.org> files/pymol-9999-prefix.patch,
files/pymol-9999-shaders.patch:
Fixed patches
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 7e5975f97..0025cc93b 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -10,14 +10,14 @@ AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de1
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-shaders.patch 2438 RMD160 180101e2222cd6c56f4095086d104fe16d06a2dd SHA1 51b01ea2c4b3335dc1f408fc1185289c8fe528f6 SHA256 0ae6d18e17743a9ea60fd4feb2bb4aee8d44dcfe0f7cc2d3dc602c32d4a39dd9
+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 8946 RMD160 31ee2d096204d6c41d855243c4de81cba3e67034 SHA1 54e8c66490eb27f10e5df2304ebd526fcada1ac1 SHA256 6a71007ecfd4fe60b27403571c5c4b1be9712596dd1201ed78c8978cc58b625e
+MISC ChangeLog 9051 RMD160 31bbc498d741e9b5b9640176f254aff9dd9dc671 SHA1 f78fac816b246d7dd8d8731b5bdd3f02d21f0c45 SHA256 107f7e505888b8f33711c261999e2d3c6897830fe9bd0c05beda9e9d7e46477d
MISC metadata.xml 421 RMD160 47f0258f6a689ca91fc0bbc10eac47e79f48606d SHA1 c833595aa7b0df3d0777188e3eacbf0c9092a1ef SHA256 9d804ad34b63d00d0afe85bd18969bd1917f96c6328eb31ac5d3a26a4e860b21
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEAREKAAYFAk5M5P4ACgkQgAnW8HDreRbjZQCgnlHBRPp6Dl/wErvUD0GuPoMT
-wbIAoIzoB7yCpzrfjN3isNBrE9B9G6Us
-=7spG
+iEYEAREKAAYFAk5bq40ACgkQgAnW8HDreRYXJgCbBcU/fgepqe3iJEvxoGylSdaq
+LHUAnRrLow/R4699UdvOnXFA8+kDIx9O
+=0OGa
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-chemistry/pymol/files/pymol-9999-shaders.patch
index 8517ebe49..f8a762c85 100644
--- a/sci-chemistry/pymol/files/pymol-9999-shaders.patch
+++ b/sci-chemistry/pymol/files/pymol-9999-shaders.patch
@@ -17,7 +17,7 @@ Index: layer0/ShaderMgr.c
- pymol_path = getenv("PYMOL_PATH");
- if (!pymol_path){
-+ pymol_path = getenv("PYMOL_DATA");
++ 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" ENDFB(G);