sci-libs/armadillo: Version bump

Package-Manager: portage-2.2.28

5 files changed, 11 insertions, 367 deletions

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index a150ed918..874b79ad8 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,4 +1 @@
-DIST armadillo-4.650.4.tar.gz 5408567 SHA256 ccc56580ec932ec9beade5679b07ecbed889e9b602866f673d1a05a7692b4bf8 SHA512 a548150ba5484fce35b0bc6023982939946f2f00b733dff2cd5b46101b1c344342061389cb4363cdaa04c5e3cca3278a40febe2ed705316552dd71f841c46037 WHIRLPOOL 331493d8b9c92b9e1908880c6f6510edb12e93193a9ceb77d0b8ce9d0bfb493dc48e590ea949d39c3c19f6fc3b05446b7e00525512e3055be0f907427c28f7d4
-DIST armadillo-5.600.2.tar.gz 5447327 SHA256 3a4e16f07dddd16313128eb1cab8e2f257d7461bde4a1d277c85181dcd6d1eda SHA512 68801cfcdb0cd9121a61da8d22f85f4fd781238e82b0304e7954a510e42be3da94a534b55640f912fca60c07c38828c3bab6aa4fb0328f73118ac18cd135e030 WHIRLPOOL 0e7dfff990526596fe05efe5280da0b7b60f3f2eecf98f81033b71ebaeb82fb7f243819ce7797ddcdf3290a7a810009caacaf69a1a31380bf2f013379a71917e
-DIST armadillo-6.200.5.tar.gz 5442061 SHA256 842f798be4ea2b24a8f429987d25e5b0e614e3be5a4213d76e85b7ec74faa283 SHA512 910f3a6a689fb6eee3dab16723f7d64190462e0838095fd43cc550a6bd2ae474405c4dd7571e791fb0c3ed77581163ae0cb8b1af814e125c8d298c48ffefcb21 WHIRLPOOL a517e8002b72f27902886a3aa6a0f87b70ddc99adf3f02c57b0933d1b04e19c71b03b5b8740c47a2473082252908e23acb4f5d021fee42b831ddcf0ad4a65e0c
-DIST armadillo-6.600.5.tar.gz 5461091 SHA256 6da5b32f5f2551815948bcfa5182b77b605607660d911b8f9f098f03e3cf7707 SHA512 61a7b916afaf4afcac944b05bb3dfad504fc410e2473034ef0290440df507e17744def7fb28b9917bbc2691a3749ee992201481124b62fcda2989c399ca1cb21 WHIRLPOOL d673563f0efc2c3071d1ce976d6f78994ed07af7ff1254d5258e94101b9f8dbaef28974643fb437aefecf414919be9c1d2ba8c0ed79dfb7ea242015315f5bb10
+DIST armadillo-6.700.5.tar.gz 5470242 SHA256 d5817a8ff07da3bd8753b1e037ef39e7a6c81d88bb7119a2a8e6c3dc93b48db1 SHA512 1472056a809cc9f79c4e235c871253c689aa359c05efb158c98c8816b9ce7e4997e17bdaf6965711b3d1cc408d2ca74e1d438dcc5aa08cd322b352935f75887d WHIRLPOOL 803f7f02a726dc6ace0b980aac1503509d0d741e4794f1a8578e5c8d9665038007ae8841e1c59f8d63002ea91cd86139e22b6d64d3f2317929adf239bba8808b
diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild b/sci-libs/armadillo/armadillo-4.650.4.ebuild
deleted file mode 100644
index 646ded787..000000000
--- a/sci-libs/armadillo/armadillo-4.650.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/armadillo-5.600.2.ebuild b/sci-libs/armadillo/armadillo-5.600.2.ebuild
deleted file mode 100644
index 6682a815d..000000000
--- a/sci-libs/armadillo/armadillo-5.600.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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
-	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
-}
diff --git a/sci-libs/armadillo/armadillo-6.600.5.ebuild b/sci-libs/armadillo/armadillo-6.600.5.ebuild
deleted file mode 100644
index aba1f7b75..000000000
--- a/sci-libs/armadillo/armadillo-6.600.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 )
-	superlu? ( sci-libs/superlu )
-"
-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
-	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
-}
diff --git a/sci-libs/armadillo/armadillo-6.200.5.ebuild b/sci-libs/armadillo/armadillo-6.700.5.ebuild
index aba1f7b75..e01555a18 100644
--- a/sci-libs/armadillo/armadillo-6.200.5.ebuild
+++ b/sci-libs/armadillo/armadillo-6.700.5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit cmake-utils toolchain-funcs multilib eutils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Streamlined C++ linear algebra library"
 HOMEPAGE="http://arma.sourceforge.net/"
@@ -48,9 +48,9 @@ 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)
+		-DARMA_EXTRA_DEBUG="$(usex debug)"
+		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
+		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
 	)
 	if use arpack; then
 		mycmakeargs+=(
@@ -93,6 +93,7 @@ src_configure() {
 		mycmakeargs+=(
 			-DSuperLU_FOUND=ON
 			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
 		)
 	fi
 
@@ -102,10 +103,10 @@ src_configure() {
 src_test() {
 	pushd examples > /dev/null
 	emake \
+		CXX="$(tc-getCXX)" \
 		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+		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
 }
@@ -113,7 +114,7 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
+	use doc && dodoc *pdf *html
 	if use examples; then
 		insinto /usr/share/examples/${PF}
 		doins -r examples/*