sci-libs/armadillo: Drop atlas support completely

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 19 insertions, 35 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index a0e230319e8c..eee9ddd0bc01 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/armadillo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.21 2012/12/16 10:43:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.22 2012/12/16 10:55:08 jlec Exp $
+
+  16 Dec 2012; Justin Lecher <jlec@gentoo.org> armadillo-3.0.2.ebuild,
+  metadata.xml:
+  Drop atlas support completely
 
   16 Dec 2012; Markos Chandras <hwoarang@gentoo.org> armadillo-3.4.4.ebuild:
   stable on amd64 wrt bug #447130. Forced commit to workaround QA warnings due
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 4d110cde083e..7511b224f6f4 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST armadillo-3.0.2.tar.gz 2918529 SHA256 64e38459dfa4bba97ad92ffcdc855921ff22a12d01c61a14e3049af522ea21c0
 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
-EBUILD armadillo-3.0.2.ebuild 1405 SHA256 43efb8d1db69dbbdf4e7456b4bd3399738c55b6b77aaf8fe6e389b1458c79441 SHA512 65e2b9f196ea0c130711f2a8fdd28bb21d0a75e58e8f6179feb8bdda57d22a121430984639b8bc5d278d9adb2ea5a220becd145d74d7c0f3a9e2e6ced1e8d6dd WHIRLPOOL b69cf7fc9ea59cc91e52f8c9c7d9110bfdb6b9892d31a8a3d0311d9eb92ddd7a9df5611bf5c7fe56ea091e263ad68893d19ef91d4a70daa2cffa9606f9f14111
+EBUILD armadillo-3.0.2.ebuild 1099 SHA256 4f966baf32c8f863db8e7fc98428f3377f86b95e236497a0fb5a2ec1af345869 SHA512 ef696a7d7bb8a7f971194e239fd9f61498610b1973842e5a7755a9f3d1eadf48388ca445a86d2baf264f5882ad8802921147dc1d55ea164d99df7962ca4d3c37 WHIRLPOOL afd9856c3b54c65d23e6b8b02551f10266cac50478390b9bbc6637f40fcde7b14b00ac486db9419ce23835dc98923e61dfc260b8856d51249baa2364248f82ef
 EBUILD armadillo-3.4.4.ebuild 1239 SHA256 1cc6fa850846b8abc070dcf338cc2e8d5d5aa6ea50e6e006542107c17a8643e9 SHA512 a8cded42e0db6f6fe3390fc4c27e4ede660eec40c7c45d16bb9c174c9c5b6d817be50fde6695682a58f2492519d18eff2cc879a9a6c1cf82e92c31c451be7410 WHIRLPOOL fef8e09aee2951fdba19f8844e3d96efb45fc8c19337eb3735d9d5f0aa39a56cff9ad8371f39c2e986208213e22e51e54aeb482e0fb2984a7423658aa6099380
 EBUILD armadillo-3.6.0.ebuild 1273 SHA256 34e0c54531581dc0f07deb712146595c4fa9a5e16cf4903e219dc43a4512a04f SHA512 eb367d652ee372ac96c110ac52e782d4a0e5c9b77674b5f8e6466a0f5d4c4edb3bdaaacee46387a198bea5ae0ac6d7dd560234bf1af92b9808f16a4fe66dac56 WHIRLPOOL 47fcd294043a7b8ca9db5d4461585f218e3e33e1794e69de4dbb8462137b66e032751624ff137e1581798b28a5b5efd2733d2441b0c774a63626c2c63c85d10d
