From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 20 Mar 2021 14:27:17 +0000
Subject: gentoo resync : 20.03.2021

---
 sci-libs/mc/Manifest      |  2 +-
 sci-libs/mc/mc-1.5.ebuild | 76 +++++++++++++++++++++++------------------------
 2 files changed, 38 insertions(+), 40 deletions(-)

(limited to 'sci-libs/mc')

diff --git a/sci-libs/mc/Manifest b/sci-libs/mc/Manifest
index 0f61b777851f..5b6c22f377a8 100644
--- a/sci-libs/mc/Manifest
+++ b/sci-libs/mc/Manifest
@@ -4,5 +4,5 @@ AUX 1.4-overflow.patch 426 BLAKE2B 36d988eb5eab0160983cd9120ec390371b6905aca6b1a
 AUX 1.4-superlu.patch 695 BLAKE2B a3cacc3a95a690d79c69885e69157cf8cf43550082971c5f454ea9d0c614b091645eb0010ea0491647ac59475f6788cdfa65732520f51345a8a5d4f2b276a43b SHA512 9ada97571a91a8b4d832c61e373c2f64267ed4f0730a4e8543f388167daafe8800ed95e74e143d1644019f934b1e5b6b658b5ee639e97a01ad0a78bfe653296b
 AUX mc-1.5-unbundle.patch 1825 BLAKE2B f77f91126b87e2430d1ed12b8f5f08229327fa26de52eeadb67a9bb6f0a791e7f64c612bc31dbc7fd9d2c973163630a4944529a46818f43d02912ddc0c3b7a22 SHA512 45565bd8ffd7525798f21f878c9d4f34c46dd198d40fa475d00bdf1461a2ae6372e836bef59f2686a9af52d31a3b061e43868fdc6a7da17838316294ba689d92
 DIST mc-1.5.tar.gz 18140539 BLAKE2B a58277b6755a43c0f9a9d67789c2fe28858580babfd4251d5d9223fffec43ead47d3dab9cda3c739309b9f18bc7bf558d7974a5189194a4bc92f72e857d81f1a SHA512 6db79c677b1a326ea50c78a07b8cc088eb5e23e9d8821a3a3802017e9e8d4011307ba024d3354dc24cb31d822da2023a150787a137b7806f6344b0834e7f194b
-EBUILD mc-1.5.ebuild 1930 BLAKE2B 91ae9d0e432b72d555a66b39b94d3a83bfff189904e5d9b5e2936f8011a0cbb1451291113d0a0c1f66df1ee649bbee956f047d38d981f1b0ed97b4b21585b05b SHA512 cc1530fc862fc93fa7932cc6df5f11ca9d6a99a262cab50beaf0eba325666e079529424370b4b80ed7f8dc31826b92458eb17fbdbe53491e5d40a0b19bb662cb
+EBUILD mc-1.5.ebuild 1873 BLAKE2B e41832415319ba09da0d32c0f879467f56d38f16564bdda9eda9649ec05e1981bd5d919c33085f9feb786d4132812f2f836dfc136a6aa0ae48cbc29a554d5433 SHA512 3c843373fdea84085116d8d63e015ab8107a49ec83f00e37acf2ab7fa027ab57c61660616709dfd21ef1f0d9175cd3d84ae2c95b437556b2cd03b7c27334547f
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild
index 788d5bfc75d4..faecf71d6cfb 100644
--- a/sci-libs/mc/mc-1.5.ebuild
+++ b/sci-libs/mc/mc-1.5.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils fortran-2 multilib
+inherit autotools fortran-2
 
 DESCRIPTION="2D/3D AFEM code for nonlinear geometric PDE"
 HOMEPAGE="http://fetk.org/codes/mc/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="debug doc static-libs"
+IUSE="debug doc"
 
 RDEPEND="
 	dev-libs/maloc
@@ -26,14 +25,12 @@ RDEPEND="
 	sci-libs/umfpack
 	virtual/blas
 	virtual/lapack"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		media-gfx/graphviz
 		app-doc/doxygen
-		)"
-
-S="${WORKDIR}"/${PN}
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/1.4-superlu.patch
@@ -41,7 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/1.4-multilib.patch
 	"${FILESDIR}"/1.4-doc.patch
 	"${FILESDIR}"/${P}-unbundle.patch
-	)
+)
 
 src_prepare() {
 	sed \
@@ -49,36 +46,37 @@ src_prepare() {
 		-e 's:UMFPACK_numeric:umfpack_di_numeric:g' \
 		-e 's:buildg_:matvec_:g' \
 		-i configure.ac || 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_MPI_LIBRARY="${fetk_lib}"
-	export FETK_VF2C_LIBRARY="${fetk_lib}"
-	export FETK_BLAS_LIBRARY="${fetk_lib}"
-	export FETK_LAPACK_LIBRARY="${fetk_lib}"
-	export FETK_AMD_LIBRARY="${fetk_lib}"
-	export FETK_UMFPACK_LIBRARY="${fetk_lib}"
-	export FETK_SUPERLU_LIBRARY="${fetk_lib}"
-	export FETK_ARPACK_LIBRARY="${fetk_lib}"
-	export FETK_CGCODE_LIBRARY="${fetk_lib}"
-	export FETK_PMG_LIBRARY="${fetk_lib}"
+	export FETK_MPI_LIBRARY="${FETK_LIBRARY}"
+	export FETK_VF2C_LIBRARY="${FETK_LIBRARY}"
+	export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
+	export FETK_LAPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_AMD_LIBRARY="${FETK_LIBRARY}"
+	export FETK_UMFPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_SUPERLU_LIBRARY="${FETK_LIBRARY}"
+	export FETK_ARPACK_LIBRARY="${FETK_LIBRARY}"
+	export FETK_CGCODE_LIBRARY="${FETK_LIBRARY}"
+	export FETK_PMG_LIBRARY="${FETK_LIBRARY}"
 
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen '') \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot '') \
 		$(use_enable debug vdebug)
-		--disable-triplet
-		--enable-shared
-	)
-	autotools-utils_src_configure
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
-- 
cgit v1.2.3