Version Bump, fixes https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/79; thanks Marius Brehler for the bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 153 insertions, 30 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 1ff60b301d83..03c30c318700 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/armadillo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.31 2015/02/27 14:41:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.32 2015/04/03 12:32:07 jlec Exp $
+
+*armadillo-4.650.4 (03 Apr 2015)
+
+  03 Apr 2015; Justin Lecher <jlec@gentoo.org> +armadillo-4.650.4.ebuild,
+  metadata.xml:
+  Version Bump, fixes https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/79; thanks Marius Brehler for the bump
 
 *armadillo-4.650.2 (27 Feb 2015)
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index da35364f4a7f..d480321f14cd 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,32 +1,34 @@
 -----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.2.tar.gz 3016818 SHA256 04f64c632e619989616c7f219310a06cb1618b16274bdac05b4798d49eb4f149 SHA512 0c769caad012f7893cc8ebb46969179f1175edac638f98fd2a0898aed062f7456536eecd12c9720f77caf4859cd0049e00dd71c9f096458b5fd5ce9cea517c66 WHIRLPOOL 898c29f7d0a7b02658f8d95a528be7d321a7d15f95ada6a4296d9822ee873556a49ccaafcaca16cb25e4a05321fa91b9711d7790b0910464b653398fb6ce4738
 DIST armadillo-4.600.4.tar.gz 5347594 SHA256 308835440ce3b17d7652156bad6c9fbc6f6881859e07467623676d4a35229ca8 SHA512 a7378e2fe5a4485f5df755cd3af9e54034f1a701bd185161a9945422598dd7e20327cf945075bca71d31a18eaf9f932ff39f204e96a48855ef013a962dd07fd8 WHIRLPOOL 2c0544a243f5632445a740148dfd4266a20815c017aa0f52dd20ac5c6ab9531da7ad388605c136fdacf254b724648ab0f7a0354554b85af1ed82be21f5e0ea6b
 DIST armadillo-4.650.2.tar.gz 5351466 SHA256 380b9e9a6fa67e917a79a46cbf04ec169ea598932cfeb59c9f1eaf7485f14711 SHA512 a4f6cb3f4d7e4dfbf75d0a3bb758a10f2206902fd11dd7bc60d618d2af1327d746d5fbb35e7f2160cc66c96af70d42a160ce34ca0735a422cf7c56fbd5c0a456 WHIRLPOOL 1c7346dd8b6c439dc611fddd3faf27ed1068194187ec3c8faea5ed5e45ae6143d57fa7e6571190b5a1a661b51dd0852d2641be752efedda00a22de7de589c755
+DIST armadillo-4.650.4.tar.gz 5408567 SHA256 ccc56580ec932ec9beade5679b07ecbed889e9b602866f673d1a05a7692b4bf8 SHA512 a548150ba5484fce35b0bc6023982939946f2f00b733dff2cd5b46101b1c344342061389cb4363cdaa04c5e3cca3278a40febe2ed705316552dd71f841c46037 WHIRLPOOL 331493d8b9c92b9e1908880c6f6510edb12e93193a9ceb77d0b8ce9d0bfb493dc48e590ea949d39c3c19f6fc3b05446b7e00525512e3055be0f907427c28f7d4
 EBUILD armadillo-3.4.4.ebuild 1266 SHA256 2d771791965f7e24e57628042a03e1494ecc0d815071265fa067bbc7c5537e89 SHA512 7d6774f5555a024cf4e7a62114f2fcdef678eaa47adbd6eae01a59890e5ecf7fa36722be1072ad8220072f9a5e047e494fd85ed2f8ba794632f6ced22ddcddc5 WHIRLPOOL 6cb4003de7bbd8eb2b3b78beb1403e11ead745d3f991450be514ab8435465987908c5200a4981eab7283f6927714083c13369a2caff62c98b93b36d1d6119960
 EBUILD armadillo-3.6.2.ebuild 1278 SHA256 6af0ef777d295f5825700fb3ae4d7fc0faa9e1ecf58438e65301584110cacbb3 SHA512 8b4e3abaaebe3d90aab80d1762f8ab1cb68035f11ffa974679289fa9776e744d705f83ba8740dd2cc970622f910a7d565e9f823ea96f6e05830f9c848c1cddde WHIRLPOOL 3834e7d60ba2b1cf16a0abe2deac6e481201fcd4f45ae6368d50e7d29c5db2b0a842c9948a0b78d4187d61c91e65e785d84ef812440452e8d69ed1932fb5962d
 EBUILD armadillo-4.600.4.ebuild 2989 SHA256 739788c20c6225ed46021990d3b88c9b73c79a5a49b6e778a7ec33c470190d5e SHA512 a4f6373e2122613590fe4b4cbd0c34b96068bafd09ced317ce1029e927f700a57e6719655e3e7338b19cb6a46eba1d9b54c30515c6575aa3860f1be26cc90e5c WHIRLPOOL fb22f5aac6947e3dd43a6017ec31a57f5ead566e5eca55c32172a3e5fcb30c34f7fda1fdbf05faf17894858db690828942a2b27fff2ee33d46ac2d8231c3e9a6
 EBUILD armadillo-4.650.2.ebuild 2989 SHA256 554fb9a57ad0181b8fd72cad2f9d7e5cfe2f168c0069cc3e87f4bcd97dad8b56 SHA512 b956de0c862cda3d63320e625564591801e666b48186f7986506ffb36bfddac5f852c78860d50f0f05b6f07c917b5035a804d689edda70c64cceb79c3f78acb6 WHIRLPOOL a82a07c0676f3759fa2a5e3af453e947e616881ad38c208c919ee28984dd74fd46e65374b719db2b190e9aa651065ed8801da0717be16bbad5fe188aa03090df
