summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/ccp4-libs/ChangeLog5
-rw-r--r--sci-libs/ccp4-libs/Manifest15
-rw-r--r--sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild9
3 files changed, 20 insertions, 9 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 4e6f49dff32a..5c680e6d7e35 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/ccp4-libs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.47 2012/05/21 19:26:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.48 2012/05/29 17:43:13 jlec Exp $
+
+ 29 May 2012; Justin Lecher <jlec@gentoo.org> ccp4-libs-6.1.3-r11.ebuild:
+ Drop la files
21 May 2012; Brent Baude <ranger@gentoo.org> ccp4-libs-6.1.3-r11.ebuild:
Marking ccp4-libs-6.1.3-r11 ppc for bug 413815
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index 8170f92d982f..4d6cf99a3e20 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX 6.0.2-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0dacea4ae2234 SHA1 209fa1bdf1e59b4055177e343b69e487d9183fb3 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61
AUX 6.1.3-cbf.patch 773 RMD160 02cefee32763fd4e9e58b7cd7ba96655bbc40374 SHA1 0ba77801413f89bc12b62e09799da97aaf1eba0b SHA256 767a2286956471c6dbf0feee9a5726f5170af21cb2dd85c7f45190cab5cce7a0
AUX 6.1.3-ccif-shared.patch 1668 RMD160 803687b13dbe93aaeed8264a73dfe7303b5fcdfb SHA1 3d833aefea874c08e61140613b0a5c75a90e0382 SHA256 57c201ee81e3fd95f174fecfd810ddf12509f0c2bfb1b2f317f893561eb60e3f
@@ -14,6 +17,14 @@ AUX 6.1.3-unbundle-libs-ng2.patch 15485 RMD160 c4b07251ee584fbc66342cd97f15185eb
AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4
DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
EBUILD ccp4-libs-6.1.3-r10.ebuild 10930 RMD160 3fc3edb1f601da0331706839c7e4291567949d6f SHA1 8192b6cd380f86e1e06a87c0d27e9abcdee33610 SHA256 e4ae54450af38fb2712ba47c3f8c4af4fc283806a3f47f9b96baec3339ffc6b8
-EBUILD ccp4-libs-6.1.3-r11.ebuild 11021 RMD160 7717d9587c63d23598f0bfc9ae1de0840692a40c SHA1 ffc2fb127da1da21d8068b484bc368329cb2670d SHA256 e74bb8904f855050b6530d3dafb3a81aff227b9ed32ea7976ca274dd706188bf
-MISC ChangeLog 7055 RMD160 33be444ecb3db4e4c8632345455cacb14eafe44b SHA1 8b905ba18322fc29278438c4aa855e530181a0c6 SHA256 04f2884e73001429ab34b25853b037c71232addd3fdfb25b96edc02da6e0dd98
+EBUILD ccp4-libs-6.1.3-r11.ebuild 10919 RMD160 6a6e9d74f2e9d5ac2c6ad35794cbf462a264f450 SHA1 58d4b060b55202a0a7866ba156f4c998d7dc0445 SHA256 533d1b5679080d3c07569aa6ecf923654068640da3e1b26dd2959568efcde258
+MISC ChangeLog 7145 RMD160 3653398cd1624c800446161af00ea94795e26da2 SHA1 d0055179dec7057e62e63829c183c66f1bf6ac1d SHA256 53190672f9ad9fb1eb283a8dcf23c0bd1dc068f485430f7d2bf4d6c9db6bd0c0
MISC metadata.xml 265 RMD160 3147f5f0ce8982e3376bf6f833ee76e01409d813 SHA1 207dd5e946f2f945fbeb9059a945cb9fca736856 SHA256 6206181a1050a92258360204c836a620d6f016d552a4d829b3007242ee0d294f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/FCrcACgkQgAnW8HDreRY5EQCeN7L5fAPwXtZYgSdNwQU2/2rH
+fMsAoLbWPLd8OvEzk62YaPCZU37vVewj
+=Yc5M
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
index 1d3f97757d0b..3aa79127002f 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.4 2012/05/21 19:26:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.5 2012/05/29 17:43:13 jlec Exp $
EAPI=3
@@ -299,6 +299,8 @@ src_install() {
fi
done
+ rm -f "${ED}"/usr/$(get_libdir)/*.la || die
+
sed \
-e 's:test "LD_LIBRARY_PATH":test "$LD_LIBRARY_PATH":g' \
-i "${S}"/include/ccp4.setup-sh || die
@@ -309,11 +311,6 @@ src_install() {
newins "${S}"/include/ccp4.setup-sh 40ccp4.setup.sh || die
rm -f "${S}"/include/ccp4.setup*
- # Fix libdir in all *.la files
- sed -i \
- -e "s:^\(libdir=\).*:\1\'${EPREFIX}/usr/$(get_libdir)\':g" \
- "${ED}"/usr/$(get_libdir)/*.la || die
-
# Data
insinto /usr/share/ccp4/data/
doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die