gentoo auto-resync : 04:10:2022 - 01:15:40

4 files changed, 171 insertions, 0 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7fa64a1a572a..a7ca1b78c305 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 536ccb209497..5c3a7c295cb2 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,7 +1,10 @@
+AUX armadillo-11.4.0-extratests.patch 720 BLAKE2B 0024513a1ffa752d4cd32de926f1702aaf35f32ffebad8d1b859cab96819dd57075f0ff36e9917b91d10a408215aa815af5fa14adfa8449656d4a6333d9f7154 SHA512 b13fb2d2bd6b3de2c7d0ab423f1569302bcaa8fecc52a7f999068d445842f81ff9da846c9008c5abebe3613ccdc791e201eec0bfc931ce82664213bd06371241
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-10.7.1.tar.xz 6258792 BLAKE2B cc820638dd7b571b5654e14bb82ced3586cb2950b1fb5aebf6bdd9439151353c4750296aaa4d15144ade6ed13e52743ac41e3cf34b824809931c3c031804bddf SHA512 b9be6a38165a4d23a61715a3c3f970dcb9b813bebd51b7372a4e8349ab2c351cd5c74f662d860911b30b2b816f2eb1255768fab1497ec087a63a07f56f74327f
 DIST armadillo-10.8.2.tar.xz 6262832 BLAKE2B f8a5a66464614661bcccffb8138434d117ad07dcea5f89ddde45df293df5dd4f10def2085b85d37386337fd8bd0152914a957e0b1b7919a47ec8b1a79e92b90b SHA512 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b
+DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c
 EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B 1fe0375dd7c2e12d9698301d64506dab980fc772e45113375cdd1b8de4760545c8530f1b9ae83b53aa25d9b85e8127e046c7e5cc77e4d485383eb4bb4bf5e8e1 SHA512 09bcd99b2d3cca9519cf6e7236f9eef292995aacde116f71539d3e54c016f74e0f3584079bcbfd44bd30820ed6b9cb76433fe19a5a82c5673db0015950ae8650
 EBUILD armadillo-10.7.1.ebuild 3495 BLAKE2B e22dcf3555f066406eb908e430b39a96640b5774adf2265d8b52d6e9af1d605a26db8c5d448a9559fabbbcdc77ad37bd832d55e90f926a4abfad50d8a5a68ebf SHA512 573eeaed666e2270bf56954945359dd57825c389e715480cd1f93d83cb88a5841d2957bfe77727cc88b5e6b93a452304c7d8712a293f5f4cb04cab93991686ec
 EBUILD armadillo-10.8.2.ebuild 3499 BLAKE2B 00e6e808c90c200b8b2ddcab11a0543eef54410981aa39e4865ece24cbac31392170f35e8404b14797ff1cb9009dc932c76a0d0f39214e2e1aaed0efa22b6bbc SHA512 a777236588de6a82de8f7131b20678e1cdda967347507daaa729bc57444ee2c7070f0fbf9a86d43854a0ca614b98b83309c3b06b8e267031c9e33d3cc166fca8
+EBUILD armadillo-11.4.0.ebuild 3583 BLAKE2B 4d29887c00f633b384989ff3a483d50cbded80c0488c9db83d1485cd349690225478bc79c1bfe7d72b9b667314906dca2f10293a3a3c7d529622e7246689cb7f SHA512 f62d31e75a08d5e8142f97c3aa4078b759c890c07f12acd111801200d3c95d9b3ce3cf1cfe808d1a7065334e597827d2c1af9151f7d4a976fc60d57d905a93e5
 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
diff --git a/sci-libs/armadillo/armadillo-11.4.0.ebuild b/sci-libs/armadillo/armadillo-11.4.0.ebuild
new file mode 100644
index 000000000000..415194976a72
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-11.4.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 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="http://arma.sourceforge.net/"
+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"
+IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+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 )
+	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 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-extratests.patch"
+)
+
+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() {
+	cmake_src_test || die
+
+	pushd tests2 > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXX_FLAGS="-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}" ./main || 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/files/armadillo-11.4.0-extratests.patch b/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch
new file mode 100644
index 000000000000..7efb67b5b139
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-11.4.0-extratests.patch
@@ -0,0 +1,12 @@
+diff -ruN armadillo-11.4.0.orig/tests2/Makefile armadillo-11.4.0/tests2/Makefile
+--- armadillo-11.4.0.orig/tests2/Makefile	2022-10-03 19:26:59.699937940 +0200
++++ armadillo-11.4.0/tests2/Makefile	2022-10-03 19:27:24.954277418 +0200
+@@ -3,7 +3,7 @@
+ #LIB_FLAGS = -lblas -llapack 
+ #LIB_FLAGS = -lopenblas -llapack 
+ 
+-CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0
++#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fopenmp
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=bounds -fsanitize=bounds-strict -g