commit: d12bc87963fe1b3fae352771cd590e9daad228f4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 22:24:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 22:24:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12bc879
sci-libs/fflas-ffpack: fix duplicate pkg_setup
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild | 8 +++-----
sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild | 6 ++----
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index 5428716175bf..327b02fb947b 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.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
@@ -42,16 +42,14 @@ pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
-pkg_setup() {
- tc-export PKG_CONFIG
-}
-
src_prepare() {
default
eautoreconf
}
src_configure() {
+ tc-export PKG_CONFIG
+
econf \
--enable-precompilation \
$(use_enable openmp) \
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
index 87c452d6e355..9d9117b172ef 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
@@ -43,16 +43,14 @@ pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
-pkg_setup() {
- tc-export PKG_CONFIG
-}
-
src_prepare() {
default
eautoreconf
}
src_configure() {
+ tc-export PKG_CONFIG
+
econf \
--enable-precompilation \
$(use_enable openmp) \