gentoo resync : 08.01.2021

4 files changed, 35 insertions, 97 deletions

diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index ccf61633c31d..9841fdaa7b53 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -4,9 +4,7 @@ AUX superlu-5.2.1-no-implicits.patch 4950 BLAKE2B 32a01cb343e21ee870fdfec54f3e52
 AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c092283b209665cb4dc5d3336f4b025f5145a190e76105b5e96f846e02fd4fe43a71b9542937beefe5e8b375b54ad87e05 SHA512 f22dcbaaa6857008b75b8c6481b219b11c09ebcfe2dffe0a4d4f0cba6392f18fc9a5a870b2a8efa7c31df321b78186cbde7cf8739da59dc089fa3b6ae836bf36
 AUX superlu-5.2.2-no-internal-blas.patch 733 BLAKE2B d289296570a02914591ed213e1c866124ae29f94348ca5cbfe9313dc581e12aba20fd34741b89b84988365c4c64b14c47d08b82c79870ab57f21dc8d0a0f6370 SHA512 496f5ed971cdd2dfaedf065d5ec52e0c6435506fcace45ed9059cb17d9ea1914cc9b0276b68a250728cc5bcf48a184bca5638e3fcadabd170eb1c8c9d342844c
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
-DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
-EBUILD superlu-4.3-r1.ebuild 1681 BLAKE2B 259f8829b31303e21aefab2d76d9ef3771dc0bae7418ce3b606cb6f1d457d567de517b0332067427f5cbbeea93d1ac42fa5da60b5337088f3412d3f7713a4775 SHA512 482387eb781140c1822979529cdbf83ef1b665d00cd246bab98bd70bd843bd65077bc97817e3c04ff073a44d8ed072af8ee69cb9804532b7137e6c6f9088e10b
-EBUILD superlu-5.2.1-r1.ebuild 1528 BLAKE2B f5da9af1ae76566415e0df6d5ec814bacd79639f073f6c6fa881957033affb589360bf26e035e07073dca4eaedb76b60368961308c0a97018a0be98e330477e0 SHA512 3b0a798b47be26a58e4a296895206623389c9ed5f4fca43b0582b75e5dfa0707734403d7a6b96ca448b13dbf793259f3015920c431e923dab59bce442e3db769
-EBUILD superlu-5.2.2.ebuild 1173 BLAKE2B a247b0de4dfd4e1afdae68e83a2a1f9f704eb4bcc7b4a18a77207a8b16a9a2d52d2b957f8bcdac5573a5c8d8d5eb9e1da65d3f538bc6dd12cde14a5c173bc479 SHA512 8d5c7e9e6b7c9a225d1fbefcf4940120b957363b5242d4ef4e4e500993418bf96ef124ece647d6336b8cdd51a66006069ef019d2a2f86651bb550bd2e6e79a60
+EBUILD superlu-4.3-r2.ebuild 1583 BLAKE2B f1eeb354d7a41826a980aee35707f1d3d6c15753cce38615f8f360b8feb1ab2efda9cc65b1d30e6e0513eba136adbff4113a0a6a4ca06139f19da8e45bddcbff SHA512 89562c3f9521cac172068a6185b6b2a8970c9f04f298587734cd360b41cba4d2072577bdc2afe68c2203fc6c8ce157448aa3a870bb6c63f12bad8bb35374c9e4
+EBUILD superlu-5.2.2.ebuild 1170 BLAKE2B 2c65c4428e1564385032efb8c6d40cceca3c0b64f5c56d4f44f11e5f92f4eb241dd15e4510eff40546557eb211dbd04d5b2c1235db997850f65d394705587d3b SHA512 1480bbac2e9beb3333cd4c4c569da6e3089b9e8ae823e8f770ad464994a741497e65f39068eae439c29e6ef5a3d466ad06695ddb0b29058de2f342ade16f6ce6
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 1c9edf1a9d4a..7ff9a6d2020e 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fortran-2 toolchain-funcs multilib
+inherit autotools fortran-2 toolchain-funcs
 
 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"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
+IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	virtual/blas"
-DEPEND="${RDEPEND}
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-S="${WORKDIR}/${MY_PN}_${PV}"
+	test? ( app-shells/tcsh )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-format-security.patch
-	)
+)
 
 src_prepare() {
 	unset VERBOSE
@@ -40,17 +37,22 @@ src_prepare() {
 		-e "s:= ranlib:= $(tc-getRANLIB):g" \
 		-i make.inc || die
 
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=( --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" )
-	autotools-utils_src_configure
+	local myeconfargs=(
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+	)
+
+	econf
+
 	rm EXAMPLE/*itersol1 || die
 }
 
 src_test() {
-	cd "${BUILD_DIR}"/TESTING
+	cd TESTING || die
 	emake -j1 \
 		CC="$(tc-getCC)" \
 		FORTRAN="$(tc-getFC)" \
@@ -65,10 +67,17 @@ src_test() {
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dodoc DOC/ug.pdf && dohtml DOC/html/*
+	default
+
+	if use doc; then
+		dodoc DOC/ug.pdf
+		dodoc DOC/html/*
+	fi
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
+		docinto examples
+		dodoc EXAMPLE FORTRAN
 	fi
+
+	find "${ED}" -name "*.a" -delete || die
 }
diff --git a/sci-libs/superlu/superlu-5.2.1-r1.ebuild b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
deleted file mode 100644
index 2f7f382cf88d..000000000000
--- a/sci-libs/superlu/superlu-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_STANDARD=77
-
-inherit cmake-utils fortran-2
-
-MY_PN=SuperLU
-
-if [[ ${PV} != *9999* ]]; then
-	inherit versionator
-	SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-	SLOT="0/$(get_major_version)"
-	S="${WORKDIR}/SuperLU_${PV}"
-else
-	inherit git-r3
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xiaoyeli/${PN}"
-	SLOT="0/9999"
-	KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
-LICENSE="BSD"
-
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-implicits.patch
-	"${FILESDIR}"/${P}-pkgconfig.patch
-)
-
-S="${WORKDIR}/${MY_PN}_${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# respect user's CFLAGS
-	sed -i -e 's/O3//' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/superlu"
-		-DBUILD_SHARED_LIBS=ON
-		-Denable_blaslib=OFF
-		-Denable_tests=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r DOC/html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
index e527066b1ec1..6753908584c6 100644
--- a/sci-libs/superlu/superlu-5.2.2.ebuild
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"