[gentoo-commits] proj/sci:master commit in: sci-libs/pfft/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     dee3f453d0b812ef2c1b4f0808971718b9ef72c0
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 11:50:01 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 11:50:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=dee3f453

sci-libs/pfft: version bump, EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 ...-1.0.7_alpha.ebuild => pfft-1.0.8_alpha.ebuild} | 23 ++++++++------------
 sci-libs/pfft/pfft-9999.ebuild                     | 25 +++++++++-------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/sci-libs/pfft/pfft-1.0.7_alpha.ebuild b/sci-libs/pfft/pfft-1.0.8_alpha.ebuild
similarity index 61%
rename from sci-libs/pfft/pfft-1.0.7_alpha.ebuild
rename to sci-libs/pfft/pfft-1.0.8_alpha.ebuild
index 612564e0b..e71ab975f 100644
--- a/sci-libs/pfft/pfft-1.0.7_alpha.ebuild
+++ b/sci-libs/pfft/pfft-1.0.8_alpha.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit autotools-utils fortran-2 multibuild
+inherit fortran-2 multibuild
 
 DESCRIPTION="Parallel 3d FFT"
 HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en"
@@ -26,28 +26,23 @@ IUSE="static-libs"
 RDEPEND="
 	sci-libs/fftw:3.0[mpi,fortran]
 	virtual/mpi
-	"
+"
 
-DEPEND="
-	${RDEPEND}
-	"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	MULTIBUILD_VARIANTS=( single double long-double )
 	my_src_configure() {
-		local myeconfargs=(
-			$([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}")
-		)
-		autotools-utils_src_configure
+		econf $([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}")
 	}
 
-	multibuild_parallel_foreach_variant my_src_configure
+	multibuild_foreach_variant my_src_configure
 }
 
 src_compile() {
-	multibuild_foreach_variant autotools-utils_src_compile
+	multibuild_foreach_variant emake
 }
 
 src_install() {
-	multibuild_parallel_foreach_variant autotools-utils_src_install
+	multibuild_foreach_variant emake install DESTDIR="${D}"
 }

diff --git a/sci-libs/pfft/pfft-9999.ebuild b/sci-libs/pfft/pfft-9999.ebuild
index 1ad55311a..e71ab975f 100644
--- a/sci-libs/pfft/pfft-9999.ebuild
+++ b/sci-libs/pfft/pfft-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils fortran-2 multibuild
+inherit fortran-2 multibuild
 
 DESCRIPTION="Parallel 3d FFT"
 HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en"
@@ -15,7 +15,7 @@ if [[ $PV = *9999 ]] ; then
 	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software/${P//_/-}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${P//_/-}"
 fi
 
@@ -26,28 +26,23 @@ IUSE="static-libs"
 RDEPEND="
 	sci-libs/fftw:3.0[mpi,fortran]
 	virtual/mpi
-	"
+"
 
-DEPEND="
-	${RDEPEND}
-	"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	MULTIBUILD_VARIANTS=( single double long-double )
 	my_src_configure() {
-		local myeconfargs=(
-			$([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}")
-		)
-		autotools-utils_src_configure
+		econf $([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}")
 	}
 
-	multibuild_parallel_foreach_variant my_src_configure
+	multibuild_foreach_variant my_src_configure
 }
 
 src_compile() {
-	multibuild_foreach_variant autotools-utils_src_compile
+	multibuild_foreach_variant emake
 }
 
 src_install() {
-	multibuild_parallel_foreach_variant autotools-utils_src_install
+	multibuild_foreach_variant emake install DESTDIR="${D}"
 }