gentoo auto-resync : 30:07:2023 - 22:42:58

4 files changed, 5 insertions, 164 deletions

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 4123795dcaa4..340438358699 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,9 +1,7 @@
 AUX armadillo-11.4.0-extratests.patch 720 BLAKE2B 0024513a1ffa752d4cd32de926f1702aaf35f32ffebad8d1b859cab96819dd57075f0ff36e9917b91d10a408215aa815af5fa14adfa8449656d4a6333d9f7154 SHA512 b13fb2d2bd6b3de2c7d0ab423f1569302bcaa8fecc52a7f999068d445842f81ff9da846c9008c5abebe3613ccdc791e201eec0bfc931ce82664213bd06371241
 AUX armadillo-12.0.1-extratests.patch 743 BLAKE2B bd8bf0a2fd9ec52875804b92a86f2fe8a24e92008208071cd65bd78eb6fe92aac7add687be9455f276f8fd84f50208e2b6846f8c40cd521dd18e623284af94dd SHA512 de804fc620454ba41b859b4cc90583f25e82670f4f9c49dab27ac803529e024293e6254824eadafeb0b9c13a90696b9717aea338a672101c123e1f88493da113
-DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c
 DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195
-EBUILD armadillo-10.2.0-r1.ebuild 3486 BLAKE2B 1e0881133134ee033ee0a853687d57faa8dfd4ad487f73253d6f1565e9756fc4ab0c08036d7c973c499a76762413e05cd782e051fad11608b75012940d86947e SHA512 56f72e40cf88c609f40b68e2ba51b29c669f7a81844348b5fa664c985e115874c8fff4949c1345f876bbe49a83225a0ffd8f56428a74971a6e2c804f26ddea95
-EBUILD armadillo-11.4.0.ebuild 3582 BLAKE2B 64863be8a2e2d291db4bad9721946f75797a7aaa3d5ee51b586b92c567c523355f5657cf4bfdf96a636a15a95036fb84905c0aac2c90756ea9d8ec1ed25aef50 SHA512 e741698e48fc3c7ca97a38fe072fa5d1736122afcff8b6f574fceb0491b25e10030b649061278918593c0be7e7396294c128222886d5d35f24cffb14b374204e
-EBUILD armadillo-12.4.0.ebuild 3355 BLAKE2B 82f0f66a16ff9132876da8d40b0c875f222dc466571b8022941aa8ef39f21caa90abbaa54dc04add765867594dfe20089d9749ebdfe5579b69ff2fabda5a30df SHA512 965bf00799c20307cf64142571b246d02481fa5b9c909f156dccd266a5717818569b72eba61a325ae402412f7b700ff7b0df18eff66c7a1e833d11f1f4a51c80
+EBUILD armadillo-11.4.0.ebuild 3581 BLAKE2B e5eb2510115f93e08c6de5e33fa8168cce1449987ba066c76af682727a4dc4dd53722c241a7d5d347444550052b9c547f73d47c106f8efdc60e96797eb0c69e0 SHA512 ec11cf179311501c77eb6a3e80a52386b2122fe470e72508b88431bffd064dc494b2ba414b4ac7b3d42d0ff685d2b23dc602afc36988ac90e7fe7cd05f697643
+EBUILD armadillo-12.4.0-r1.ebuild 3283 BLAKE2B 191e86745a197bc7a09b6bc44d48b4a129c4d17c399fe2951fdc913b51b4606d6a4ad99a39b58a59b7f0e579374a4861f70fc92b0d4cd511e08849a96cb97968 SHA512 f96e6adfbc9a247a59c0ce7f7279a34d043e09bec346f1ca2df3ee0129c2bc5da1f3912ae57121ebabef917514ae8fc444d94fa7ca3d9f05021d6662e2467447
 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
diff --git a/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild b/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
deleted file mode 100644
index 916e16e01584..000000000000
--- a/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake toolchain-funcs multilib
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="https://arma.sourceforge.net"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas doc examples hdf5 lapack mkl superlu 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 )
-"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-"
-
-src_prepare() {
-	# 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_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	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+=(
-			-DDETECT_HDF5=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-			-DHDF5_INCLUDE_DIRS=/usr/include
-		)
-	else
-		mycmakeargs+=(
-			-DDETECT_HDF5=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_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_src_install
-
-	dodoc README.md
-	use doc && dodoc *pdf *html
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-11.4.0.ebuild b/sci-libs/armadillo/armadillo-11.4.0.ebuild
index 3265c57b5153..d515a111faaf 100644
--- a/sci-libs/armadillo/armadillo-11.4.0.ebuild
+++ b/sci-libs/armadillo/armadillo-11.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/11"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( arpack lapack superlu )"
diff --git a/sci-libs/armadillo/armadillo-12.4.0.ebuild b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild
index 40bee284647b..9fb4f093de64 100644
--- a/sci-libs/armadillo/armadillo-12.4.0.ebuild
+++ b/sci-libs/armadillo/armadillo-12.4.0-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
+EAPI=8
 
 inherit cmake toolchain-funcs multilib
 
@@ -19,23 +17,18 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( arpack lapack superlu )"
 
 #	atlas? ( sci-libs/atlas[lapack] )
-
 RDEPEND="
 	dev-libs/boost
 	arpack? ( sci-libs/arpack )
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
 	superlu? ( >=sci-libs/superlu-5.2 )
 "
-
 DEPEND="${RDEPEND}
 	arpack? ( virtual/pkgconfig )
 	blas? ( virtual/pkgconfig )
 	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-"
-PDEPEND="${RDEPEND}
-	mkl? ( sci-libs/mkl )
 "
 
 PATCHES=(