Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

3 files changed, 151 insertions, 2 deletions

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 62dad2b02203..4b00b3530250 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2015/05/21 15:47:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.36 2015/07/25 20:53:53 dilfridge Exp $
+
+*armadillo-5.200.2 (25 Jul 2015)
+
+  25 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +armadillo-5.200.2.ebuild:
+  Version bump
 
   21 May 2015; Andreas K. Hüttel <dilfridge@gentoo.org>
   -armadillo-4.600.4.ebuild, -armadillo-4.650.2.ebuild:
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 70e750a208c2..d9bec84fd12c 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,10 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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.650.4.tar.gz 5408567 SHA256 ccc56580ec932ec9beade5679b07ecbed889e9b602866f673d1a05a7692b4bf8 SHA512 a548150ba5484fce35b0bc6023982939946f2f00b733dff2cd5b46101b1c344342061389cb4363cdaa04c5e3cca3278a40febe2ed705316552dd71f841c46037 WHIRLPOOL 331493d8b9c92b9e1908880c6f6510edb12e93193a9ceb77d0b8ce9d0bfb493dc48e590ea949d39c3c19f6fc3b05446b7e00525512e3055be0f907427c28f7d4
 DIST armadillo-5.100.2.tar.gz 5429961 SHA256 63150f12bf7c7c598ea55b7271d99fce349ff386a3dc2cae3904b244f6e35320 SHA512 2777b525bc62daddfb16eae7b74c29b6b695a7985c56d9dca727ae1e13aa4ea20ee85ea82233a5310b37c738838af07bb0fa7eea782e68e72cbe1cf46a0cc896 WHIRLPOOL df85a508875587651b187520b78900634402f2ca0fc2e64f43bd4a793e382e8cc6abd5b988267645bb02b3133d9aa99ab6d6ff5e200d1277093d4f7ce6e9d240
+DIST armadillo-5.200.2.tar.gz 5430682 SHA256 70c38fd94b4c0559ece1a7313cf85e08197a82dfda4daa5decd89b795bb73079 SHA512 034539d724fd1e4078a709cd616d280178fcfdcb1d3c3ca2f80f5f2ebc4b39b60f11e3bd22773be8a8fd61350a406a6f4056d56f88ed74964f438bed0d224f6f WHIRLPOOL 4d9fb5a5e6ee53db666b7a9b0e437cf18763ba46224ac8425c7aafac4d4c68dbceb272f929ba034c4f738539ea6b52ccc0fdef596e100a226b85239ebd12470b
 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.650.4.ebuild 2926 SHA256 b979980a23aa99584e98f11733f9e35d9ebd02ecd1b049e4b95cdcf7d78f887c SHA512 9998675a6b8801fe053d8debaf98a1757ad1b4c3bb04ee4e42d5dacd6c4300a1be64ab71dcbb390c5d261ede7f60d52fcb0f70d8edd192f78b184090b59b1194 WHIRLPOOL 667f8f2ca6aebc8bf24eee767fcf5937c8d2cfba4a42493023f10f0eca7d1e4b8b98f2985c59cb38f367a75ebc8b5f28e3ae28b24661ece3b549e054dd1b6f08
 EBUILD armadillo-5.100.2.ebuild 3104 SHA256 b16b3af5da42e25db0faf4b8eaa476a7ffacd3b9fcde7349b2067f2bf389520f SHA512 fe0cceb9b206f81643ea9def1fb3245e54cc8f479a3e25a94ca84a3e9a36a4ac5cf7e02baf738b5f9c5a7ffdb0a8d13fad351cf42303a8532d176bb26dae271d WHIRLPOOL 1967c8803903e85e65e13efe8713c20a005ddde4f866c74bce56e00bf62b79822beea5800c20f2da0ea0c7fd1232f68750b4796195691070ec0505094ed7f775
