gentoo resync : 15.01.2020

3 files changed, 12 insertions, 157 deletions

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 97070b504cbc..07eb8959fc85 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,7 +1,5 @@
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
-DIST armadillo-9.200.5.tar.xz 4786264 BLAKE2B 3ac5e7e50c82927ba311860915d65426e5b71e6235a041b949166e02aa50dd50a6c32d34d44761052829471ce66df9a4a9a495e1da18deff2abfbd8d67b72d0f SHA512 31110ac0d9ef9e6cf6fcf97a846ad4bb7545aa2d16fc847d85d481d605942af62994562ba8b083d76b051002d6693c966ee4b4ad398711fe1d68d31bf12daea2
-DIST armadillo-9.200.6.tar.xz 4786904 BLAKE2B 4cd6245476b674ea325037fed4b9d613be399036328b72616631b26fec7b0d3d30a788689312d0c8f4bc8ce2041454ce5ff129523f1e3ef25de16c0668d7c958 SHA512 9375a5d8414ec6d34dfa07faa472ca8c56a0ed62761d6bdcb2c584f255fc212fadf00e5380e7b10e67836b93d17e609fe6714a7b233b6f0e5d9355ff504a15fd
+DIST armadillo-9.800.3.tar.xz 4716468 BLAKE2B 4909cbcf1f8d6aedb366bb9b21784e865d9e68a3c833263d1c1df942e96ef679e31191ea9dbd8bcddab6086bd26c80915546c29dfdd16188f0d9e865e7b3c03f SHA512 6088f7254c54067421fcc0b69751c6d37ffe484474ab5955755fa5b3dd38ed4246e353701fb614c820d192675ec75f134e3bbb511a70612e4fbf133a89cacc21
 EBUILD armadillo-8.300.2.ebuild 3400 BLAKE2B 477f6db643c60d915b556574868181bf6b5613c0c6f99ac42f31440aa6ade6447e82f7e241103cfdc6a848223d6dd5dcd170dabecd429535ab7724fec68d6eaf SHA512 096f51d270472bbed4ebcce4bf899644966d31154ce18eacc8c77d70afd6e9ad31d8e02435a0e7413005dfb1a2a844f402169c1cf4457b98ba0d760daa763d37
-EBUILD armadillo-9.200.5.ebuild 3402 BLAKE2B affbe6320c75eb7886cddccee2d3bf83e0ccd2b02c62b8b87c946a51dc7f52aad1056be37b887e0d2a7990058a721f7fa0e3f68cb06c2d3991e84b021f39d7f5 SHA512 4b6d259019bb1206662ccf9923096b5d5706201a96ad81a083255ae0e3eea5c7640f85b00545caa33f216d7e40f56888c909808ea698a18d4d1ec6684475051c
-EBUILD armadillo-9.200.6.ebuild 3303 BLAKE2B 251b23369d0fe2fbec7fb5cc19edfb23e0a943e112e1515cb96b40383ac3a9df0498cef070881f64781ecc7c8d91edfb2cb5b1408036ee61ec32db6987b6fce0 SHA512 cda23095ffa2067fafd082d22083db52766ba1b1caf03ab7d927b0dc525e07332efa2a6d5383c280f6bdd695273bf31af505ddd4e4e2820acc5f2eb1d387bbd1
+EBUILD armadillo-9.800.3.ebuild 3499 BLAKE2B 5cb98f75d176cfaa1ab2a84271730f710867a96df908de0235ec0422426a881d57880b0679e724c84741f6ce172b392c6ec993e1685a0b5279c835b7ea3996e2 SHA512 d4d0659690847d5287697b1514b4839cec662ed9d8f185f4e6e9dd529a1b26e4c9417203d62ddafcbe885ea5b6b38e9a8f8160e9904bffe3832f556a4ed39b6f
 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71
diff --git a/sci-libs/armadillo/armadillo-9.200.5.ebuild b/sci-libs/armadillo/armadillo-9.200.5.ebuild
deleted file mode 100644
index 06e6051e9208..000000000000
--- a/sci-libs/armadillo/armadillo-9.200.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-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)"
-		-DARMA_EXTRA_DEBUG="$(usex debug)"
-		-DARMA_USE_MKL_ALLOC="$(usex mkl)"
-		-DARMA_USE_TBB_ALLOC="$(usex tbb)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	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)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	use doc && dodoc *pdf *html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-9.200.6.ebuild b/sci-libs/armadillo/armadillo-9.800.3.ebuild
index eb5ccd3061d2..ac58225faa5a 100644
--- a/sci-libs/armadillo/armadillo-9.200.6.ebuild
+++ b/sci-libs/armadillo/armadillo-9.800.3.ebuild
@@ -41,8 +41,14 @@ PDEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
 	cmake-utils_src_prepare
 }
 
@@ -50,11 +56,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	if ! use mkl; then
-		mycmakeargs+=(
-			-DMKL_FOUND=OFF
-		)
-	fi
 	if use arpack; then
 		mycmakeargs+=(
 			-DARPACK_FOUND=ON
@@ -139,8 +140,8 @@ src_install() {
 	dodoc README.md
 	use doc && dodoc *pdf *html
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r examples/*
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }