gentoo resync : 20.03.2021

2 files changed, 34 insertions, 39 deletions

diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 75089a90aa5f..f3d595df1ad2 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-doc.patch 534 BLAKE2B b4b41b83913efb5e92eeb6c92d4db04129e795a17c5749d8b031452a4808d72c66f90b7499e13a795e386c315e9f717f88540987b262c22efac52318261a83ec SHA512 388855f15bd17f5bc42ea3dc1d76d338a5586ed6cdb005442d46d158d36a1ffd32c2b08f10f992de30c44c1f160c005ef7499b6c2a629a0e7fab93f59d15bf65
 AUX 1.5-linking.patch 6247 BLAKE2B a50a4bc8a7c28f3e140ba8d241fcc9d9bf02becf13dd3ef50fbf6e06af3444c5135309d9f4026826b228a62fb531d4f62bb9b8ebddd4df43233b56f41bfd3a53 SHA512 d7b8f8f99a2d26cb3e0cace7f31c72eff997786fcdca4a80e81493f7e255df0975743870543881348814d777507a96f328bacb1115fdc118c848a3a0be4c833f
 DIST punc-1.5.tar.gz 7036275 BLAKE2B aa87b824c3426b5573cf1c40575901cea079e4c244565015b39b52adff74424e49086146cd518acb54594545650340a32a0c8438c9add28c5737253d49091093 SHA512 8b454f5de9cd01e87a30083f975ce8901c5d5a2cac7256cb535c8698221ce6d1ddb93a3663b2e903e5cae93ef76b48932ff7f13a816ba7da6bb07ea25490503b
-EBUILD punc-1.5.ebuild 2180 BLAKE2B 3482c1f766fd8f7c7d94a113505f7bc0c6ebdd62d63636d6c89d6e4600c990e24ad74ceb1cd97f907adb5f65d0568329018880ee0da953aefc230d8418bb4011 SHA512 5d292598e039484b5056ba8fd2b53c8b9d458b970c48f233983927b5d96444a254663e43f11d2302bf394a74106d8fbb43ee6c6fbbd14beed41fba617cde184c
+EBUILD punc-1.5.ebuild 2090 BLAKE2B c8e9ea8ec9f2e9d2c123bb8e2981028b567dbc409cdae50f5d7c142809ff1018777f016355e8e65509805f2475846c37e003e3ba20cd4f95767ff7d4fff5c966 SHA512 9bdbdc1d6530c7adb7537d11d14e4113d7b052e3b0af476df1e5b1ef91ef0862ab6b31f62d9cad04d5fedaffc5784426348d034bae730c4159a4769d3f37f50d
 MISC metadata.xml 1312 BLAKE2B 5c6e3b41ca6408bff95d2809770f26e49067bce57a7168041884f17d97de10f22a17ce1726207875a077f3a30192e36dd02b7409c0f23fdd1fc7e4bd682a5433 SHA512 60b0a248a1dfd45b1f0668292740776c750e510ff707bd1c4d35d27b84c20693006f93fa1bb755552012eeed69b7bd37587ea0fbe75d0668d21b14cbf8be61e1
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index ccf2b1cc1733..2bb21a1e7e5a 100644
--- a/sci-libs/punc/punc-1.5.ebuild
+++ b/sci-libs/punc/punc-1.5.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils fortran-2 multilib toolchain-funcs
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Portable Understructure for Numerical Computing"
 HOMEPAGE="http://fetk.org/codes/punc/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc mpi static-libs"
+IUSE="debug doc mpi"
 
 RDEPEND="
 	dev-libs/maloc[mpi=]
@@ -27,64 +26,60 @@ RDEPEND="
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
-		app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
+		app-doc/doxygen
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-linking.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+)
 
 src_prepare() {
 	sed 's:punc/slu_ddefs.h:superlu/slu_ddefs.h:g' src/superlu/punc/vsuperlu.h > vsuperlu.h || die
 	sed 's:punc/umfpack.h:umfpack.h:g' src/umfpack/punc/vumfpack.h > vumfpack.h || die
-	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
+	rm -r src/{amd,blas,lapack,arpack,superlu,umfpack} || die
 
-	cp tools/tests/pmg/*.f src/pmg/ -f || die
-	cp tools/tests/pmg/*.c src/pmg/ -f || die
+	cp -f tools/tests/pmg/*.f src/pmg/ || die
+	cp -f tools/tests/pmg/*.c src/pmg/ || die
 	cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h || die
 
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myeconfargs
-
-	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
+	export FETK_INCLUDE="${ESYSROOT}"/usr/include
+	export FETK_LIBRARY="${ESYSROOT}"/usr/$(get_libdir)
 
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
 	export FETK_LAPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs lapack)"
-	export FETK_BLAS_LIBRARY="${fetk_lib}"
+	export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
 	export FETK_SUPERLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-	export FETK_ARPACK_LIBRARY="${fetk_lib}"
-	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
-	export FETK_CGCODE_LIBRARY="${fetk_lib}"
-	export FETK_AMD_LIBRARY="${fetk_lib}"
-
-	myeconfargs+=(
+	export FETK_ARPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_UMFPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_CGCODE_LIBRARY="${FETK_LIBRARY}"
+	export FETK_AMD_LIBRARY="${FETK_LIBRARY}"
+
+	econf \
+		--enable-vf2cforce \
+		--disable-static \
+		--disable-triplet \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen '') \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot '') \
 		$(use_enable debug vdebug)
-		--enable-vf2cforce
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-		)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	HTML_DOCS=( doc/index.html )
+	default
 
 	insinto /usr/include/punc
 	doins v*.h
 
-	dohtml doc/index.html
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }