Version bump. Removed atlas flag temporarily for later integration from the science overlay

Package-Manager: portage-2.2.01.21418-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 24 insertions, 40 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index a1b18c8af26c..3c5a0c5d8c5f 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2012/11/20 00:06:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.20 2012/12/12 18:23:10 bicatali Exp $
+
+*armadillo-3.6.0 (12 Dec 2012)
+
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.6.0.ebuild,
+  -armadillo-3.4.3.ebuild, armadillo-3.4.4.ebuild:
+  Version bump. Removed atlas flag temporarily for later integration from the
+  science overlay
 
 *armadillo-3.4.4 (20 Nov 2012)
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index b70f8f27723a..7bf5685e0116 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST armadillo-3.0.2.tar.gz 2918529 SHA256 64e38459dfa4bba97ad92ffcdc855921ff22a12d01c61a14e3049af522ea21c0
-DIST armadillo-3.4.3.tar.gz 3006815 SHA256 cde0a99dcee23086617791163e2c6d7527b45e450ca653e67fbb60eefa8487f5 SHA512 66441bf085c55922dbfb798aed309ff6ac7c33a8d8b810e6de6bdb5be8b9a323744ca7aa3b0d940698e9488e97fcb58a1ec54296e6db434470450037c8c4c9db WHIRLPOOL 0da118430a6116ad1f8da7eefb32b9a0a5008c763eb4569a79c0b9f6cbb352771b1a7a2f8804e66b73e96283386dd5dde30871e4214515751d1943b7d9a52748
 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.4.3.ebuild 1536 SHA256 a869bdd56c1d78d1aa62e3c8d689d4f18a981ea11a56ceabf6ca175bb7cfff88 SHA512 beda1c3d06f90e4645600565a5844dbe316550b2c0fbc33fb2337532a08dabd505adc51bc6e46f8ed1521f2d69dc3676a4eb1ead50a81b1927e9a59df07ccb7d WHIRLPOOL 577fedd13683757138ab039a985481a309ba08cc20f4be22a016bcfc1bf8a248052a81dbee40014ce83b74cf4bdc2858a1b6c1d07809a167fe40fc3eaaa1fd82
-EBUILD armadillo-3.4.4.ebuild 1564 SHA256 9a845ab238c235520c3ced1a69fc883676dd9dbc32ca7a78e13ec232678a92de SHA512 7681be5cf72acd19b65c86b2ba5e33c4a158f3cd44ed4083c05b138f7b11cb408238480a293befd945b68126d1e6b3b67c33f33309a9bbf52130e94cd2cabc27 WHIRLPOOL 09a94241ba0e9f5ea596aa7ba604aed58bd732a9ced610cd749e3a32cf4c2eb8f738a0be4b9230cec2a2e54f22b87e473bdcba671bbe73c2dfb870d578c16fcb
-MISC ChangeLog 3389 SHA256 ea3896ea142dab3edf0a752aa88ca80698279e78d4ad7755500c7817ff34c1a4 SHA512 74e77e48a4d46d4c5100c88153fd5edfe60073c5a375334ff6fb4727290ef133cd8d44d3c19b490b16393dc7c791e7c9dcc7dec2faaf33927afccc94efc4bfa7 WHIRLPOOL 8227b32a1f12f3a501d6678eb9201538aee51b57f5eeeb1b60e084726eb735c25493bb1ffcbba73b677a352a45a7ab0c8beff1c8cdd5e09d08374495355eb654
+EBUILD armadillo-3.4.4.ebuild 1240 SHA256 84517714a93a82ade238cb77ba7e2e1e2a7a2637c3031dfa743eb16fccbcb5a9 SHA512 eec597ae157c19764110982bcac945afde0afc2dbfd846c5723475f25ead7c7c8ed9c2392239ddab1c025c5abf39d9939581f8a47f117ceaac0a38b38aaf6307 WHIRLPOOL ca0a15751c85bebfc6e5e44cf67f2cadf283db681a70c4df336e56a3866bd7d494be00d73219aaeadd3147433da6e4cc688f4ecf9fb4584c28225f37fecbaefb
+EBUILD armadillo-3.6.0.ebuild 1273 SHA256 34e0c54531581dc0f07deb712146595c4fa9a5e16cf4903e219dc43a4512a04f SHA512 eb367d652ee372ac96c110ac52e782d4a0e5c9b77674b5f8e6466a0f5d4c4edb3bdaaacee46387a198bea5ae0ac6d7dd560234bf1af92b9808f16a4fe66dac56 WHIRLPOOL 47fcd294043a7b8ca9db5d4461585f218e3e33e1794e69de4dbb8462137b66e032751624ff137e1581798b28a5b5efd2733d2441b0c774a63626c2c63c85d10d
+MISC ChangeLog 3649 SHA256 ac73af186560f76c47a2c523cf027c92092900b0dfac31a7f519a6a11678f1d8 SHA512 d477f006a517dc0948247230bc49bb24156e9c689800521dca8c9c089ebdde6b7778c77f9aecf610a652e00edb9cc66f26382c7bc15efafe094357376df04cea WHIRLPOOL eeef26f8c4f38869154f8c00a41b94fe9beeef3e7e7270e8d6689bac6b5ec5877b88d808e8a7554c2b40b7cbcaea168de727b4d42b45ba0bfc4d78d76c0cc997
 MISC metadata.xml 934 SHA256 80ce1bfc4f526ef02a8e75f4238c976c80a30841545036ba987b2db318b08c0b SHA512 715b2a5c717ed2ef348ed1cbf7582b5d4a435ffb40599d274cf174af623cc47c03fd239999f41154a9f591a28cb4eaaad2d5f91b725ea60b5f84acc6335903c2 WHIRLPOOL e7598f91dd36b8910f3301ab69f45c12c9f5b12ba3d20310b421804ee348a55d86c3030304da5172c27b6ec535773c62f4acfbbde02ca9628c39e130ca8444b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCqyYoACgkQ1ycZbhPLE2DzsACggCnjFiQVMfEEtW+/Givjui2l
