summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2010-10-20 13:33:10 +0000
committerJeremy Olexa <darkside@gentoo.org>2010-10-20 13:33:10 +0000
commitf145481df2bb030f42010bae1c8eda3646bcb2d7 (patch)
tree91aa27ea30f5b080957e473c4032787aa603a1f5 /sci-libs
parentFix building with Linux >= 2.6.35 wrt #330919 by Pavlo Lavrenenko. (diff)
downloadhistorical-f145481df2bb030f42010bae1c8eda3646bcb2d7.tar.gz
historical-f145481df2bb030f42010bae1c8eda3646bcb2d7.tar.bz2
historical-f145481df2bb030f42010bae1c8eda3646bcb2d7.zip
Fix for Gentoo Prefix, bug 341811 by Johan Hattne
Package-Manager: portage-2.1.9.12/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/ccp4-libs/ChangeLog5
-rw-r--r--sci-libs/ccp4-libs/Manifest16
-rw-r--r--sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild6
3 files changed, 9 insertions, 18 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index a4ff4fa0ed12..d3bec06834d5 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.13 2010/10/04 17:02:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.14 2010/10/20 13:33:10 darkside Exp $
+
+ 20 Oct 2010; Jeremy Olexa <darkside@gentoo.org> ccp4-libs-6.1.3-r4.ebuild:
+ Fix for Gentoo Prefix, bug 341811 by Johan Hattne
*ccp4-libs-6.1.3-r4 (04 Oct 2010)
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index 65e165cdd45e..0279617db940 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 6.0.2-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0dacea4ae2234 SHA1 209fa1bdf1e59b4055177e343b69e487d9183fb3 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61
AUX 6.1.3-ccif-shared.patch 1668 RMD160 803687b13dbe93aaeed8264a73dfe7303b5fcdfb SHA1 3d833aefea874c08e61140613b0a5c75a90e0382 SHA256 57c201ee81e3fd95f174fecfd810ddf12509f0c2bfb1b2f317f893561eb60e3f
AUX 6.1.3-dont-build-mmdb.patch 749 RMD160 2f4b04d07095d464f00522a935cb93c2dae40f4c SHA1 5b82f59ce190cb82601b7af55083b1a5689c9ae0 SHA256 cf73ff7c361ba7ed3e3084a4c298a1e45307a8b0ac7e2704628f3e0f345a9bde
@@ -12,15 +9,6 @@ AUX 6.1.3-overflows.patch 904 RMD160 03d5f10e901734c6e21be3e68592711450df32cd SH
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-r3.ebuild 6485 RMD160 5ab8a0698a199249f37ab9fb611126c21be49d88 SHA1 80d50bcc94effe3669c14798bd4925edc0911c1e SHA256 141cb4b230b18d8e0ecb583a3620fc0d678a3a40f3ba666fd2e265e7171270b1
-EBUILD ccp4-libs-6.1.3-r4.ebuild 6578 RMD160 d168c493511c97136f9a247896c37fc42d1287cd SHA1 8ebe838a59aed6425b66adb9eace39fa9abd38c8 SHA256 6f7d6a62b6d09e831963da44801a5e3a670d19aca576b4a7c04e5399a1be6b4b
-MISC ChangeLog 2315 RMD160 e680bae0787dc934fc6daf2fccd3592da4788d92 SHA1 d82f822df178eb48ef5343525e9a829627f95a87 SHA256 cf37cdb3e4b7b5025ae5dfc8cac9fcb282c6ee56ea722452b858820466f1754b
+EBUILD ccp4-libs-6.1.3-r4.ebuild 6574 RMD160 f41a8703fd16b47eef814226d7c569636f879f7e SHA1 9f4157ce36737b4355cdfc43e5ab234982b35d72 SHA256 7a0dc0313ccc303f1626319f4205f154b5ce418ebadceeeee169800dacf13efa
+MISC ChangeLog 2443 RMD160 4bcc9190d5a912149bc969147f68317c565f8704 SHA1 3f39e46703b8cfd2ec3ccd514fb9c6c880a59579 SHA256 eefbef067f812ba6873ca0b27c579bb8683379a255a059ff424fa683a04b8271
MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkyqCJoACgkQIiMqcbOVdxTNIwQAggHdHTnIQPxUEdbY6rr1Fd2g
-bjDe/6FyW4aZzjrwyFJ3kCMlIHqlwrhPYIngUH+PB8rP6RhwPWmYHMBMgsIL+A8X
-2UAnBPhVlY8dAEH7fw+rbmSaw1FxtLMa8Ci4ckCPC9UnuI1BtCrCfIrBOLPhXGic
-DgdN9sIDVeMWKAGFf28=
-=4ywG
------END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild
index 52d48d9be57c..2e7f243f20c1 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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-r4.ebuild,v 1.1 2010/10/04 17:02:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r4.ebuild,v 1.2 2010/10/20 13:33:10 darkside Exp $
EAPI="3"
@@ -189,7 +189,7 @@ src_configure() {
src_compile() {
emake -j1 \
- DESTDIR="${ED}" onlylib || die "emake failed"
+ DESTDIR="${D}" onlylib || die "emake failed"
}
src_install() {
@@ -197,7 +197,7 @@ src_install() {
source "${S}"/include/ccp4.setup
emake -j1 \
- DESTDIR="${ED}" \
+ DESTDIR="${D}" \
includedir="${EPREFIX}"/usr/include \
library_includedir="${EPREFIX}"/usr/include \
install || die