summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-03-14 15:51:46 +0000
committerJustin Lecher <jlec@gentoo.org>2011-03-14 15:51:46 +0000
commitf16de7e711acf534be635a6d929c7d235dd807b0 (patch)
tree79f7a24b3e0ed2164c18091e14d929a7b2080f89 /sci-libs/ccp4-libs
parentwhitespace (diff)
downloadhistorical-f16de7e711acf534be635a6d929c7d235dd807b0.tar.gz
historical-f16de7e711acf534be635a6d929c7d235dd807b0.tar.bz2
historical-f16de7e711acf534be635a6d929c7d235dd807b0.zip
Check for mmdb through pkg-config
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/ccp4-libs')
-rw-r--r--sci-libs/ccp4-libs/ChangeLog5
-rw-r--r--sci-libs/ccp4-libs/Manifest10
-rw-r--r--sci-libs/ccp4-libs/ccp4-libs-6.1.3-r9.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 176ddada9486..a288f382655c 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.31 2011/03/04 13:49:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.32 2011/03/14 15:51:46 jlec Exp $
+
+ 14 Mar 2011; Justin Lecher <jlec@gentoo.org> ccp4-libs-6.1.3-r9.ebuild:
+ Check for mmdb through pkg-config
*ccp4-libs-6.1.3-r9 (04 Mar 2011)
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index e999dc166fb8..4826e1db53cd 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -14,13 +14,13 @@ AUX 6.1.3-unbundle-libs-ng.patch 13925 RMD160 eb96be062a507906f2e1d2659db0663ef0
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-r8.ebuild 10816 RMD160 f001019f12ffbbf1e4a8448504a8eac347e759de SHA1 0f8c8618f0f66dde8c86aa2d08cf696ec91bc18c SHA256 1f3f02adb2882f9b22344529df443f94c2a803dc3756914b6a713fc41d2bb237
-EBUILD ccp4-libs-6.1.3-r9.ebuild 11121 RMD160 fe228f541f6c5f07f03a0fb606231304da5c1754 SHA1 75db2f0328eeb37fd05c3c7ce602342c46865fa7 SHA256 303daeada1c3470151692d8d6dbccee3b6e2148cd6ac1760623284877b5cafca
-MISC ChangeLog 4803 RMD160 7a71cb37e70c60669b53e297dd6f1f9723f7b314 SHA1 3bd3fda8711fad83a7017ad9e591a071fa9ae3b5 SHA256 3f7d3d21bfcf3ca0a831af5858d3d8d705f59ca2e4f19f628ceb3e9927f50e65
+EBUILD ccp4-libs-6.1.3-r9.ebuild 11140 RMD160 5fd4beefbeaea3aee1898d4efaa5e2870ddba3fe SHA1 2e20737c4e326bce7c26f40b1424f9169c95f69a SHA256 00d481c1602ca83e7f3b82fb2ff047a934e8252719b089adfd853de26bdd0297
+MISC ChangeLog 4914 RMD160 02735578e0d2466b457f4950897d332c3d7398bc SHA1 4c73132d3d0758b96cdcf4292a27430d1f37e760 SHA256 5d7878db56825279c92c0f5031ca5482df265c247fc4898226b4000070b59cce
MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1w7e8ACgkQgAnW8HDreRZxtgCgoAEr0WgVYk8y2F4+oAB1tKJT
-jYYAoJkAwnbe6/uIG6aVGAFB0rf8M0KV
-=YuQw
+iEYEARECAAYFAk1+OZcACgkQgAnW8HDreRZ/zgCfWV5ZzNelaiQ5bID3qC72IPAp
+O1cAn1z+WJmJlUDoqWW/c9KZvsq8YS0x
+=yzQ3
-----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r9.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r9.ebuild
index be7f6fc66f5e..acde634e5e45 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r9.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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-r9.ebuild,v 1.1 2011/03/04 13:49:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r9.ebuild,v 1.2 2011/03/14 15:51:46 jlec Exp $
EAPI="3"
@@ -192,7 +192,7 @@ src_configure() {
# $(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm -lstdc++ && \
export SHARE_LIB="\
$(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L../ccif/ -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
- $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
+ $(tc-getFC) ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L../ccif/ -lccif -L. -lccp4c $(pkg-config --libs mmdb) $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
# Can't use econf, configure rejects unknown options like --prefix
./configure \