-yn8Anj/ZQrubqChtxj72GdQQIJPVO9Sn
-=7Pen
+iEYEAREIAAYFAlDIy5UACgkQ1ycZbhPLE2CTPwCfS20n8V0gUo0D1bqu+qK6A8zF
+PasAoIzqlTwnSpnYpUHzMSWyOP9zZ66i
+=or0b
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-3.4.4.ebuild b/sci-libs/armadillo/armadillo-3.4.4.ebuild
index 7d0d6d879738..53b65df7879c 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-2012 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.1 2012/11/20 00:06:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.4.4.ebuild,v 1.2 2012/12/12 18:23:10 bicatali Exp $
 
 EAPI=4
 
@@ -15,11 +15,10 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="atlas blas doc examples lapack"
+IUSE="blas doc examples lapack"
 
 RDEPEND="
 	dev-libs/boost
-	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
 
@@ -45,16 +44,6 @@ src_configure() {
 			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
 		)
 	fi
-	if use atlas; then
-		mycmakeargs=(
-			-DARMA_USE_ATLAS=ON
-			-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/armadillo-3.4.3.ebuild b/sci-libs/armadillo/armadillo-3.6.0.ebuild
index d12667913c76..c927983935e8 100644
--- a/sci-libs/armadillo/armadillo-3.4.3.ebuild
+++ b/sci-libs/armadillo/armadillo-3.6.0.ebuild
@@ -1,12 +1,12 @@
 # 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.4.3.ebuild,v 1.2 2012/11/10 09:54:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.6.0.ebuild,v 1.1 2012/12/12 18:23:10 bicatali Exp $
 
 EAPI=4
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
@@ -15,14 +15,12 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="atlas blas examples lapack"
+IUSE="blas doc examples lapack"
 
 RDEPEND="
 	dev-libs/boost
-	atlas? ( sci-libs/lapack-atlas )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )"
-
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
@@ -36,23 +34,13 @@ src_configure() {
 	if use blas; then
 		mycmakeargs+=(
 			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
 		)
 	fi
 	if use lapack; then
 		mycmakeargs+=(
 			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
-		)
-	fi
-	if use atlas; then
-		mycmakeargs=(
-			-DARMA_USE_ATLAS=ON
-			-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"
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
 		)
 	fi
 	cmake-utils_src_configure
@@ -60,8 +48,8 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	dodoc README.txt *pdf
-	dohtml *html
+	dodoc README.txt
+	use doc && dodoc *pdf && dohtml *html
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples