gentoo auto-resync : 02:04:2023 - 17:18:27

3 files changed, 171 insertions, 0 deletions

diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index d208ce9d0424..cc549f2f59c7 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,10 +1,13 @@
 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-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
+DIST armadillo-12.0.1.tar.xz 6802568 BLAKE2B c6025fe3bcabfa6d08efd864c4b9b129c84e8941b7cb237b76ed83f74062c06cdbb98bdf09796f3340fbdbb37a36f82826a53e778dbc589af9e868a2348bd7f3 SHA512 b1b9fbce6bdacc3340ab190605aba77e821629e0a51e0c6277840eaf803d037a778b9243c02c5b55d67976c203808a5fc34894f3928b707685f6d8695ef0bc0d
 EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B e1a181c2e739faeef970e959d17450a6ab4d0755ef61da1ace1eac3cd1e295003ae60c90b2918b6d1df929f0e0a682645d676a922801218849309d05dfd1044a SHA512 27ce46b12b04a19923e3bc2c0523fb3b4abd4a70be5c072c654502604e9555b58ec54a9bd60c5e0452f5f2c6b262e72c538c804c46229ea32657f6caba75dd91
 EBUILD armadillo-10.7.1.ebuild 3495 BLAKE2B 4ba34c7c803f654353b2095ee2c7ea63776ce9783015fa78a3740506d050da7d1184977e9db4d264ba821b1d775ca63896b8b1351cfae59ee0d1ef1823cc71b7 SHA512 a7ff985875caba20e1dbeaeaeb9edc49e9aab10d8fe193cf18510ec924f90bb1f14d88cff3a26558b326fd5ae8122ccf2b70b6cc46f5e4c10818a9e7e92393e1
 EBUILD armadillo-10.8.2.ebuild 3497 BLAKE2B a126ddefbc2f42ac48118a8f7193a1d64982f9f3784366b6c9246b34aeddb5c21c4041918da311f5acedb2912a9712ffc8f19d12e58a35091e1ab1bfae783fae SHA512 f958cd7c822a327b1c88afe4010bef5071a573e71324fce392f137726c56078ffa10c1fbdffb9c1bca4d5912b3ba58c75242aefd66e8751efa804e3f19bce730
 EBUILD armadillo-11.4.0.ebuild 3583 BLAKE2B 14ebbb0d13a2e739ff18bfda2b6b46fce4bf934c860b8881c3e869ec771aea5727780eac33488d5dc9066edfd6fb0deaa80c80bf97b08cec237569fe4ed7cc62 SHA512 a3049b2052fdd340891db090bb3234d1cb1611b49ecc4f13336d174ee9fe5f6315fc2c2219f5ca966231a80b678edec71dbaa6dc87290abcb4dbc0ef48ed8b29
+EBUILD armadillo-12.0.1.ebuild 3583 BLAKE2B 4ebac0def757818a94be154546afd2987e78cfaa7fc1b016c74a52dd23323a3c49e1fd6b8f2afa0d8304f5c7164f8f434ee054ba69863412de076d87a0d433d4 SHA512 8fc47ab9a6aec9a504c5d512f102c915995c58daa192fbbef50b514ddde4660bc1a820277d598f7f996cf9e271928ff684f2dbbb4dc8a62953d8ff3f0a36c0c9
 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
diff --git a/sci-libs/armadillo/armadillo-12.0.1.ebuild b/sci-libs/armadillo/armadillo-12.0.1.ebuild
new file mode 100644
index 000000000000..a1399cb8445a
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-12.0.1.ebuild
@@ -0,0 +1,156 @@
+# 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/12"
+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-12.0.1-extratests.patch b/sci-libs/armadillo/files/armadillo-12.0.1-extratests.patch
new file mode 100644
index 000000000000..e677c4ab3069
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-12.0.1-extratests.patch
@@ -0,0 +1,12 @@
+diff -ruN armadillo-12.0.1.orig/tests2/Makefile armadillo-12.0.1/tests2/Makefile
+--- armadillo-12.0.1.orig/tests2/Makefile	2016-06-16 18:26:01.000000000 +0200
++++ armadillo-12.0.1/tests2/Makefile	2023-04-02 16:32:47.256287438 +0200
+@@ -4,7 +4,7 @@
+ #LIB_FLAGS = -lopenblas -llapack 
+ 
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0
+-CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og
++#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og -fopenmp
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og -DARMA_DONT_USE_WRAPPER
+ #CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -Og -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=bounds -fsanitize=bounds-strict -g