diff options
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/ccp4-apps/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/Manifest | 18 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild | 12 |
3 files changed, 23 insertions, 15 deletions
diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog index 03a2bf3317c7..d28babcaa2b8 100644 --- a/sci-chemistry/ccp4-apps/ChangeLog +++ b/sci-chemistry/ccp4-apps/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/ccp4-apps -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.33 2011/10/16 12:27:52 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.34 2012/04/03 19:07:06 jlec Exp $ + + 03 Apr 2012; Justin Lecher <jlec@gentoo.org> ccp4-apps-6.1.3-r10.ebuild: + fix for some unknown issue resulting in #406337, thanks Andreas Schürch for + the initial idea of the fix 16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> ccp4-apps-6.1.3-r10.ebuild: diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest index 4a5206c004dc..546f595ce60e 100644 --- a/sci-chemistry/ccp4-apps/Manifest +++ b/sci-chemistry/ccp4-apps/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 6.1.3-clipper-template.patch 2619 RMD160 a3a4998365c4e516325cf95472e8493729ee4b46 SHA1 f3d92469ac5ec4483818abbf50c32ac9b05a622c SHA256 a185a93f76c23ce06256866cfaf0e9854a5702b95a1e49e4d3a5f732e0d1e2a3 AUX 6.1.3-dont-build-balbes.patch 489 RMD160 7ee9ad48afcd6dd261277321be681bb41ce73fbb SHA1 56f045d3ec8dbf4e0c83dc9df2ac478bd4c5268c SHA256 dfe1b810fb07bf536528b9c955e3162dc470a803513ae6fa69848ed6d64503c4 @@ -19,18 +19,14 @@ AUX 6.1.3-rename-rapper-ng.patch 2241 RMD160 63cda7686f10316f2a9d0a12346de9d41c9 AUX 6.1.3-unbundle.patch 5736 RMD160 5e1416c26a6ddb61f5d3aaa7a5d199dfdc6112ba SHA1 985e5e84d01329d7671a63d030337d77cc7a4bb7 SHA256 1d50917bdd3733d099cf64df651c8743ab40ce1ea19416bfacf806e324b2bea2 DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f87 SHA1 7667aca14d28cec01bfa7d2eee9cbce11624f4fa SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 -EBUILD ccp4-apps-6.1.3-r10.ebuild 9893 RMD160 3d765a4c71bfdd870731720a95c952f0fe9f4259 SHA1 566069551d7b9e9579179c694552aaa31bece7c7 SHA256 c834084019b6698a417a149c11bb99c75280dbb82cf6957f6ecf4c0d8f9871b1 +EBUILD ccp4-apps-6.1.3-r10.ebuild 10142 RMD160 dab39fc5ccb24d0d67406b8afeaafe07f9f5f859 SHA1 364cf5285c157f94650d4f9cec852f6742bdc71a SHA256 4d22acce011e4955a81324cb5a2b52f48f00652b43c4d67a9a85867f84888d5c EBUILD ccp4-apps-6.1.3-r9.ebuild 9709 RMD160 800f53f92d8121ec14a59af808b5ae2b11228fc8 SHA1 41d5fd1fd5a9871e2d4b8d5aee6518aff0d63eca SHA256 5586dc2cc34f8d5ef997d77c474ef6d18f62f07e1513fc1aa5f3c57154a806cf -MISC ChangeLog 6231 RMD160 50d0ae827c33b24935a6279147836cadc7ae6ef0 SHA1 0a2544cc2b6cc81a5461b3d7d7970581752d43f8 SHA256 aade4d862327e0c9fe120d35d985f9f5565c17f15048aaa98da19b2ae3953a54 +MISC ChangeLog 6411 RMD160 e96fe792d35c0db8fb6c6c04bcc7440523b349a4 SHA1 954879ac5999fb13bbca99b84659ddba7e5dd2cb SHA256 3fa2adae4274d74c81ae011f9d217270374f000d89f089a942ea79a14c08403a MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJOms2/AAoJEEdUh39IaPFN4gkH/j1wHlHWkedJo/yFEAncrFk5 -awhBvVpRQ7898oW+0LvbUbw5DuROnz8AKmf/3yzaGpNmZLN1DxCG9NeA98HQEsHH -uKQNYZFfwHHWip8xJXHIeMG7oqnB8MTkQlKs5PHbuEZmwJGTC5zYqg4Rmex4ohSb -FY7W3aosUiDTg0NFHi/VI+xAnmmehoewnU+x6Sfu5mYQfH8heIVkBZvcntJ4BGbD -qM4OZqOMK7FUK5i4kWtNS5s8JIa1cRi3sJFtpmGqfS2Cktz+/Emp/kTFsY/60K8J -i0RlJWwZlJ1ElLcT4UcMrBuoFBZuMSPPo/3rTxgm2YHUAjOXWZRGK2D4mo6SniM= -=4wLr +iEYEAREKAAYFAk97SmAACgkQgAnW8HDreRaX/QCff4dDEdAOiL9u37GERi4ERbQ7 +6CAAmQHNkam8+/lelgNIHSZ3ecyrknhz +=D7i5 -----END PGP SIGNATURE----- diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild index bd374dc3fb0b..647dbb8ceaea 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.6 2011/10/16 12:27:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.7 2012/04/03 19:07:06 jlec Exp $ EAPI=3 @@ -169,8 +169,16 @@ src_prepare() { -e 's: -rpath $CLIB::g' \ -e 's: -I${srcdir}/include/cpp_c_headers::g' \ -e 's:sleep 1:sleep .2:g' \ + -e 's:\\$(XCIF_LIB):-L$srcdir/lib/ccif -lccif:g' \ + -e 's:\\$(XLAPACK_LIB):${XLAPACK_LIB}:g' \ + -e 's:\\$(CXX_LIBS):\${CXX_LIBS}:g' \ + -e 's:\\$(XLDFLAGS):\${XLDFLAGS}:g' \ -i configure || die + sed \ + -e '/o crunch2/s:$: ${XLAPACK_LIB}:g' \ + -i src/Makefile* || die + find "${S}" -name "Makefile.*" \ -exec sed -e 's|_FLAGS-|_FLAGS:-|g' -e "s:\(eval \$([[:alnum:]]*)\):\1 \$(GENTOOLDFLAGS):g" -i '{}' \; |