-MISC ChangeLog 3831 SHA256 b8efdb5fa252bc6797cee4620a1cb12116c01574ff1de6c4610d8783a6a864af SHA512 d9a25a0c7e5eb5ef8fa79530d2ef37b2ab2f923dddf4f7691a32904d0ccc5e7bdaa638d5021465856231e81a7205b2521a93ffe63036825ce0f465e053dbfccb WHIRLPOOL 3faa3eec559c0e2d6cbbea8bfa1d0854d33f171f7aa709a924894b1c451df75058a561b76675d5449175b29a4fbe07361987d4beebaed066bfe860141b6e8e16
-MISC metadata.xml 934 SHA256 80ce1bfc4f526ef02a8e75f4238c976c80a30841545036ba987b2db318b08c0b SHA512 715b2a5c717ed2ef348ed1cbf7582b5d4a435ffb40599d274cf174af623cc47c03fd239999f41154a9f591a28cb4eaaad2d5f91b725ea60b5f84acc6335903c2 WHIRLPOOL e7598f91dd36b8910f3301ab69f45c12c9f5b12ba3d20310b421804ee348a55d86c3030304da5172c27b6ec535773c62f4acfbbde02ca9628c39e130ca8444b6
+MISC ChangeLog 3947 SHA256 28d1c9bbbf50047d3bf725452b2dfb73f82cd08c733fad2b2dc97e2a9519bf1e SHA512 3f7bb80dd199d7f81c95db9054bbf494c29e1022c418e3a4f2b60124cd6a2176041c947c9cc728deb74122e8305649a2e604c88ac65097db67b219fd5245c4d4 WHIRLPOOL 7f8733b4ab6df32dfea21b4c7f94e9efe01081da8b25a771fc2e6dcb2490f71e4f999f212c4f451ad8a94c438c3dfa04b2e8dd92c4ace2eb6dfb8b8cf3ff18d2
+MISC metadata.xml 944 SHA256 20059913e5c47ff33d2990b0d531e0eadb45a4b2de0e29fb731b6935a5d073d3 SHA512 daf634e7b8d6b058a8a46e44d8785675db1611b345ccd5bb4b757f820c3aed112e7d84549de4e721c8bdc3b018e79dbb78a8e8e5c615b8c11b8b82dcb7bf6bbf WHIRLPOOL ddf1136fe775036437ee9df232ca11972136756ddf0c844bc4acb5d91b65283f05c57d9610edde66ac92cedec5b268b03d5f6adeda6fbf7761f99f21934bf584
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQzaXEAAoJEPqDWhW0r/LCgF8QAIb++PtQ3/xvqy1Fw5DiNqkH
-UJMA1HEuQl5cD93nbRMeJzTYbuq7hIEa813Pj73mqdnz/ZMIxhhxu0H3Sr3a/CiE
-oXGZb3UoBU8SVduxIFzcJAX/yEPIV/ZeFVerSgsusZaQeOJ1UzRqdv9hjqGOGEMc
-H5TrcCXStxj0Rxz+TP/UNl7zlMKQUmv7O0mcmMBvMa9ypkT7oyRt/NYcjaxaxrAm
-jO6Y0S5nwRccwBWnFlM3RFXS5eD7rmkyC1T1bpUN3WMvvot7HXESx/KVBeeCP4zd
-g8szaTmiEz6tHP9PX2iehOsZyio8HRDm8oaqfSUoM8oiBRSht8aAcVvVWq8m6gHq
-Yj47fF+Cuqs75FS03hJZcRWcX4ISYDYfcfb0ArhNwc2KHLp3OX0RJ1BDdBMdojiD
-pVn6mg2DdN+3Nwzlc5pvdvJ5CbYIztatc7FSXdk5TAflbv4uXFVC1zZlyVMnfHqT
-wp4NUDNzkn5sjbpUdZaUkh8nvvS4q6/EUtOuIjnuxwGRSJB/b3JxWlC7ok/o8v+J
-LdeZRdVwPdtt7kaBMBS3aqM8ukeJSOVLGrzA2ldTJXDgHSTRI6sW2+lXIl/F6/Uy
-hdYm/dcb4idHLHiBVHOlGpnKXv0d7dJMOZTl2AtyT5tsjYWVAQiPdluggGYN0TaZ
-LcO1gebdvnaPSPLL6QoK
-=rYEb
+iEYEAREKAAYFAlDNqJcACgkQgAnW8HDreRZvOQCgmalyRsAPFImjkqrmVqlEBzWG
+A5EAnA1nSm6EMz3H1dcKHLKE/3lApSTa
+=+yr3
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-3.0.2.ebuild b/sci-libs/armadillo/armadillo-3.0.2.ebuild
index d553af09c836..0e33904d78d1 100644
--- a/sci-libs/armadillo/armadillo-3.0.2.ebuild
+++ b/sci-libs/armadillo/armadillo-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.0.2.ebuild,v 1.4 2012/05/25 18:50:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.0.2.ebuild,v 1.5 2012/12/16 10:55:08 jlec Exp $
 
 EAPI=4
 
@@ -15,10 +15,9 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="atlas blas doc lapack"
+IUSE="blas doc lapack"
 
 RDEPEND=">=dev-libs/boost-1.34
-	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
 
@@ -44,15 +43,6 @@ src_configure() {
 			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
 		)
 	fi
-	if use atlas; then
-		mycmakeargs=(
-			-DCBLAS_FOUND=ON
-			-DCLAPACK_FOUND=ON
-			-DATLAS_INCLUDE_DIR="${EPREFIX}/usr/include/atlas/"
-			-DCBLAS_LIBRARIES="$(pkg-config --libs cblas)"
-			-DCLAPACK_LIBRARIES="-L${EPREFIX}/usr/lib64/lapack/atlas -llapack"
-		)
-	fi
 	cmake-utils_src_configure
 }
 
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 4a8f6b75bedb..c598db146c17 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   Armadillo is a C++ linear algebra library (matrix maths) aiming
   towards a good balance between speed and ease of use. Integer,
   floating point and complex numbers are supported, as well as a
@@ -14,7 +14,7 @@
   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>
+  <use>
+    <flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag>
+  </use>
 </pkgmetadata>