-MISC ChangeLog 5144 SHA256 2af24da7b69ff68a5a6bf942771ed3631d7971b0a49e1b55dfcee4bb14d3235b SHA512 405a6e08fe5a06425c90f7ee11aaece7f35a7b5083c4ba5c64520d6cbdabbc822ba26fc5b3e15dae0a3ca812459bab1298c28cdf6b83e18deb855efdc17a9e26 WHIRLPOOL 1d24420e09f057a5b5618a03f133d32b1b460acaa672772a67f3c6dc1f1d74f8ead23dd5c0be0c4c102a0173c54dc51c56c6dc497eace0e1570f32c19b3d184f
-MISC metadata.xml 1311 SHA256 4672019057812589e86d4cd9d59ccecb3f3aa0ad2b7ccb35cc33c53b8f7729a2 SHA512 08a2b35bb2adb32526404ab186130e52e8ec75e72027dc46406b9ac61839cb2ca59fbd4d6160baf04d9b0a8294c28304465ba6fd246b25664861339ab9eda8e2 WHIRLPOOL 725444c27e30f41f5dec79e8b94dfbffb121628289a1f885f166362a0d9f9adb0eaa40a00e0e5711f6d23e5a0993a2107ab7b1374feedd0e4f6dd05cfa9450c8
+EBUILD armadillo-4.650.4.ebuild 2984 SHA256 2ea5605e54a937f080403ec1d981bdcd93287551d3d4058100d1fe532692dd57 SHA512 2ffa03f59a2bab1f6e208495d573cc0f653c0990d761b13a395d8bd44503392e508fcd9faf766b10488a751ee9ecc24eb598a379c4a6e39f2011cf20b02eceb0 WHIRLPOOL 497c0a69028fcbe84b853c27a8908c4680a1269092de416b0208eb8d710b9ccb0fba8e37f051628106e3fa75956d50d84bff78601b1f320bda3cb66df374bc66
+MISC ChangeLog 5387 SHA256 9873418c72494a875c1481af99ba14193b14502868a0dc4843ca58ba4053c85d SHA512 61a73f3eac8aaa2426cd8f9b137d7f1b6316e6b1c178b6553d0fcbfa8575afdd9e3428322e22eb98c51acd0a3b5f7824bc6f093564ffa3ac54ee9d5f91c78310 WHIRLPOOL 0d7eff49ce7ba40d3848a70f33d0b517762b66897e487c8f9795529a9e1c8a1d39feea63c9533a52c141b89165dd8028ea4e383d9fb6a7bb43b787e87da10602
+MISC metadata.xml 1335 SHA256 166b398df7c716059c6ddd67a908c73161187481d2cc0680f46a8c6dd2c3219a SHA512 1d54fa2e642dc2e11e35e8146f0446a29c75ed5a7eb7c3a8038a5b48c663babd810450307ae7332bebe0040d079a8445f65b31bfbb45bcf49936adfbc84afdd2 WHIRLPOOL 472beadcb26d6572d8dc4b62d8e4e1188d46f4d63477687abda59a2ede3b9c2b03d6b942b2c1d8fd2fcda23899078377df72297ac87001213233c25e59df5dde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU8IHGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMkRCMDNGRDg4MkUwQTczOTgwMkE3RUEx
-RjU1NzRDRUExQkE5Mjk1AAoJEB9VdM6hupKVf4kP/AjqEiZQerjmzabKP1e3Nxo3
-J3+w3wHAaIi4SuTPVFLtVMgzb6KXrQefjLksaLbKtGczVZe35cf37QgqYrSb0Vjd
-iM9ne0i05pPV7sxseuH2Nu7xu6eUnLE86ch5QqyCex15Tjd9cmqer7n5nukUIUyb
-oG2RgoKJoe6SJuKjebyPFv0nZ9SP6gO397COlhrW9SBkXcREVO3aIDqiE8ru2BVh
-+CFS/11HFXTdyRPZi2azITkACmoLoFanMqJXiBEhcsI7rqhz63GuSyNKV/NF5wes
-8ouSkbpceQwp/U7UYLa2dxY2wp+Z62b0G0vhur6vZT0jgwXGCKPE5JdiV8WqLB44
-Q31BAEL5hixtgqDAV1aAvweUnt3ZagH9PjosIoXzRapONeE3XZQr01UwoEZOglbL
-QOQQdQ8xVB3B3O7lSfISDcLsM1SKsrMKOwz6qjJ9f2BN15Lnt0ALa6MY54Hbbii0
-64I1iwFbgAiwXLymwd4mDrLHP3F5eT9RJxQcN6mxZrn6tjtP5mHGRIt0G5PzQqvf
-wrfUV6zU8O3esVgJZnLNbNMOjKWNiP6pZcXZG6pfKjz15sT7FknJiHjADwB6k0cq
-BZc0ifFFaaeA+lDQzoEjrGnb/rN4wIORHzG+RHfUa1G1ySPB2tnbDnOU7OA+Hn/w
-a/1DLvl1laGyw+DDbZvw
-=AaRo
+iQJ8BAEBCgBmBQJVHohMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirp8gP/3PjIhgNk1z6Sw82QDSP51bk
+PMrcEFiYQQNmYvSR0I2Ab7LNaBcWVS+37tv7vnRwIMfTnjyFNkj3YQr1Crq/3mt0
+r3VBthyyOVGV/rLlEbPGo3EfvEtwnKMZR386GjZRVkNzWJRypo9U6pTO9HfbHYs5
+T+ml2TswP/rOuEiuWtybz1mkQkcPJsFnRiQzUNVD94NDFzIRlC81VcvkMwHQkqwm
+sAXVbi0WTkuPByEl+xtxLYsMFVCd96/84qyR4gMRDBMLn48+LAP8oYqIk0uuAAkE
+ZfH81n9eVRPJ5wczpbL18iJOmm6iBHJ1bkwmNTZBFykAxhWo2TPgKP5CICqIysSz
+KLxTaJxaybsNniT6oe8spRkkIRqjx+LGqyVuF0zJ7fDIgvAHGnfdKdtxEgkNJafd
+1Yeuv3aazz9S0f+KQBThR5XKEYWNJ89o69r3RNXf6CwX/JqJv2pwnWMcnJzgmBKQ
+QvBK3oH6YsliHSF5NhIywNwOC+kd8GQo21pf96sONb8lEHXx2agSM/uCEepP2B+/
+v9E4JsByZ1FL69lPvvDpldpkJCkLrWCqo36wV48gmmsvjwxlnfqT7lpntI1RmqDH
+B4bc3ZsBuq0U4aDNvqFs3Y/KA5GexP0rH1etODapfhX5owTz6A2snB5FlGddEPKu
+coemgmTBNAFp+fNvOSZA
+=l/6D
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild b/sci-libs/armadillo/armadillo-4.650.4.ebuild
new file mode 100644
index 000000000000..8d63e069bbae
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.650.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	atlas? ( sci-libs/atlas[lapack] )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )"
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	atlas? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+	tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+	# avoid the automagic cmake macros
+	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
+		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
+		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	fi
+	if use atlas; then
+		local c=atlas-cblas l=atlas-clapack
+		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+		mycmakeargs+=(
+			-DCBLAS_FOUND=ON
+			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+			-DCLAPACK_FOUND=ON
+			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+		)
+	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_FOUND=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README.txt
+	use doc && dodoc *pdf && dohtml *html
+	if use examples; then
+		insinto /usr/share/examples/${PF}
+		doins -r examples/*
+	fi
+}
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 95877e7a0397..8d0aed7cc2f6 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <maintainer>
+    <email>dilfridge@gentoo.org</email>
+  </maintainer>
+  <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
@@ -15,20 +17,20 @@
   need for temporaries. This is accomplished through recursive
   templates and template meta-programming.
 </longdescription>
-<use>
-  <flag name="atlas">
+  <use>
+    <flag name="atlas">
     Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
     clapack
   </flag>
-  <flag name="arpack">
+    <flag name="arpack">
     Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
   </flag>
-  <flag name='mkl'>
+    <flag name="mkl">
     Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
-  </flag> 
-  <flag name='tbb'>
+  </flag>
+    <flag name="tbb">
     Use matrix allocation from the Threads Building Blocks
     <pkg>dev-cpp/tbb</pkg>
-  </flag> 
-</use>
+  </flag>
+  </use>
 </pkgmetadata>