summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-27 14:45:00 +0000
committerJustin Lecher <jlec@gentoo.org>2013-02-27 14:45:00 +0000
commit89dc57a73299c351de6780a3b155fb760b75fa09 (patch)
tree42ca24df5169ce8ebf0202748cb1843b002bb49f /sci-libs/ccp4-libs
parentsci-chemistry/refmac: Add missing dep on virtual/pkgconfig (diff)
downloadhistorical-89dc57a73299c351de6780a3b155fb760b75fa09.tar.gz
historical-89dc57a73299c351de6780a3b155fb760b75fa09.tar.bz2
historical-89dc57a73299c351de6780a3b155fb760b75fa09.zip
sci-libs/ccp4-libs: Add missing dep on virtual/pkgconfig; use tc-getPKG_CONFIG instead of generic pkg-config
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'sci-libs/ccp4-libs')
-rw-r--r--sci-libs/ccp4-libs/ChangeLog6
-rw-r--r--sci-libs/ccp4-libs/Manifest12
-rw-r--r--sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild7
3 files changed, 15 insertions, 10 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 1824c22c92c8..4717531addc1 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/ccp4-libs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.52 2013/01/22 18:46:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.53 2013/02/27 14:44:59 jlec Exp $
+
+ 27 Feb 2013; Justin Lecher <jlec@gentoo.org> ccp4-libs-6.1.3-r11.ebuild:
+ Add missing dep on virtual/pkgconfig; use tc-getPKG_CONFIG instead of generic
+ pkg-config
22 Jan 2013; Justin Lecher <jlec@gentoo.org> -ccp4-libs-6.1.3-r10.ebuild,
metadata.xml:
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index c22c59e04a54..fce8fb248cb6 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX 6.0.2-ppc-double-define-gerror.patch 424 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61 SHA512 3080aa9ce3fad2d972b5f2622b2f0119ad8c4306f84de6dfcb24c8ef17ebd9a163bf8e807d34508d999b8e205abec9d18daddeb3e5f8fdef075d888301ba4ed9 WHIRLPOOL 55dc0176c7aa84b5b4ab1e6ad397d358f794d0f42737efef2e4048a67cd2060c90652ecb356e3a2847091e0e5d5429c80fd1ce7c5a5348a6693d6065d18969fd
AUX 6.1.3-cbf.patch 773 SHA256 767a2286956471c6dbf0feee9a5726f5170af21cb2dd85c7f45190cab5cce7a0 SHA512 ecf950cf82fc0c16e4e3f64b06f92a03c283dd04c2fc68932546ad863240fef49d44906a739d49d6913ceac5c8e0672ec3a7dfd2bb973f3c8ed5481c33464823 WHIRLPOOL 1307e0df9243f6cf867cefd18c7b22d4d880711f45ddf56729bedc2703584f7a42328fe87c00be7cf8d418bbd74db957128f3b527e283a384ed956bc0e5691b7
@@ -16,13 +16,13 @@ AUX 6.1.3-unbundle-libs-ng.patch 13925 SHA256 e24757ac37a173fc501f1036e283f048fa
AUX 6.1.3-unbundle-libs-ng2.patch 15485 SHA256 ded20e7e5a3fd347bc852ca119b3cbe6cde22c8acae21d710d69da4ab12fa7a6 SHA512 4ba517c14a298a31cf894c26dafc713c1b3b5acc114c653874f914bf3d197fa2fec82305775357e343d809e8d240f5f2b0c6573859ecf2b89a7aa17e1f1c7554 WHIRLPOOL 52dbd8044f563d2ba2f4c8cef615067fd6fb9034b5e6fd543a0dc3830ced99b47347cb5bd57f5a246e744f67609883e800057b552831f75d6b4553726f7b764a
AUX 6.1.3-unbundle-libs.patch 9063 SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4 SHA512 3e4b2564e3870f024a95bbf556ad597c0de7f83309aaa0f3d3af80c05b616eb0cbec04abe94546951c316b172accb74580c74a16963e3213c5477c89d4fae85d WHIRLPOOL 64d9c5408a48b80a515e465d0ce59ffad3b61e6f9ab247cfd23ac17af40e723d387a7970d116ce8d4aae45a051ae5901de0e96ccbf21a6df84cc341c03a6224e
DIST ccp4-6.1.3-core-src.tar.gz 242134076 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 SHA512 413eba806107ebcdbd93e9122275463709133d9b2a9ce44ae57a6c2350465a47ba66ad9875237aead74f5d422c0104f58f728ab37a757b10d82cde92af444c20 WHIRLPOOL faebf8ee7920013bc3d0e83565207dca1f31ba0b5c92fe1eae4b740f70ff2031d95787fa0d545b09c853d25657c08973527e43de02fddc086988123ca2a6339c
-EBUILD ccp4-libs-6.1.3-r11.ebuild 10899 SHA256 908b9e316ebfaa2d8bd501699a6b25d41204ec5c2d53e33666639458741cb81b SHA512 54dd7d26c9e85c145ab12433d9f0c065b997ad201971d4ec7200a3571534cbdebc4128cf0fdc57b83eb5c6fa13908c11b69cb5acf31dd81600b3d46af0765e48 WHIRLPOOL 36e94f1f78fa4b96ade07f7c6eb5cd1be1e35fade8ab56a714efa5e43175b1d6bd071594582e13f326531665eef24e068b161f5586612bef794e878ef6f9720e
-MISC ChangeLog 7672 SHA256 3f83458a99c4c8c27d63e972d7d63e5846501fa3f3b680e6f8f122a2b86c7c47 SHA512 3e88a90917319b7d9fe3095283cf744d56679d03d9648a6124c96fbf8cbcfc778ab01bae88aa6f3f3bb7847dc10de88fda49d65bab58d7f040b2f32a305b366f WHIRLPOOL 0581af68d6f7582a09d32e843f68d60aadb3126cf1c0762e2263e6c254f05c7e5d6ac39bd82f7553d3bfbdb05a3d1b90e3fd64adfc5da6511e1b605c03b050f5
+EBUILD ccp4-libs-6.1.3-r11.ebuild 10928 SHA256 63c6425c4c0cd6e71248708e3a70f7b44cd567d691ad883369af73357369a633 SHA512 6826eabb23a54144ad89afdc474b632281eefc51e3e8fb66439ea2c12c663e772816518749466fef424baee8f316d729c143f340b3b262664656dc99fa0f41dc WHIRLPOOL 8760d962baf1f341eefe4a699b2c2a65e0de858bbf1ed7be59f2d2d8cf971e1c6ac5f371ba108ec7cbd2fdf2c0dcbbd723676d575dca506eb2c0765feda979db
+MISC ChangeLog 7841 SHA256 9b8b5e09e55d6ec25b987f140b233b54ed23793d183b2b245ed00bcac30f5cbc SHA512 00c50b39d64718b12b1397d4ebe134f92eac960f5b4382e6a432aaf299bcf797d860807dd01861a545f16abcfef52622155b74692a3d0d127c35770bcc9f0a44 WHIRLPOOL 989a017b8024a57e8984b04362667e644ee781a44c878cd54c4f9c50c34a30acd23661ccb1825e09e677bdcc523e63521b6002298107ef52f30594e0845b06f6
MISC metadata.xml 272 SHA256 464cdfad7e5470cd4897f4d81fb87220dfdb9b8645f720e2fcf5157a7a75fbec SHA512 3e8682fbb209895927a39021555e3a440c49e61dcce93ea1b13759e067b285c604328cff031843e3aac6528970384c8fdbf15c8edd76a421db111a3981825fa5 WHIRLPOOL fc8d5f3db9db73bb2026ca21c4448107558ac53d568c89c7c6ccc635fde460aec1bbd177a4ad770b20d35693b59fc0721c8d60aea997973db3efd6b3c3777eba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREKAAYFAlD+3qIACgkQgAnW8HDreRaZ/ACgkRHpvFIJM4PPcjQdLMQm2JRt
-yd0AoIoEuMtftQ+4RylQ0XLXOhidkQzC
-=eDAg
+iEYEAREIAAYFAlEuG+wACgkQgAnW8HDreRYy+ACfUlou4lfzKbYah13qoTtuKfd2
+uG4AniVKjrZJD9HhQQOmYiAIBhp0NvST
+=wbn0
-----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 4e2868180333..0dcc6d9b665b 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-2013 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.8 2013/01/22 17:23:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.9 2013/02/27 14:44:59 jlec Exp $
EAPI=3
@@ -49,7 +49,8 @@ RDEPEND="
virtual/jpeg
virtual/lapack
virtual/blas"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
@@ -192,7 +193,7 @@ src_configure() {
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 $(pkg-config --libs mmdb) $(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 $($(tc-getPKG_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 \