-MISC ChangeLog 5949 SHA256 1d41d0576f1e54085fc7766098d5114dc7cbb8227e1de68412beaaf925e2b7c8 SHA512 c277d56ff690ef340f88fc11afa699bcecec86b6b0ce99399bd2e5332d0ea62fcad9bc84203f91ccad4b6d82cb15fcc587899b2c4cfc5103599c6dde14ef1892 WHIRLPOOL 9b1d0bdc400516ffa6f25940fa2a55cdde0748956db27447ae12448842ec6aa23c24175bdeeb81e711625e596258183027f826295522cb3b57cd52c15cee92c5
+EBUILD armadillo-5.200.2.ebuild 3104 SHA256 8c8b5d7bab9b957021d0e1fdb48026353aef5eef1d2eaff96f297e750a40f5d1 SHA512 b481607df57d3ac206181c873784860ae7423041ef42f11b133b1a16d350336e0e8cb4db85dc10d213569c9cddc3eb199f3568eb93ce6ed76f10cb0cfa801288 WHIRLPOOL 9f08b100407a00bb4b4e626baa047feb76a2ef47307ed685c8b153dd1539d8f00a7085348f05e8cb5db706d178f610b642bcad72a186d875462e37d46e320842
+MISC ChangeLog 6085 SHA256 cfd8a399f98caa1d78c453e8a836b79c3be357f8d0b9abb15dc6772fe0ab6810 SHA512 be8bde3cb27a985d1bd67e05dd3ccc29d3371e39a399605703662acf60ca63f87fec2c8fb8640efe9c6feb1544aca78c3836d1fc1eaa8b812e413d5d830734ad WHIRLPOOL cb0af4cf3c5d83cba0b3424ee31fdafb71fa47a6efea5dc5dfd3be9661d2e38aedb615d903fa8c1860e79b7cb8cdcb049c684e3796b7e880f892147b80e658d7
 MISC metadata.xml 1422 SHA256 2450ad823e534cd4d1554d7727b159daa2842e0b39fa8415fff96731102267ee SHA512 bc4df6c6f3d3eea4565e80c2a19a13110e91f9c234e0a223a9de0345fe328c7ed284aab896c593feb88c5527a5f891eddccb0885039f153706bf8bc2a06b5304 WHIRLPOOL e5ce5d292863abe2a54d7368d1878e6409abef6292e32d41dbe5b7c03c97dd82187e49c27df094f40ce2dc7136cd85dfaf11cdfc8e6e1ae5b5462d9411ccf0cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVs/dlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5Q3wP/2uOb8+s+e0u8/VRd3ArPt5F
+WNzIR6DifDDDfxajAG7GWm/in48Peu4YsJsj3ZS2AUOkQIJQavlroyVgXAvCTf80
++Zv5fnzoS3DFKsPUSZTfLMJu90CwzPcnulPa5RSDfHUUbb/4qDfJxMUWvtKKKSie
+kayzNo8yGhmWAauzqtvRVHvol2B8caQ7CCdEtRTKEPuGPCQfhL9+dIiZkiRjugCv
+Qb+DtEmPcbc416+x3uIWKdHW4uFWFI1GeCSQ5OurSgKSTmbW7WByf5NGzerVYB7L
+Ljh7n1Jcwz/pQU5G9dcc6g4ZxtTadmQDv99Zj/6xVW6KvbLZaM1nik87JhfiYc4w
+Wa9FfMuIczvZgmGff289gyMHD6O2LqX+HftEPqozgdKZBzrbQhjFpd9iXge9y4ig
+FThMElDsWsJn45y4la0m5DyOdRRh20VQ/oE+T9Fd+n/SG/eVfLazdSJVDOQzTLUc
+9EG6Ju1LDL5VxkmDTk0k6vrwpwPmdSWKiQ25cZiWM2dcvRqVfpP20fsqwaSXXv22
+Gtq7zb4QJtkDEka0BttKji6vJcUbzILbM3qTcOcDyXqxXeTxe2TwEuOgab7bw4si
+h5+UGevzUjW0z//qUeTRi3F4ylo0SxpF0KayBDHCqx/600PoTIxvWJgmyZHCMbLI
+rJhQ4I7QYFUZE4TIi/WY
+=VGzo
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/armadillo/armadillo-5.200.2.ebuild b/sci-libs/armadillo/armadillo-5.200.2.ebuild
new file mode 100644
index 000000000000..135d6297a05b
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-5.200.2.ebuild
@@ -0,0 +1,119 @@
+# 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-5.200.2.ebuild,v 1.1 2015/07/25 20:53:53 dilfridge 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/5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( sci-libs/superlu )
+"
+DEPEND="${RDEPEND}
+	arpack? ( 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
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+		)
+	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
+}