diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-02-27 16:46:50 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-02-27 16:46:50 +0000 |
| commit | 8132b9cf2170bdfa8ef2be48b919be9e0b1233e9 (patch) | |
| tree | c61fd2f6a137807659203efb18066eda5c8f302c /sci-libs | |
| parent | sci-chemistry/ambertools: Add missing dep on virtual/pkgconfig (diff) | |
| download | historical-8132b9cf2170bdfa8ef2be48b919be9e0b1233e9.tar.gz historical-8132b9cf2170bdfa8ef2be48b919be9e0b1233e9.tar.bz2 historical-8132b9cf2170bdfa8ef2be48b919be9e0b1233e9.zip | |
sci-libs/ccp4-libs: Use PKG_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')
| -rw-r--r-- | sci-libs/ccp4-libs/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/ccp4-libs/Manifest | 12 | ||||
| -rw-r--r-- | sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild | 4 | ||||
| -rw-r--r-- | sci-libs/ccp4-libs/files/6.1.3-lapack.patch | 6 |
4 files changed, 17 insertions, 11 deletions
diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog index 4717531addc1..79b3660d3f39 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.53 2013/02/27 14:44:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.54 2013/02/27 16:46:49 jlec Exp $ + + 27 Feb 2013; Justin Lecher <jlec@gentoo.org> files/6.1.3-lapack.patch, + ccp4-libs-6.1.3-r11.ebuild: + Use PKG_CONFIG instead of generic pkg-config 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 diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest index fce8fb248cb6..c23b64c6c323 100644 --- a/sci-libs/ccp4-libs/Manifest +++ b/sci-libs/ccp4-libs/Manifest @@ -8,7 +8,7 @@ AUX 6.1.3-dont-build-mmdb.patch 749 SHA256 cf73ff7c361ba7ed3e3084a4c298a1e45307a AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca SHA512 bab1a6c1e0747ef7c0b9626358a9be493f5b52912eeb166532c0d4bb58f9ea0e4a81b5fde8685e9ace578608caf1c14d087f0f81d39d77b84b1082c2fba034e4 WHIRLPOOL 8645463fdc8646ca42001d850cfbc7132bef301740babb8dd2ecf6e032a20a630b5cb3599e7abae0128f0866fb4ab293d2a1ef3e3ac21a44a0146746725cf15f AUX 6.1.3-glibc2.10.patch 1018 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532 SHA512 4be14a1044c92c0d3b0688f5bc69e90ef9ed1837a798dfca02b8fb7bf1b30722df19739c2706c5f587089727f1ac22b27dd7a85cd91248c3c75eb449a6e1cd15 WHIRLPOOL d5f70a5c91f6c7f4514db5adca7a3dc3c3956f428e539e8e20dc167c40bc96971403d9127c8085c1b62ddc34d0f1fae08011f6d23dd36a3e1a5b23b896d0ddc7 AUX 6.1.3-impl-dec.patch 3957 SHA256 29b68e7ced2160ef880b03b9e7488e0d4ccf1717c5b87b582ab32f1a3eff6bce SHA512 7412a51258b0c90904d662a9726cc7629894cf644726dc04779707fae7b1930338ed6b7dc2b11608d5310359b0e64d15ca9fdb62d086f418d809cdd70c18d927 WHIRLPOOL 771d49c2aa84b960b706ab5b7a25b3e37f3f42026c71e952b7ec62bf007cf7874d311c0f86de6087760e0c692ca5239d43d5063a0b57c4a200515862f2fa0c4f -AUX 6.1.3-lapack.patch 21635 SHA256 f6eaf5dac5e5b6fce26eb1106c11de366e325179e82e70d69c174c969ac43c6d SHA512 ccda71f02750eb0f094fd0712eed2efcf320485949ba8e7a51ee58f25529e7689d5d25b2e9591c65ca408d59551d84bc0065b19dea981aaf96c85786ee3f05a6 WHIRLPOOL 51b899839f93e72b84c417360a34da5f563c611fd7da986f9fd344aa36c04dd432f707900faee4dcff48b59a0bb31c5f8e621b60cea97327d4ec39caa013aca9 +AUX 6.1.3-lapack.patch 21644 SHA256 3b6a1cbcd2fbdf1802f0ac34e21b8d6be0925e988ddabecc9fa6a757367d3a17 SHA512 8ccb59597d925f8ada3130d3bcbb2865b8b69d0ef45f2803847a651a088e4f1009b3b765475ea8737d19a6bc3265f16c3f0bfefcc5d64bd9cc17ef14c505c755 WHIRLPOOL 3824916eb045f9eceb921cf1d223efb58fd9d45e36fa43e17ccf6fe95c6f022ebf082adae0388d2a26a0f0c6de8abb76ee9a2b13b28c3392f7b5669e236fddac AUX 6.1.3-link-proberly.patch 8282 SHA256 f6623dfb0d270e5fbffe03f95b23c967ec8da34b3d0a1c5262941979a965f9ea SHA512 8a65f74fbb64026a399944da37d454e36f01896b8f9c362d6aa0ad91bafd90ff88f1f288b3c66f8c1ad62445363fb819d3fbf23de69ce5db47adf093686b56c1 WHIRLPOOL 1a5e8d36a4d1b5c8f6f7d61d03d45af4dbec7a4dabd9f13ccab35311f57212daadd1729ea4f190b80f1bef29c48af532d38cf75e2dc12b480b451918b0ce5c08 AUX 6.1.3-noinstall.patch 5188 SHA256 22d96aea9d3d5e6e090713e610b35bdb34eaff9157c41687b47294f0d62ccff7 SHA512 c965f2d31abab4cd8a29281009d628d15c94ab2ec0323aa55aa98b96b4b79515f78f0df377c9e872db8ef6d732ce469cfd877a3fdee8e9076d84457d31aa8ceb WHIRLPOOL 02f576fa879b844a5fe3b48bed34aafc578ac84cd2073a3a7a8ce712cd15b50a6a03080dda3889f4604a19df97300c44ef28d8b5158320750e5164184a0dfce3 AUX 6.1.3-overflows.patch 904 SHA256 e5c62922daf832b62e9ea1e14a2be0d54c88b035b78b5831eee07025dff9222a SHA512 eeb9d160f6c63b224910eb7db73d599c0adbf60adcd654d3b4b05bb3f8214dc99684ba1ad81e5b1147dbd4f3f8356d2d4c7cf366e8ecf464ef4e03347fe2da04 WHIRLPOOL 52dbdc4ccd0f8f96fb9b561d94f0d66d97a29e9df22c35b9fe74d6263ccba96dffa432859783ca7edfdfec91ff2d9da53bb4c791b2350d8f31db5bdfb793c875 @@ -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 10928 SHA256 63c6425c4c0cd6e71248708e3a70f7b44cd567d691ad883369af73357369a633 SHA512 6826eabb23a54144ad89afdc474b632281eefc51e3e8fb66439ea2c12c663e772816518749466fef424baee8f316d729c143f340b3b262664656dc99fa0f41dc WHIRLPOOL 8760d962baf1f341eefe4a699b2c2a65e0de858bbf1ed7be59f2d2d8cf971e1c6ac5f371ba108ec7cbd2fdf2c0dcbbd723676d575dca506eb2c0765feda979db -MISC ChangeLog 7841 SHA256 9b8b5e09e55d6ec25b987f140b233b54ed23793d183b2b245ed00bcac30f5cbc SHA512 00c50b39d64718b12b1397d4ebe134f92eac960f5b4382e6a432aaf299bcf797d860807dd01861a545f16abcfef52622155b74692a3d0d127c35770bcc9f0a44 WHIRLPOOL 989a017b8024a57e8984b04362667e644ee781a44c878cd54c4f9c50c34a30acd23661ccb1825e09e677bdcc523e63521b6002298107ef52f30594e0845b06f6 +EBUILD ccp4-libs-6.1.3-r11.ebuild 10952 SHA256 432924c4a519d30ec5c4b3c2c4ae5789b266b96eba9e996db6d035dd4e286fea SHA512 43d44c87dbe38a89c24c6e5cd22adab0902a79dff2be66089af36ad2e081617b756930d315ed38f12ab7503eea2482506a703b379c6ebd26257306172626139c WHIRLPOOL f9dcd018cf68de7cedeb6053cba919d4fefcf9a4f109636d794a18e21d5a13ea22712748c89facc53ac9a38b65e07cd3fe93a491e0999f13edb8191eb38ea964 +MISC ChangeLog 7992 SHA256 45976252b770f5515c304d01cd487c055b56486c4d031ef548f0f9699742ea05 SHA512 f314ca77033088a7f62f8dd9642a3f75520834e37f865748b914703915bc4d0cb67b6c9fe160a0f6466e3b4569b0b79d8646ccf2d8233cf7fdae6112b238f30b WHIRLPOOL 6ac7210031d8d735bac4b32179ce534371db53dd8fa90b6895749942b9cbd7fd4af41308b8a8e1249b5d3c2337f4954f969042a247bbb70798a207aba43b5742 MISC metadata.xml 272 SHA256 464cdfad7e5470cd4897f4d81fb87220dfdb9b8645f720e2fcf5157a7a75fbec SHA512 3e8682fbb209895927a39021555e3a440c49e61dcce93ea1b13759e067b285c604328cff031843e3aac6528970384c8fdbf15c8edd76a421db111a3981825fa5 WHIRLPOOL fc8d5f3db9db73bb2026ca21c4448107558ac53d568c89c7c6ccc635fde460aec1bbd177a4ad770b20d35693b59fc0721c8d60aea997973db3efd6b3c3777eba -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEuG+wACgkQgAnW8HDreRYy+ACfUlou4lfzKbYah13qoTtuKfd2 -uG4AniVKjrZJD9HhQQOmYiAIBhp0NvST -=wbn0 +iEYEAREIAAYFAlEuOHoACgkQgAnW8HDreRYxzwCggylkXdvDldgu3iddmO3DlO3Q +f8YAn2AKsp0KPYPEGMi+ZCF8/aYlNjaw +=3ina -----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 0dcc6d9b665b..8abeed9c1921 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.9 2013/02/27 14:44:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.10 2013/02/27 16:46:49 jlec Exp $ EAPI=3 @@ -60,6 +60,8 @@ pkg_setup() { } src_prepare() { + tc-export PKG_CONFIG + einfo "Applying upstream patches ..." for patch in $(seq $PATCH_TOT); do base="PATCH${patch}" diff --git a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch b/sci-libs/ccp4-libs/files/6.1.3-lapack.patch index 2514733f876d..0463b3719525 100644 --- a/sci-libs/ccp4-libs/files/6.1.3-lapack.patch +++ b/sci-libs/ccp4-libs/files/6.1.3-lapack.patch @@ -567,10 +567,10 @@ index 833f483..bcfa62d 100755 + # gentoo is clever + make_blas= + make_lapack= -+ BLASLIB=$(pkg-config --libs lapack) -+ LAPACKLIB=$(pkg-config --libs lapack) ++ BLASLIB=$(${PKG_CONFIG} --libs lapack) ++ LAPACKLIB=$(${PKG_CONFIG} --libs lapack) + XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}" -+ XFFLAGS_LAPACK="$(pkg-config --cflags lapack blas)" ++ XFFLAGS_LAPACK="$(${PKG_CONFIG} --cflags lapack blas)" # Otherwise force building of NetLib BLAS and LAPACK libs - else - echo |