summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-04-10 06:04:31 +0000
committerJustin Lecher <jlec@gentoo.org>2013-04-10 06:04:31 +0000
commitd46816038be255e143448227b298c1e446e4ffa0 (patch)
tree2de89f78e2b75a0b52df52bb78233c8ca06f71f9 /sci-libs/armadillo
parentPrevent file collision with libpng15.so.15 which can be part of the libpng16 ... (diff)
downloadhistorical-d46816038be255e143448227b298c1e446e4ffa0.tar.gz
historical-d46816038be255e143448227b298c1e446e4ffa0.tar.bz2
historical-d46816038be255e143448227b298c1e446e4ffa0.zip
sci-libs/armadillo: Fix typo for pkg-config, #465292
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0x8009D6F070EB7916
Diffstat (limited to 'sci-libs/armadillo')
-rw-r--r--sci-libs/armadillo/ChangeLog7
-rw-r--r--sci-libs/armadillo/Manifest14
-rw-r--r--sci-libs/armadillo/armadillo-3.4.4.ebuild6
-rw-r--r--sci-libs/armadillo/metadata.xml3
4 files changed, 16 insertions, 14 deletions
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index f9479e073694..01563776fa47 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/armadillo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.27 2013/02/07 05:49:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.28 2013/04/10 06:04:30 jlec Exp $
+
+ 10 Apr 2013; Justin Lecher <jlec@gentoo.org> armadillo-3.4.4.ebuild,
+ metadata.xml:
+ Fix typo for pkg-config, #465292
+
*armadillo-3.6.2 (07 Feb 2013)
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 289cf12dac88..72f08de17dd2 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
DIST armadillo-3.4.4.tar.gz 3006964 SHA256 ef94e12556421fa62ba7734f8b18bb12c188f43dd6192d3648a28e8d154e6ba7 SHA512 78fbb107b220d283a2404483ee38720fd8259bbf675d8753d706cc3c3ba9678d47412d156f24a4b3cc95e20ce3c935167e2f7657806b5b8e8b7c95938c4b3f3f WHIRLPOOL 2a1b6426b695569c10b13d3df1183c615fdb4261497eea405e61316a838a5744477db7bfd8344f25d741e69899f64a19c801bd068d366175a2c9898369090093
DIST armadillo-3.6.0.tar.gz 3013210 SHA256 8eabbe5cc89d1541c27384175444caf99243402d0ae3ec5d52d53f55400e6927 SHA512 feeb11b49cbe88227c63aac1a28b50a88d1ee3df5fc8cc4d30ca893fbb12d17b9ba75d362403e0129106ea8309149205798d61db7bf7bec6a21284eca28a7545 WHIRLPOOL 67c4c2568476adbbcb85ee84b000b24f9f08d2f30dccded6099b7a2dae35b7d236102b3a1346cdcb18efd3187a88766b53e16383ec927ca63b722dd38b6de2e1
DIST armadillo-3.6.1.tar.gz 3015353 SHA256 4ca5e0542754b70b1fb3008cc5f66c9152008f78ed89cee24a2b8e2c894f27a0 SHA512 e871808bd1f20bc2dbd6c8938715091d6f89ec7459a39a83462ebe6a0ee051c491454f729b2e9ed8e991fbaa1f3aa4c0dd4e13727bcc967013452bc8e6b3e62b WHIRLPOOL 643a61b497f7d6dbce17d9019bac65edb3d21e8594cbeb146ea28ff5b88ce66ad5c910a30482e2a5bc97941cb4f9edf1a25a5ba976eb396e6287ba8ec63d73f5
DIST armadillo-3.6.2.tar.gz 3016818 SHA256 04f64c632e619989616c7f219310a06cb1618b16274bdac05b4798d49eb4f149 SHA512 0c769caad012f7893cc8ebb46969179f1175edac638f98fd2a0898aed062f7456536eecd12c9720f77caf4859cd0049e00dd71c9f096458b5fd5ce9cea517c66 WHIRLPOOL 898c29f7d0a7b02658f8d95a528be7d321a7d15f95ada6a4296d9822ee873556a49ccaafcaca16cb25e4a05321fa91b9711d7790b0910464b653398fb6ce4738
-EBUILD armadillo-3.4.4.ebuild 1268 SHA256 398fb251e4845b45530fa235d13019632f759b969084aebaaf872e93b0124eb2 SHA512 ff1c68bdd5e2caad18c6aa719ab1073d9bc283d780d59424cc9ced93446e02cd643d75be6e22baa238f8cacf92ad5bb9b96201a6e58b538c7dca59094d2be460 WHIRLPOOL edfb1a5a93ca735c1feefea693e0ff58bbd8eeb2a5599970dcdb3059b28670aed4ab61179f786ae01c7345bd12dd0a661a913f346dcb2b4fd29f78bcc47aaf47
+EBUILD armadillo-3.4.4.ebuild 1266 SHA256 2d771791965f7e24e57628042a03e1494ecc0d815071265fa067bbc7c5537e89 SHA512 7d6774f5555a024cf4e7a62114f2fcdef678eaa47adbd6eae01a59890e5ecf7fa36722be1072ad8220072f9a5e047e494fd85ed2f8ba794632f6ced22ddcddc5 WHIRLPOOL 6cb4003de7bbd8eb2b3b78beb1403e11ead745d3f991450be514ab8435465987908c5200a4981eab7283f6927714083c13369a2caff62c98b93b36d1d6119960
EBUILD armadillo-3.6.0.ebuild 1273 SHA256 34e0c54531581dc0f07deb712146595c4fa9a5e16cf4903e219dc43a4512a04f SHA512 eb367d652ee372ac96c110ac52e782d4a0e5c9b77674b5f8e6466a0f5d4c4edb3bdaaacee46387a198bea5ae0ac6d7dd560234bf1af92b9808f16a4fe66dac56 WHIRLPOOL 47fcd294043a7b8ca9db5d4461585f218e3e33e1794e69de4dbb8462137b66e032751624ff137e1581798b28a5b5efd2733d2441b0c774a63626c2c63c85d10d
EBUILD armadillo-3.6.1.ebuild 1273 SHA256 48f4856c793c007203182de1c706e4d2570145c73863f3054ec2f7c1e13d97cd SHA512 5b9d90a8ed8055281d517dc5708c06aa025c53d6621219041cbd2d4a3c47a3f284376300ecaaa5df793c86f30bfd657c34d67c6e3240ac287aec621a1f946c33 WHIRLPOOL bcb6d0e6aab01e90ffc518ea816fce00a1297ed9f618b205ad645361b2968121d3fe1a4578187da3f33dd7b3e2877c52b37bbabc2018baf6e6d8444b5b4bb483
EBUILD armadillo-3.6.2.ebuild 1273 SHA256 9775e8b42395dc80878955f9684b36a724985f08793dfa6099c51f7ef0f6342e SHA512 6d643efb3df27d092830a01a7d2f321edee19c4f2a9d2010209f48912e868d509f10bc93706ea35459e124a8c3c3b682520ea221deefa549e6e6271c9e682ec7 WHIRLPOOL 61964b69f2445ee4956e1d84cc01ad6fdfb9c80a59fbe6faafa32a0ab0a8219dd157bb39c920d8b6bc52eacb914f9d2f37b145d53daa5e779408c8266d7d6061
-MISC ChangeLog 4568 SHA256 040fd6d919e06eaaacab67b23a40f49deb0e34906e9b6c9968becdda65ed1254 SHA512 9714e9eff4bcb26f9d4af3f407fd2484f1a0bd9777e949bfb293a63536c9b31f2fb95616c254b617d8d3b3634791edaff4a828194035f038ca0842b6b446be9a WHIRLPOOL d77a1c9370b16d9dc8bec2bee8687884a86f42c37943eea66b599517199e8d2f4f112c37356d9197eeb3d731990af8ab2bbf14e162eef62af3a82ede797bab41
-MISC metadata.xml 944 SHA256 20059913e5c47ff33d2990b0d531e0eadb45a4b2de0e29fb731b6935a5d073d3 SHA512 daf634e7b8d6b058a8a46e44d8785675db1611b345ccd5bb4b757f820c3aed112e7d84549de4e721c8bdc3b018e79dbb78a8e8e5c615b8c11b8b82dcb7bf6bbf WHIRLPOOL ddf1136fe775036437ee9df232ca11972136756ddf0c844bc4acb5d91b65283f05c57d9610edde66ac92cedec5b268b03d5f6adeda6fbf7761f99f21934bf584
+MISC ChangeLog 4688 SHA256 b0376c424ac854308d19a150fb31396e018924d334c5ad009e6c30bac8a15b3f SHA512 cee05393bb972ff2c53002a313ec4e3ee1bb315eb73338574a2c2acaead25b80035bbe63fd44c04935eb61f1966a2a98cead6a05178edfbca6da4fec840ad241 WHIRLPOOL b5e12db3d13c33a47599d9ee488a49547a52527314d3de6bbd31ff8e21b04c6b5478df6d4ad36346b66cb1fc1c9ec9d813a42a07b2528bdf77e5baa1bdfe2ced
+MISC metadata.xml 808 SHA256 aa220a3aedeb9de18bd5ca69f9870579004258babf1e0509381a5c966476dd75 SHA512 1fe2e82eda7f1637cb13014f48e5688411ccf0fd8f517973a72ab7169a5be3f894dbd7aa21bcfd6c3aa16114cdacde4bf2b99a4cbe5103aaa5fa117e8b79aea1 WHIRLPOOL fb8e703eb875443fcc0fa294600f52595e5811bdd6af4ac8db4548c9300a489e84877102bb5a00974c3f335918916c4874182cbe2f9490fc77e2fce706007ec7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlETQIEACgkQ1ycZbhPLE2CtJQCgoSNSY2/CcwO1pdtVXV0zSMFP
-xxgAn09LnjMUt3RQtpUk4lYSulxOel3J
-=epU2
+iEYEAREKAAYFAlFlAO8ACgkQgAnW8HDreRYZnwCgvMFDjMKsud4w+0PQ7vibMfsk
+24oAoMSFp2mc3ZLBxWy0kta64hUPWk/E
+=ZMcS
-----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-3.4.4.ebuild b/sci-libs/armadillo/armadillo-3.4.4.ebuild
index 8bd2db2bf79a..afbf4463b04d 100644
--- a/sci-libs/armadillo/armadillo-3.4.4.ebuild
+++ b/sci-libs/armadillo/armadillo-3.4.4.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/armadillo/armadillo-3.4.4.ebuild,v 1.6 2013/01/03 05:33:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.7 2013/04/10 06:04:30 jlec Exp $
EAPI=4
@@ -35,13 +35,13 @@ src_configure() {
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
- -DBLAS_LIBRARIES="$($(tc-getPKGCONFIG) --libs blas)"
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
)
fi
if use lapack; then
mycmakeargs+=(
-DLAPACK_FOUND=ON
- -DLAPACK_LIBRARIES="$($(tc-getPKGCONFIG) --libs lapack)"
+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
)
fi
cmake-utils_src_configure
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index c598db146c17..13f3be1f60ae 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -14,7 +14,4 @@
need for temporaries. This is accomplished through recursive
templates and template meta-programming.
</longdescription>
- <use>
- <flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
- </use>
</pkgmetadata>