gentoo auto-resync : 25:08:2022 - 02:49:03

4 files changed, 95 insertions, 3 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5f3cee1d8a53..5eb821ba0854 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index ea71883e328e..1a4d8c1d8b99 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -2,7 +2,9 @@ AUX superlu-4.3-autotools.patch 17799 BLAKE2B 0676f8a5ca9019aaf047503fc9be675a8d
 AUX superlu-4.3-format-security.patch 178 BLAKE2B 3e4982f52d99c79054449822caf2edf37b325e7eb2a49312f4ead42cc733877325c01b63502c1ebf45006ba5b0875109e4d38f919e7ad9f1f99d502daf619deb SHA512 661211470c6e0cefed1c403592c308354331fa9bf8332b86da36284036ba4f98d904b0d510c27232f7b3d84306d182e172a9a2acdd4f4618fec893ca74d27455
 AUX superlu-5.2.2-no-internal-blas.patch 658 BLAKE2B 63c782d994b8caded0b707c2a26e614b935cc6a067cdd80cc29a4456d419ac20a2b7454f64c27c6dcafaba5eaa1fac1f957d2f78749e4209e73647346e2f62a9 SHA512 c0f5d203c7f764f3cc9e61a4d703cbbe66d0bb982412046af617be8935143026e8cc07d2fee2911d7e9cb7488bcdd32a26850b15eab4776f62a26f139066bb3c
 DIST superlu-5.3.0.tar.gz 2483070 BLAKE2B 2e877c12b698fae6649d3146d4a22a8c701df813d1fa037b7707081229de09e102660e75dd32138264ad9e01e5b3e820012106cd2b0d46cc2a1c37dc5eaafec2 SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83
+DIST superlu_4.3.new.tar.gz 2875951 BLAKE2B 4208edb7df0babc0bb7e21077c6e0a00a10766a2d01b2da47f05ecdb232ca3309a2bce00f2cd1b709a8c01b7de2276e4f7d63856ace2e93c3598f1cdcdc12712 SHA512 57799051c5cd394e4cb1b89481a4706ee0a21159f06941bab4a39dfe30f4b6ccdf67042c6ec2c479a12deee0ed26c3707069a5b53281fb26b6c752ca77102aad
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
-EBUILD superlu-4.3-r2.ebuild 1641 BLAKE2B b11715c747a425f2a7e04568a994ca9973c228b2f811423d7e502659ce6bcc723899645aaf883ed9ef9b3a696645d0263c92ba7ea988efc3a32d297498ac5f37 SHA512 0d667b80c3f443786fe0e8b6fb93c20617b0ac8a2c1393204bd1a0fb1d9a3b6612fc47af48a089e2e99daf728441e3fca07b0cc4404b249d761e188f678f5d76
+EBUILD superlu-4.3-r2.ebuild 1910 BLAKE2B fce2c967eb8119015e3ab27adf54fcda544769e6b685545c69203125e76e49e133ca0b6d6038df7e2f1c2f4f41875b38b7482f654313bf69f6c6235bf2ea200a SHA512 de867c03186036d6c12645adf8c484936e62e6e85c2fd5a3688d40a1b594d1864710a3f42ae08d46002a46dbfeef5fa4a6865af594669ff68be5738beefadf68
+EBUILD superlu-4.3-r3.ebuild 1727 BLAKE2B 3ed7e5656ba7ab422121df6e38c631e05e3f717b05c4b9b8414699304ffbefad0ec1940ce071b9a2fe7080c3032adba985cad8a5b5b503e574eed35dda55742f SHA512 57674e8175b17f5cbf7f1df09a07c7df13b0742aacaf92f002109d62451f0feb337a2dda973f44d40e98477c24b4314608a51bc5b8a55f0b20509fc5daa33045
 EBUILD superlu-5.3.0.ebuild 1203 BLAKE2B 60e6b3f75e90604e72e55e472d49106a1b71cacdd5076d8b8188f242611331251deb9e58f52a10993e0784f540e5959e2376c6b791e177000f222f73357f0995 SHA512 90ec5b62bf84763addaa8264458ebe576c80ec63c9852c17171c8daea57cb117b4913f3a38f6d921648a325e5249d3dde493aaa23a6c9ed1d4cae121bc2f3102
 MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad
diff --git a/sci-libs/superlu/superlu-4.3-r2.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index f4d198c2f6de..ed26d8d30dc2 100644
--- a/sci-libs/superlu/superlu-4.3-r2.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,11 @@ MY_PN=SuperLU
 
 DESCRIPTION="Sparse LU factorization library"
 HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
+#SRC_URI="https://portal.nersc.gov/project/sparse/${PN}/${PN}_${PV}.tar.gz"
+# Archive of weird franken-version which we used as 4.3 but upstream changed
+# the above tarball ^. The franken-version we used seemed to have 4.1 references in it?
+# bug #862597.
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}_${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
diff --git a/sci-libs/superlu/superlu-4.3-r3.ebuild b/sci-libs/superlu/superlu-4.3-r3.ebuild
new file mode 100644
index 000000000000..028c3d805d0c
--- /dev/null
+++ b/sci-libs/superlu/superlu-4.3-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2 multilib toolchain-funcs
+
+MY_PN=SuperLU
+
+DESCRIPTION="Sparse LU factorization library"
+HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+# See bug #862597 for .new, can drop on next version
+SRC_URI="https://portal.nersc.gov/project/sparse/${PN}/${PN}_${PV}.tar.gz -> ${PN}_${PV}.new.tar.gz"
+S="${WORKDIR}/${MY_PN}_${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( app-shells/tcsh )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_prepare() {
+	unset VERBOSE
+	sed \
+		-e "s:= ar:= $(tc-getAR):g" \
+		-e "s:= ranlib:= $(tc-getRANLIB):g" \
+		-i make.inc || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+	)
+
+	tc-export PKG_CONFIG
+
+	econf "${myeconfargs[@]}"
+
+	rm EXAMPLE/*itersol1 || die
+}
+
+src_test() {
+	cd TESTING || die
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		FORTRAN="$(tc-getFC)" \
+		LOADER="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		FFLAGS="${FFLAGS}" \
+		LOADOPTS="${LDFLAGS}" \
+		BLASLIB="$($(tc-getPKG_CONFIG) --libs blas)" \
+		SUPERLULIB="${S}/SRC/.libs/libsuperlu$(get_libname)" \
+		LD_LIBRARY_PATH="${S}/SRC/.libs" \
+		DYLD_LIBRARY_PATH="${S}/SRC/.libs"
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		dodoc DOC/ug.pdf
+		dodoc -r DOC/html/.
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r EXAMPLE FORTRAN
+	fi
+
+	find "${ED}" -name "*.a" -delete || die
+}