gentoo resync : 20.03.2021

2 files changed, 31 insertions, 30 deletions

diff --git a/sci-libs/gamer/Manifest b/sci-libs/gamer/Manifest
index 960a13ea3b97..2ce306c4c803 100644
--- a/sci-libs/gamer/Manifest
+++ b/sci-libs/gamer/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-doc.patch 535 BLAKE2B efbd055c70928d01a9ba68943231aeb490dbe4ff412b205d8ef80dbae7a64f1bc6536adce9421f15848adae0c4af020c8b3feef9aa2bc7b09738de299d91c0c2 SHA512 639f0e80eb116c77d723f707488cd66124f1eaefa2f74c2fff80152ce0cf7f17b9c334f33500eeb0f78f11b0574bb20945dcd9718b1ef5e9a149ccce07981228
 AUX 1.4-multilib.patch 872 BLAKE2B 49618dbcb651bc9e307decdb778a3ea5c9345d09c58b1a407a28e821eea419411cbbd79e2357d1f93f4f0b9d927747d31464f83286b96cd70f4e93f229482dd1 SHA512 44ac7731277c47b822bbcac11b62d62e397c539d7a9dd32c805ee656ecc2cc4cad2878082212abded212419bf609823c21f9d351ad828a07357c9b2900c112e9
 DIST gamer-1.5.tar.gz 4232061 BLAKE2B d2cc861a3529678cd2c17bc6e333c99d2e155697ea935d91e1d2be65fa392e0a27b491eb102f5fb623c90a611d927482d8064a134124c1ecb20d7aa41060d64c SHA512 4911b208ae5cd7be7ef165bac8fc9680ff03c0936881ae3d162205df9ef4f3fb176455e27b2f4ca202c3129352156cf5166b1d7d99fde7b281b404e383f72a44
-EBUILD gamer-1.5-r2.ebuild 1046 BLAKE2B a525052a35c5410754041dc3c9cf0bb6a794d9310313be346b4b653a0f0eb26b515bb12c271de7318b938fda7ae2d1d8d59768cfe3cdeb5e766f0b797cb5d2d4 SHA512 121137d107e05365205df6162b3908445c0cac4cb481ed15fde1522c96753dc1fe07f7b4f710063dc9b9146976752661b329f28176900debfd7779a4afdf2a50
+EBUILD gamer-1.5-r2.ebuild 1001 BLAKE2B c6b37f1c70c4f18247256b07d10430081b0ce0219b3c6735e52b470547fb88adbb761cca84908617ececce9eee092f84bc0292c963d3df3fbda0d124f08c1a61 SHA512 e9f153886cd4d5594b0c9406eb08569247ed2fc7f88979f5c71119e88ef8815123d9a27a882aa8933a7ece9e4e5c33b70bf95dba7c1fa1966b4b67b4653ac7e8
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild
index 23cbb8033662..e8fc10d94826 100644
--- a/sci-libs/gamer/gamer-1.5-r2.ebuild
+++ b/sci-libs/gamer/gamer-1.5-r2.ebuild
@@ -1,51 +1,52 @@
-# 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 multilib
+inherit autotools
 
 DESCRIPTION="Geometry-preserving Adaptive MeshER"
 HOMEPAGE="http://fetk.org/codes/gamer/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"
-LICENSE="GPL-2"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND=">=dev-libs/maloc-1.4"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		media-gfx/graphviz
 		app-doc/doxygen
-		)"
-
-S="${WORKDIR}"/${PN}
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/1.4-multilib.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	local fetk_include
-	local fetk_lib
-	local myeconfargs
-
-	use doc || myeconfargs+=( ${myconf} --with-doxygen= --with-dot= )
-
-	fetk_include="${EPREFIX}"/usr/include
-	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
-	export FETK_INCLUDE="${fetk_include}"
-	export FETK_LIBRARY="${fetk_lib}"
-
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-		)
-	autotools-utils_src_configure
+	export FETK_INCLUDE="${ESYSROOT}"/usr/include
+	export FETK_LIBRARY="${ESYSROOT}"/usr/$(get_libdir)
+
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen '') \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot '')
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }