[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     0f8c1bf7439bc2ebae4d52b285eb811dffdc8d2d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 23:56:59 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 23:56:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f8c1bf7

sci-libs/fftw: imported live ebuild from sci

Package-Manager: portage-2.2.28

 sci-libs/fftw/fftw-9999.ebuild | 183 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
new file mode 100644
index 0000000..1b2fc02
--- /dev/null
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+#can go once mpi is multlib
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/fftw3-mpi.h
+	/usr/include/fftw3l-mpi.f03
+	/usr/include/fftw3-mpi.f03
+	/usr/include/fftw3q.f03
+)
+
+pkg_setup() {
+	# XXX: this looks like it should be used with BUILD_TYPE!=binary
+
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	# fix info file for category directory
+	[[ ${PV} = *9999 ]] || sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3."info" || die "failed to fix info file"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local x
+
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	my_configure() {
+		#a bit hacky improve after #483758 is solved
+		local x=${BUILD_DIR%-${ABI}}
+		x=${x##*-}
+		# there is no abi_x86_32 port of virtual/mpi right now
+		local enable_mpi=$(use_enable mpi)
+		multilib_is_native_abi || enable_mpi="--disable-mpi"
+
+		#jlec reported USE=quad on abi_x86_32 has too less registers
+		#stub Makefiles
+		if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then
+			mkdir -p "${BUILD_DIR}/tests" || die
+			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+			return 0
+		fi
+
+		myeconfargs=(
+			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+			$(use_enable fortran)
+			$(use_enable zbus mips-zbus-timer)
+			$(use_enable threads)
+			$(use_enable openmp)
+		)
+		if [[ $x == single ]]; then
+			#altivec, sse, single-paired only work for single
+			myeconfargs+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse sse)
+				${enable_mpi}
+				$(use_enable neon)
+			)
+		elif [[ $x == double ]]; then
+			myeconfargs+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				${enable_mpi}
+			)
+		elif [[ $x == longdouble ]]; then
+			myeconfargs+=(
+				--enable-long-double
+				${enable_mpi}
+				)
+		elif [[ $x == quad ]]; then
+			#quad does not support mpi
+			myeconfargs+=( --enable-quad-precision )
+		else
+			die "${x} precision not implemented in this ebuild"
+		fi
+
+		autotools-utils_src_configure
+	}
+
+	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant autotools-multilib_src_compile
+}
+
+src_test () {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	#local testbase="perl check.pl --nthreads=1 --estimate"
+	#		${testbase} -${p}d || die "Failure: $n"
+	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
+}
+
+src_install () {
+	local u x
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	#copied from autotools-multilib_secure_install
+	my_abi_src_install() {
+		autotools-utils_src_install
+		#https://github.com/FFTW/fftw3/pull/6
+		# f03 are installed unconditionally, not a big problem as the quad
+		# header is the only one to be wrapped.
+		[[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03"
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
+	}
+	multibuild_foreach_variant multilib_foreach_abi my_abi_src_install
+	multilib_install_wrappers
+
+	if use doc; then
+		dodoc doc/*.pdf
+		insinto /usr/share/doc/${PF}/faq
+		doins -r doc/FAQ/fftw-faq.html/*
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html
+	fi
+
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
+		done
+	done
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Lars Wendler]

commit:     dd68af9139cfb2a6c0a5a1df730c480b6f8197f8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 00:18:51 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 00:21:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd68af91

sci-libs/fftw: Don't check for openmp toolchain when installing a binpkg.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.4.ebuild | 5 ++---
 sci-libs/fftw/fftw-9999.ebuild  | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index c0e4b6f..a1e5ebf 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -33,8 +33,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 
 pkg_setup() {
-	# XXX: this looks like it should be used with BUILD_TYPE!=binary
-	if use openmp; then
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
 			ewarn "OpenMP is not available in your current selected gcc"
 			die "need openmp capable gcc"

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 1b2fc02..ec07ce4 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -38,9 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 pkg_setup() {
-	# XXX: this looks like it should be used with BUILD_TYPE!=binary
-
-	if use openmp; then
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
 			ewarn "OpenMP is not available in your current selected gcc"
 			die "need openmp capable gcc"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     1741e4a708a66343a0e0320253b6713a7bcf1e9c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 20:07:08 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 20:08:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1741e4a7

sci-libs/fftw: version bump

* EAPI=6
* Clean up and simplify multilib handling

Package-Manager: portage-2.3.0

 sci-libs/fftw/Manifest          |   1 +
 sci-libs/fftw/fftw-3.3.5.ebuild | 183 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index b1d9259..8e7135c 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,2 +1,3 @@
 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10
 DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
+DIST fftw-3.3.5.tar.gz 4148447 SHA256 8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf SHA512 a81f02d884cfe4171fab479b0e5ec76eceb9c5da6d4eda1f89281b7e1efa2d8176c9ba87051595c402889eb32172d216ce40eb2bef41289c646f01002fb4ba8e WHIRLPOOL dc044c73dbb1b9fa595a0f1e71b5958d3e023c38cd6b1bb8a486adcad506fc6e411a3d8d0657a32346ff6636cf25396bd9bcdbcd720e8c799f6e40f1e04bfd65

diff --git a/sci-libs/fftw/fftw-3.3.5.ebuild b/sci-libs/fftw/fftw-3.3.5.ebuild
new file mode 100644
index 0000000..1218d51
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-2
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		if ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected compiler"
+
+			if tc-is-clang; then
+				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
+				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
+			fi
+
+			die "need openmp capable compiler"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# there is no abi_x86_32 port of virtual/mpi right now, bug 519700
+	local enable_mpi=$(multilib_native_use_enable mpi)
+
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			#altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				${enable_mpi}
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				${enable_mpi}
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				${enable_mpi}
+			)
+			;;
+
+		quad-*)
+			#quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     b280a257d28f038d034b690c645e6d9e363db88e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 20:40:28 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 20:40:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b280a257

sci-libs/fftw: live ebuild update

Package-Manager: portage-2.2.28

 sci-libs/fftw/fftw-9999.ebuild | 194 +++++++++++++++++++++--------------------
 1 file changed, 98 insertions(+), 96 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index ec07ce4..bb09666 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -2,46 +2,43 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
+inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
 
 if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad static-libs test threads zbus"
 
-RDEPEND="mpi? ( virtual/mpi )"
+RDEPEND="
+	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 
-#can go once mpi is multlib
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/fftw3-mpi.h
-	/usr/include/fftw3l-mpi.f03
-	/usr/include/fftw3-mpi.f03
-	/usr/include/fftw3q.f03
-)
-
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
+		if ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected compiler"
+
+			if tc-is-clang; then
+				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
+				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
+			fi
+
+			die "need openmp capable compiler"
 		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
@@ -50,7 +47,7 @@ pkg_setup() {
 
 	MULTIBUILD_VARIANTS=( single double longdouble )
 	if use quad; then
-		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
+		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
 			ewarn "quad precision only available for gcc >= 4.6"
 			die "need quad precision capable gcc"
 		fi
@@ -59,123 +56,128 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# fix info file for category directory
-	[[ ${PV} = *9999 ]] || sed -i \
-		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."info" || die "failed to fix info file"
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
 
-	autotools-utils_src_prepare
+		eautoreconf
+	fi
 }
 
-src_configure() {
-	local x
-
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	my_configure() {
-		#a bit hacky improve after #483758 is solved
-		local x=${BUILD_DIR%-${ABI}}
-		x=${x##*-}
-		# there is no abi_x86_32 port of virtual/mpi right now
-		local enable_mpi=$(use_enable mpi)
-		multilib_is_native_abi || enable_mpi="--disable-mpi"
-
-		#jlec reported USE=quad on abi_x86_32 has too less registers
-		#stub Makefiles
-		if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then
-			mkdir -p "${BUILD_DIR}/tests" || die
-			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-			return 0
-		fi
+multilib_src_configure() {
+	# there is no abi_x86_32 port of virtual/mpi right now, bug 519700
+	local enable_mpi=$(multilib_native_use_enable mpi)
+
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
 
-		myeconfargs=(
-			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-			$(use_enable fortran)
-			$(use_enable zbus mips-zbus-timer)
-			$(use_enable threads)
-			$(use_enable openmp)
-		)
-		if [[ $x == single ]]; then
+	local myconf=(
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
 			#altivec, sse, single-paired only work for single
-			myeconfargs+=(
+			myconf+=(
 				--enable-single
 				$(use_enable altivec)
 				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
 				${enable_mpi}
-				$(use_enable neon)
 			)
-		elif [[ $x == double ]]; then
-			myeconfargs+=(
+			;;
+
+		double-*)
+			myconf+=(
 				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse2 sse2)
 				${enable_mpi}
 			)
-		elif [[ $x == longdouble ]]; then
-			myeconfargs+=(
+			;;
+
+		longdouble-*)
+			myconf+=(
 				--enable-long-double
 				${enable_mpi}
-				)
-		elif [[ $x == quad ]]; then
+			)
+			;;
+
+		quad-*)
 			#quad does not support mpi
-			myeconfargs+=( --enable-quad-precision )
-		else
-			die "${x} precision not implemented in this ebuild"
-		fi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
 
-		autotools-utils_src_configure
-	}
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
 
-	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
 }
 
 src_compile() {
-	multibuild_foreach_variant autotools-multilib_src_compile
+	multibuild_foreach_variant multilib-minimal_src_compile
 }
 
-src_test () {
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
 	# We want this to be a reasonably quick test, but that is still hard...
 	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
 	# Do not increase the number of threads, it will not help your performance
-	#local testbase="perl check.pl --nthreads=1 --estimate"
-	#		${testbase} -${p}d || die "Failure: $n"
-	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
 }
 
-src_install () {
-	local u x
+src_install() {
 	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
 	HTML_DOCS=( doc/html/ )
 
-	#copied from autotools-multilib_secure_install
-	my_abi_src_install() {
-		autotools-utils_src_install
-		#https://github.com/FFTW/fftw3/pull/6
-		# f03 are installed unconditionally, not a big problem as the quad
-		# header is the only one to be wrapped.
-		[[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03"
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			multilib_check_headers
-		fi
-	}
-	multibuild_foreach_variant multilib_foreach_abi my_abi_src_install
-	multilib_install_wrappers
+	multibuild_foreach_variant multilib-minimal_src_install
 
 	if use doc; then
 		dodoc doc/*.pdf
-		insinto /usr/share/doc/${PF}/faq
-		doins -r doc/FAQ/fftw-faq.html/*
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
 	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
+	local x
 	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		local u
 		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
 		done
 	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     594dbc365403131e810db4c6980c533c97a6bb87
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 08:10:41 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 15:18:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594dbc36

sci-libs/fftw: Fix missing .so files due to incomplete autotools-utils.eclass porting

* Also reintroduce USE="neon" flag

Package-Manager: portage-2.3.0

 sci-libs/fftw/{fftw-3.3.5.ebuild => fftw-3.3.5-r1.ebuild} | 7 +++++--
 sci-libs/fftw/fftw-9999.ebuild                            | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.5.ebuild b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
similarity index 96%
rename from sci-libs/fftw/fftw-3.3.5.ebuild
rename to sci-libs/fftw/fftw-3.3.5-r1.ebuild
index 1218d51..ff0c93d 100644
--- a/sci-libs/fftw/fftw-3.3.5.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
 
 if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-2
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 
 RDEPEND="
 	mpi? ( virtual/mpi )"
@@ -83,6 +83,8 @@ multilib_src_configure() {
 	fi
 
 	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
 		$(use_enable zbus mips-zbus-timer)
@@ -99,6 +101,7 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
 				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
 				${enable_mpi}
 			)
 			;;

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index bb09666..ff0c93d 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 
 RDEPEND="
 	mpi? ( virtual/mpi )"
@@ -83,6 +83,8 @@ multilib_src_configure() {
 	fi
 
 	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
 		$(use_enable zbus mips-zbus-timer)
@@ -99,6 +101,7 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
 				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
 				${enable_mpi}
 			)
 			;;

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     e633382c75aa58983d1535bd36aecdefbf1b4bb9
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 16:46:36 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 16:47:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e633382c

sci-libs/fftw: workaround for bug #590446

Package-Manager: portage-2.2.28

 sci-libs/fftw/fftw-3.3.5-r1.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.5-r1.ebuild b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
index ff0c93d..6eec1c9 100644
--- a/sci-libs/fftw/fftw-3.3.5-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
@@ -163,7 +163,15 @@ src_install() {
 	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
 	HTML_DOCS=( doc/html/ )
 
-	multibuild_foreach_variant multilib-minimal_src_install
+	#workaroud for bug #590446
+	my_abi_install() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		emake DESTDIR="${D}" install
+		popd >/dev/null || die
+	}
+	multibuild_foreach_variant multilib_foreach_abi my_abi_install
+
+	einstalldocs
 
 	if use doc; then
 		dodoc doc/*.pdf

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     bc907150db2f0ee9d167d4ef68172b230f9951ff
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 17:38:21 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:54:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc907150

sci-libs/fftw: use multilib mpi

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2062

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.5-r2.ebuild | 191 +++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)

diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
new file mode 100644
index 0000000..5285914
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		if ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected compiler"
+
+			if tc-is-clang; then
+				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
+				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
+			fi
+
+			die "need openmp capable compiler"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	# workaround for bug #590446
+	my_abi_install() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		emake DESTDIR="${D}" install
+		popd >/dev/null || die
+	}
+	multibuild_foreach_variant multilib_foreach_abi my_abi_install
+
+	einstalldocs
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED}"usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED}"usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     6566a7c47266eeafa3eab2bbe9d12ef03d3167fc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 10:45:29 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 10:48:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6566a7c4

sci-libs/fftw: Restore QA-checked multilib-minimal_src_install

Package-Manager: portage-2.3.0

 sci-libs/fftw/fftw-3.3.5-r2.ebuild | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
index 5285914..43c316e 100644
--- a/sci-libs/fftw/fftw-3.3.5-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
@@ -160,15 +160,7 @@ src_install() {
 	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
 	HTML_DOCS=( doc/html/ )
 
-	# workaround for bug #590446
-	my_abi_install() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-		emake DESTDIR="${D}" install
-		popd >/dev/null || die
-	}
-	multibuild_foreach_variant multilib_foreach_abi my_abi_install
-
-	einstalldocs
+	multibuild_foreach_variant multilib-minimal_src_install
 
 	if use doc; then
 		dodoc doc/*.pdf

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     797b54ace17be65a88dbba7253a2bd03f0cf792e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 21:11:33 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 21:22:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797b54ac

sci-libs/fftw: re-add keywords for multilib ebuild

Package-Manager: portage-2.2.28

 sci-libs/fftw/fftw-3.3.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
index 43c316e..e577bdc 100644
--- a/sci-libs/fftw/fftw-3.3.5-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS=""
+	KEYWORDS="~alpha ~ia64 ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     5765d5ecff0fe767a6434d4e555965a65b5a87e3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 19:33:05 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 19:33:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5765d5ec

sci-libs/fftw: Use 'tc-check-openmp' for checking OpenMP support

Package-Manager: portage-2.3.2

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 15 +++++----------
 sci-libs/fftw/fftw-3.3.5-r2.ebuild | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index bc142c7..496c5e5 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -29,18 +29,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-texinfo5.1.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
+		tc-check-openmp
 		FORTRAN_NEED_OPENMP=1
 	fi
 

diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
index e577bdc..c9f3b9a 100644
--- a/sci-libs/fftw/fftw-3.3.5-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
@@ -28,18 +28,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
+		tc-check-openmp
 		FORTRAN_NEED_OPENMP=1
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Tobias Klausmann]

commit:     f3043c7def43068aabff70b6ece8185f17772728
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 09:50:20 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 09:50:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3043c7d

sci-libs/fftw-2.1.5-r9: stable on alpha

Gentoo-Bug: 600616

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 496c5e5..685d9ee 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Aaron Bauman]

commit:     2ff83e7edaec81cb60b5e470375e9ae3d737273a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 02:22:38 2017 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 02:22:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff83e7e

sci-libs/fftw: amd64 stable wrt bug #601714

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 685d9ee..1251bd4 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Markus Meier]

commit:     9f4fe8376fdf3f703c7c876b36e231f2454ebb56
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 18:20:10 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 18:20:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4fe837

sci-libs/fftw: arm stable, bug #600616

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 71fe48f..c3e2532 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Jeroen Roovers]

commit:     e63dd83e9df9359a8745a48ad8ffbcf8fd48727d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 08:24:59 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 08:58:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63dd83e

sci-libs/fftw: Stable for HPPA (bug #600616).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 5897c0c..b1fc243 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Jeroen Roovers]

commit:     a92c8ec2eb5a5e41adc00aee98d8c0980142ad35
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 09:05:53 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 09:05:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92c8ec2

sci-libs/fftw: Stable for PPC64 (bug #600616).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index b1fc243..6be3d4c 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     61117e01072333b91de0b1eca7492810364bf983
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 07:59:23 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 08:00:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61117e01

sci-libs/fftw: Version bump to 3.3.6_p1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/fftw/Manifest             |   1 +
 sci-libs/fftw/fftw-3.3.6_p1.ebuild | 182 +++++++++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 8e7135c09c..c13f4f4aa7 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,3 +1,4 @@
 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10
 DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
 DIST fftw-3.3.5.tar.gz 4148447 SHA256 8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf SHA512 a81f02d884cfe4171fab479b0e5ec76eceb9c5da6d4eda1f89281b7e1efa2d8176c9ba87051595c402889eb32172d216ce40eb2bef41289c646f01002fb4ba8e WHIRLPOOL dc044c73dbb1b9fa595a0f1e71b5958d3e023c38cd6b1bb8a486adcad506fc6e411a3d8d0657a32346ff6636cf25396bd9bcdbcd720e8c799f6e40f1e04bfd65
+DIST fftw-3.3.6-pl1.tar.gz 4179807 SHA256 1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d SHA512 e2ed33fcb068a36a841bbd898d12ceec74f4e9a0a349e7c55959878b50224a69a0f87656347dad7d7e1448ebc50d28d8f34f6da7992c43072d26942fd97c0134 WHIRLPOOL 8ccd7a3dfc49be2053e8c3f334ea348a3455bcb6f84a636cd531f15822abd3452cfa50cd0bca4295b1dc922897e38613cf5cb865e60b83e9e357af396f2d9c99

diff --git a/sci-libs/fftw/fftw-3.3.6_p1.ebuild b/sci-libs/fftw/fftw-3.3.6_p1.ebuild
new file mode 100644
index 0000000000..e6a42ea441
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.6_p1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~ia64 ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED}"usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED}"usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Matt Turner]

commit:     2bd31e36d525b638b7b0ab84cb37a1ef398548ef
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 05:02:19 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 06:36:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd31e36

sci-libs/fftw: added ~sparc, bug 592468

 sci-libs/fftw/fftw-3.3.5-r2.ebuild | 4 ++--
 sci-libs/fftw/fftw-3.3.6_p1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
index dfb13b5a7c2..07c2837181f 100644
--- a/sci-libs/fftw/fftw-3.3.5-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~ia64 ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

diff --git a/sci-libs/fftw/fftw-3.3.6_p1.ebuild b/sci-libs/fftw/fftw-3.3.6_p1.ebuild
index c56553d36fc..5b793c7a5ea 100644
--- a/sci-libs/fftw/fftw-3.3.6_p1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~ia64 ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     919dddde3c29c8de62bfebab71761efe3f30b5d3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 18:02:22 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 26 18:02:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919dddde

sci-libs/fftw: Version bump to 3.3.6-pl2

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/fftw/Manifest             |   1 +
 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 180 +++++++++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index c13f4f4aa7f..b337988db26 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -2,3 +2,4 @@ DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c7
 DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
 DIST fftw-3.3.5.tar.gz 4148447 SHA256 8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf SHA512 a81f02d884cfe4171fab479b0e5ec76eceb9c5da6d4eda1f89281b7e1efa2d8176c9ba87051595c402889eb32172d216ce40eb2bef41289c646f01002fb4ba8e WHIRLPOOL dc044c73dbb1b9fa595a0f1e71b5958d3e023c38cd6b1bb8a486adcad506fc6e411a3d8d0657a32346ff6636cf25396bd9bcdbcd720e8c799f6e40f1e04bfd65
 DIST fftw-3.3.6-pl1.tar.gz 4179807 SHA256 1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d SHA512 e2ed33fcb068a36a841bbd898d12ceec74f4e9a0a349e7c55959878b50224a69a0f87656347dad7d7e1448ebc50d28d8f34f6da7992c43072d26942fd97c0134 WHIRLPOOL 8ccd7a3dfc49be2053e8c3f334ea348a3455bcb6f84a636cd531f15822abd3452cfa50cd0bca4295b1dc922897e38613cf5cb865e60b83e9e357af396f2d9c99
+DIST fftw-3.3.6-pl2.tar.gz 4185261 SHA256 a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472 WHIRLPOOL 92b55473e1aaca71e07869c12b5f0e9b94e21317c1d8e37c2f0ae5e4ff1bb803a7f8c8104ad52ede56211964a6374e4cb054809ca2df9b22306bb1ca89e2bfa7

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
new file mode 100644
index 00000000000..d8341392a97
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if ! tc-is-gcc; then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Alexis Ballier]

commit:     116f75f4d317f6c5d12ff0ead7e63301cc8aef0e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 10:57:34 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 11:24:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116f75f4

sci-libs/fftw: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index d8341392a97..24266081efe 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     d64c320a1e03582d917b826549ace6ba8ec67c2c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 10:30:55 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 10:39:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64c320a

sci-libs/fftw: stable 3.3.6_p2 for hppa, bug #631770

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 24266081efe..2b393e1265d 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Tobias Klausmann]

commit:     1deaf9c1dea945490640d80263ef522fa66c70d1
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 11:06:10 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 11:06:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1deaf9c1

sci-libs/fftw-3.3.6_p2-r0: amd64 stable

Gentoo-Bug: 631770

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 2b393e1265d..2f240987870 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Tobias Klausmann]

commit:     acf892144b4e823550cd18f2214f7489e917c929
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 12:03:59 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 12:03:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf89214

sci-libs/fftw-3.3.6_p2-r0: alpha stable

Gentoo-Bug: 631770

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 2f240987870..30f6ca09eba 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     a214003bbb3b693972fa786b8384fb994cef508b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 12:40:33 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 12:40:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a214003b

sci-libs/fftw: stable 3.3.6_p2 for ppc64, bug #631770

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 30f6ca09eba..0f4d7da0e53 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     ee3a91a3bb4de55adf47224e4977e473024af203
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 13:04:50 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 13:05:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3a91a3

sci-libs/fftw: stable 3.3.6_p2 for ia64, bug #631770

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 0f4d7da0e53..c493f5f1066 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     2580dbca51bc2978d346143de13e44fabc5cc2be
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 13:46:19 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 13:46:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2580dbca

sci-libs/fftw: stable 3.3.6_p2 for ppc, bug #631770

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index c493f5f1066..060184d3687 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Thomas Deutschmann]

commit:     a387bfb7c750edb4d95cc38c068318e796939e2d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 14:28:23 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 14:32:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a387bfb7

sci-libs/fftw: x86 stable (bug #631770)

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 060184d3687..95cdb6de99d 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     a9756533a5d070651aae9e691b37175d7af04fcf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 09:26:14 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 09:26:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9756533

sci-libs/fftw: stable 3.3.6_p2 for sparc, bug #631770 (thanks to Rolf Eike Beer)

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="sparc"

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 95cdb6de99d..df20a22aee4 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Markus Meier]

commit:     a8ee2201882d1e204bbcaaacd93486acf0ada606
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 04:59:05 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 04:59:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ee2201

sci-libs/fftw: arm stable, bug #631770

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="arm"

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index df20a22aee4..35d91fe43ac 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     41d7ec73390574717f6cfc6b94ec80bcb5ae8d13
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 23:19:35 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 23:20:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d7ec73

sci-libs/fftw: Remove old

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sci-libs/fftw/Manifest             |   3 -
 sci-libs/fftw/fftw-2.1.5-r8.ebuild | 156 ------------------------------
 sci-libs/fftw/fftw-3.3.4.ebuild    | 162 -------------------------------
 sci-libs/fftw/fftw-3.3.5-r1.ebuild | 193 -------------------------------------
 sci-libs/fftw/fftw-3.3.5-r2.ebuild | 177 ----------------------------------
 sci-libs/fftw/fftw-3.3.6_p1.ebuild | 181 ----------------------------------
 6 files changed, 872 deletions(-)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index b337988db26..971f7d9a5f8 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,5 +1,2 @@
 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10
-DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
-DIST fftw-3.3.5.tar.gz 4148447 SHA256 8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf SHA512 a81f02d884cfe4171fab479b0e5ec76eceb9c5da6d4eda1f89281b7e1efa2d8176c9ba87051595c402889eb32172d216ce40eb2bef41289c646f01002fb4ba8e WHIRLPOOL dc044c73dbb1b9fa595a0f1e71b5958d3e023c38cd6b1bb8a486adcad506fc6e411a3d8d0657a32346ff6636cf25396bd9bcdbcd720e8c799f6e40f1e04bfd65
-DIST fftw-3.3.6-pl1.tar.gz 4179807 SHA256 1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d SHA512 e2ed33fcb068a36a841bbd898d12ceec74f4e9a0a349e7c55959878b50224a69a0f87656347dad7d7e1448ebc50d28d8f34f6da7992c43072d26942fd97c0134 WHIRLPOOL 8ccd7a3dfc49be2053e8c3f334ea348a3455bcb6f84a636cd531f15822abd3452cfa50cd0bca4295b1dc922897e38613cf5cb865e60b83e9e357af396f2d9c99
 DIST fftw-3.3.6-pl2.tar.gz 4185261 SHA256 a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472 WHIRLPOOL 92b55473e1aaca71e07869c12b5f0e9b94e21317c1d8e37c2f0ae5e4ff1bb803a7f8c8104ad52ede56211964a6374e4cb054809ca2df9b22306bb1ca89e2bfa7

diff --git a/sci-libs/fftw/fftw-2.1.5-r8.ebuild b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
deleted file mode 100644
index e889eba4d76..00000000000
--- a/sci-libs/fftw/fftw-2.1.5-r8.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-SRC_URI="http://www.fftw.org/${P}.tar.gz"
-HOMEPAGE="http://www.fftw.org"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-SLOT="2.1"
-LICENSE="GPL-2+"
-IUSE="doc float fortran mpi openmp threads static-libs"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-pkg_setup() {
-	use openmp && FORTRAN_NEED_OPENMP="1"
-	fortran-2_pkg_setup
-	# this one is reported to cause trouble on pentium4 m series
-	filter-mfpmath "sse"
-
-	# here I need (surprise) to increase optimization:
-	# --enable-i386-hacks requires -fomit-frame-pointer to work properly
-	if use x86; then
-		is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-	fi
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build fftw with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		ewarn "Otherwise the configure script will select POSIX threads."
-	fi
-	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	# doc suggests installing single and double precision versions
-	#  via separate compilations. will do in two separate source trees
-	# since some sed'ing is done during the build
-	# (?if --enable-type-prefix is set?)
-
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-configure.in.patch \
-		"${FILESDIR}"/${P}-no-test.patch \
-		"${FILESDIR}"/${P}-cc.patch \
-		"${FILESDIR}"/${P}-texinfo5.1.patch
-
-	# fix info files
-	for infofile in doc/fftw*info*; do
-		cat >> ${infofile} <<-EOF
-			INFO-DIR-SECTION Libraries
-			START-INFO-DIR-ENTRY
-			* fftw: (fftw).				${DESCRIPTION}
-			END-INFO-DIR-ENTRY
-		EOF
-	done
-
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-
-	eautoreconf
-
-	cd "${WORKDIR}"
-	cp -R ${P} ${P}-double
-	mv ${P} ${P}-single
-	ln -s ${P}-single ${P}
-}
-
-src_configure() {
-	local myconf="
-		--enable-shared
-		--enable-type-prefix
-		--enable-vec-recurse
-		$(use_enable fortran)
-		$(use_enable mpi)
-		$(use_enable static-libs static)
-		$(use_enable x86 i386-hacks)"
-	if use openmp; then
-		myconf="${myconf}
-			--enable-threads
-			--with-openmp"
-	elif use threads; then
-		myconf="${myconf}
-			--enable-threads
-			--without-openmp"
-	else
-		myconf="${myconf}
-			--disable-threads
-			--without-openmp"
-	fi
-	cd "${S}-single"
-	econf ${myconf} \
-		--enable-float \
-		--with-gcc=$(tc-getCC)
-
-	cd "${S}-double"
-	econf ${myconf} \
-		--with-gcc=$(tc-getCC)
-}
-
-src_compile() {
-	local dir
-	for dir in "${S}-single" "${S}-double"
-	do
-		einfo "Running compilation in ${dir}"
-		emake -C ${dir}
-	done
-}
-
-src_test() {
-	local dir
-	for dir in "${S}-single" "${S}-double"
-	do
-		einfo "Running tests in ${dir}"
-		emake -C ${dir} -j1 check
-	done
-}
-
-src_install () {
-	# both builds are installed in the same place
-	# libs are distinguished by prefix (s or d), see docs for details
-
-	local dir
-	for dir in "${S}-single" "${S}-double"
-	do
-		emake DESTDIR="${D}" -C ${dir} install
-	done
-
-	insinto /usr/include
-	doins fortran/fftw_f77.i
-	dodoc AUTHORS ChangeLog NEWS TODO README README.hacks
-	use doc && dohtml doc/*
-
-	if use float; then
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*sfft*; do
-			ln -s $(basename ${f}) ${f/sfft/fft}
-		done
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*srfft*; do
-			ln -s $(basename ${f}) ${f/srfft/rfft}
-		done
-	else
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*dfft*; do
-			ln -s $(basename ${f}) ${f/dfft/fft}
-		done
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*drfft*; do
-			ln -s $(basename ${f}) ${f/drfft/rfft}
-		done
-	fi
-}

diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
deleted file mode 100644
index 9174c474ef4..00000000000
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	# fix info file for category directory
-	[[ ${PV} = *9999 ]] || sed -i \
-		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."info" || die "failed to fix info file"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local x
-
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	my_configure() {
-		#a bit hacky improve after #483758 is solved
-		local x=${BUILD_DIR%-*}
-		x=${x##*-}
-		# there is no abi_x86_32 port of virtual/mpi right now
-		local enable_mpi=$(use_enable mpi)
-		multilib_is_native_abi || enable_mpi="--disable-mpi"
-
-		#jlec reported USE=quad on abi_x86_32 has too less registers
-		#stub Makefiles
-		if [[ ${ABI} == x86 && ${x} == quad ]]; then
-			mkdir -p "${BUILD_DIR}/tests" || die
-			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-			return 0
-		fi
-
-		local myeconfargs=(
-			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-			$(use_enable fortran)
-			$(use_enable zbus mips-zbus-timer)
-			$(use_enable threads)
-			$(use_enable openmp)
-		)
-		if [[ $x == single ]]; then
-			#altivec, sse, single-paired only work for single
-			myeconfargs+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_sse sse)
-				${enable_mpi}
-				$(use_enable neon)
-			)
-		elif [[ $x == double ]]; then
-			myeconfargs+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				${enable_mpi}
-			)
-		elif [[ $x == longdouble ]]; then
-			myeconfargs+=(
-				--enable-long-double
-				${enable_mpi}
-				)
-		elif [[ $x == quad ]]; then
-			#quad does not support mpi
-			myeconfargs+=( --enable-quad-precision )
-		else
-			die "${x} precision not implemented in this ebuild"
-		fi
-
-		autotools-utils_src_configure
-	}
-
-	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant autotools-multilib_src_compile
-}
-
-src_test () {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	#local testbase="perl check.pl --nthreads=1 --estimate"
-	#		${testbase} -${p}d || die "Failure: $n"
-	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
-}
-
-src_install () {
-	local u x
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib_foreach_abi autotools-utils_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		insinto /usr/share/doc/${PF}/faq
-		doins -r doc/FAQ/fftw-faq.html/*
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html
-	fi
-
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
-		done
-	done
-}

diff --git a/sci-libs/fftw/fftw-3.3.5-r1.ebuild b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
deleted file mode 100644
index 8b95ce8b8ba..00000000000
--- a/sci-libs/fftw/fftw-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# there is no abi_x86_32 port of virtual/mpi right now, bug 519700
-	local enable_mpi=$(multilib_native_use_enable mpi)
-
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			#altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				${enable_mpi}
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				${enable_mpi}
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				${enable_mpi}
-			)
-			;;
-
-		quad-*)
-			#quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	#workaroud for bug #590446
-	my_abi_install() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-		emake DESTDIR="${D}" install
-		popd >/dev/null || die
-	}
-	multibuild_foreach_variant multilib_foreach_abi my_abi_install
-
-	einstalldocs
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
deleted file mode 100644
index 07c2837181f..00000000000
--- a/sci-libs/fftw/fftw-3.3.5-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED}"usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/sci-libs/fftw/fftw-3.3.6_p1.ebuild b/sci-libs/fftw/fftw-3.3.6_p1.ebuild
deleted file mode 100644
index 5b793c7a5ea..00000000000
--- a/sci-libs/fftw/fftw-3.3.6_p1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED}"usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Markus Meier]

commit:     eacb3aa36ce7c91ea51d6f17ea72060e29c2946e
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 08:47:59 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 08:47:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eacb3aa3

sci-libs/fftw: add ~arm64, bug #624098

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="arm64"

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 75696fb361b..f31547f583e 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     7560dc07e6745acb68aa584bd402c02c0e2a14d1
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 20:46:38 2018 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 20:47:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7560dc07

sci-libs/fftw: live ebuild update (bug #642726)

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/fftw/fftw-9999.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 53961f54350..af34cba8616 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,10 +59,6 @@ src_prepare() {
 
 	# fix info file for category directory
 	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
 		eautoreconf
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     742b311d309929ac2c752a00efa323b231bba650
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 06:51:00 2018 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 06:51:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742b311d

sci-libs/fftw: live ebuild update (bug #643128)

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/fftw/fftw-9999.ebuild | 63 +++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index af34cba8616..bef41e83ea0 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -10,11 +10,13 @@ inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-m
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
 
+MY_P=${PN}-${PV/_p/-pl}
+
 if [[ ${PV} = *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
@@ -23,22 +25,24 @@ SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 
 RDEPEND="
-	mpi? ( virtual/mpi )"
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
+if [[ ${PV} = *9999 ]]; then
+	DEPEND="${DEPEND}
+		dev-ml/ocamlbuild"
+fi
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
 
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
-			die "need openmp capable compiler"
-		fi
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
 		FORTRAN_NEED_OPENMP=1
 	fi
 
@@ -46,7 +50,7 @@ pkg_setup() {
 
 	MULTIBUILD_VARIANTS=( single double longdouble )
 	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
+		if ! tc-is-gcc; then
 			ewarn "quad precision only available for gcc >= 4.6"
 			die "need quad precision capable gcc"
 		fi
@@ -64,9 +68,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# there is no abi_x86_32 port of virtual/mpi right now, bug 519700
-	local enable_mpi=$(multilib_native_use_enable mpi)
-
 	# jlec reported USE=quad on abi_x86_32 has too few registers
 	# stub Makefiles
 	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
@@ -79,6 +80,7 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
+		$([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
 		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
@@ -88,7 +90,7 @@ multilib_src_configure() {
 	)
 	case "${MULTIBUILD_ID}" in
 		single-*)
-			#altivec, sse, single-paired only work for single
+			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
 				$(use_enable altivec)
@@ -97,7 +99,7 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_sse sse)
 				$(use_enable cpu_flags_x86_sse2 sse2)
 				$(use_enable neon)
-				${enable_mpi}
+				$(use_enable mpi)
 			)
 			;;
 
@@ -106,19 +108,19 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse2 sse2)
-				${enable_mpi}
+				$(use_enable mpi)
 			)
 			;;
 
 		longdouble-*)
 			myconf+=(
 				--enable-long-double
-				${enable_mpi}
+				$(use_enable mpi)
 			)
 			;;
 
 		quad-*)
-			#quad does not support mpi
+			# quad does not support mpi
 			myconf+=(
 				--enable-quad-precision
 			)
@@ -129,7 +131,14 @@ multilib_src_configure() {
 			;;
 	esac
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+	local MY_S="${S}"
+	#out-of-source build is broken for 9999 due to maintainer mode
+	if [[ ${PV} = *9999 ]]; then
+		cp -al "${S}"/* "${BUILD_DIR}"/
+		MY_S="${BUILD_DIR}"
+	fi
+
+	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
 }
 
 src_configure() {
@@ -155,21 +164,19 @@ src_test() {
 }
 
 src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
 	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
 
 	if use doc; then
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
 	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
 		local u
 		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
 			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
@@ -177,5 +184,5 @@ src_install() {
 	done
 
 	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     fe1014ef3c396c3ab94f54d604da7f082060df3b
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 05:20:35 2018 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 02:54:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1014ef

sci-libs/fftw: fix doc build for live ebuild

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/fftw/fftw-9999.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index bef41e83ea0..c08278dde80 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -30,11 +30,11 @@ DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 if [[ ${PV} = *9999 ]]; then
 	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild"
+		dev-ml/ocamlbuild
+		doc? ( media-gfx/transfig )"
 fi
 
 S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -146,7 +146,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
+	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
 }
 
 multilib_src_test() {
@@ -164,6 +164,7 @@ src_test() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -171,8 +172,6 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Andrew Savchenko]

commit:     461721fc58ad27051c1a3108f62a0e431288160e
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat Sep  1 13:49:27 2018 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 22:23:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461721fc

sci-libs/fftw: bump to version 3.3.8

Closes: https://bugs.gentoo.org/651028
Closes: https://bugs.gentoo.org/608990
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sci-libs/fftw/Manifest          |   1 +
 sci-libs/fftw/fftw-3.3.8.ebuild | 181 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6d14a69bd13..6eebda50fbe 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,2 +1,3 @@
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
+DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38

diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
new file mode 100644
index 00000000000..47b31f4171e
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	quad? ( sys-devel/gcc[fortran] )
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if ! tc-is-gcc; then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Aaron Bauman]

commit:     5f0c9ac63519fc51748b04d0d933aef84317bef2
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 14:33:57 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 14:33:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0c9ac6

sci-libs/fftw: arm64 stable (bug #641648)

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sci-libs/fftw/fftw-3.3.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index 47b31f4171e..d345f5d141f 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Mike Gilbert]

commit:     57ecc0fe4b74dbf6019c5e1931750a64a5366ae6
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun May  5 02:46:00 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  5 19:04:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ecc0fe

sci-libs/fftw: Fix usage of tc-getCC().

Fixes: https://bugs.gentoo.org/618282
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 4 ++--
 sci-libs/fftw/fftw-3.3.8.ebuild    | 2 +-
 sci-libs/fftw/fftw-9999.ebuild     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 35d91fe43ac..4535c715b26 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -130,7 +130,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
 }
 
 src_configure() {

diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index d345f5d141f..c89038acc6a 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -131,7 +131,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
 }
 
 src_configure() {

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index c08278dde80..a43b48e5809 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,7 +138,7 @@ multilib_src_configure() {
 		MY_S="${BUILD_DIR}"
 	fi
 
-	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Georgy Yakovlev]

commit:     480391553a377349046f7fd2b62e2df37ef29752
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 02:48:15 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 05:23:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48039155

sci-libs/fftw: update live ebuild, migrate to CPU_FLAGS_PPC

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14975
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sci-libs/fftw/fftw-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 3e2234048b5..718aed13b25 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Christoph Junghans]

commit:     67a3fff18cedaf357e1a8cff0eae5f8aaf4824eb
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 16:57:10 2020 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 16:57:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a3fff1

sci-libs/fftw: fix build with mpich

Closes: https://bugs.gentoo.org/699650
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>

 .../{fftw-9999.ebuild => fftw-3.3.8-r1.ebuild}     | 34 +++++++++-------------
 sci-libs/fftw/fftw-9999.ebuild                     | 34 +++++++++-------------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
similarity index 78%
copy from sci-libs/fftw/fftw-9999.ebuild
copy to sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 718aed13b25..9266b28d174 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
@@ -17,25 +17,22 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
+	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
-if [[ ${PV} = *9999 ]]; then
-	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild
-		doc? ( media-gfx/transfig )"
-fi
 
 S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -64,6 +61,10 @@ src_prepare() {
 
 	# fix info file for category directory
 	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
 		eautoreconf
 	fi
 }
@@ -81,7 +82,6 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
-		$([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
 		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable cpu_flags_ppc_altivec altivec)
+				$(use_enable altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
@@ -132,14 +132,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	local MY_S="${S}"
-	#out-of-source build is broken for 9999 due to maintainer mode
-	if [[ ${PV} = *9999 ]]; then
-		cp -al "${S}"/* "${BUILD_DIR}"/
-		MY_S="${BUILD_DIR}"
-	fi
-
-	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
 }
 
 src_configure() {
@@ -147,7 +140,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
+	multibuild_foreach_variant multilib-minimal_src_compile
 }
 
 multilib_src_test() {
@@ -165,7 +158,6 @@ src_test() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -173,6 +165,8 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 718aed13b25..9266b28d174 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
@@ -17,25 +17,22 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
+	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
-if [[ ${PV} = *9999 ]]; then
-	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild
-		doc? ( media-gfx/transfig )"
-fi
 
 S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -64,6 +61,10 @@ src_prepare() {
 
 	# fix info file for category directory
 	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
 		eautoreconf
 	fi
 }
@@ -81,7 +82,6 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
-		$([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
 		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable cpu_flags_ppc_altivec altivec)
+				$(use_enable altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
@@ -132,14 +132,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	local MY_S="${S}"
-	#out-of-source build is broken for 9999 due to maintainer mode
-	if [[ ${PV} = *9999 ]]; then
-		cp -al "${S}"/* "${BUILD_DIR}"/
-		MY_S="${BUILD_DIR}"
-	fi
-
-	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
 }
 
 src_configure() {
@@ -147,7 +140,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
+	multibuild_foreach_variant multilib-minimal_src_compile
 }
 
 multilib_src_test() {
@@ -165,7 +158,6 @@ src_test() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -173,6 +165,8 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Michał Górny]

commit:     2424a31e9abdafb42ce3f7da50457677d6209eb1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 08:18:09 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 13 09:02:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2424a31e

sci-libs/fftw: Workaround missing -mavx2 with avx2 flag

Bug: https://bugs.gentoo.org/698572
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 9266b28d174..f8105f1e1b4 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -136,6 +136,10 @@ multilib_src_configure() {
 }
 
 src_configure() {
+	# upstream does not append proper -m flags
+	# https://bugs.gentoo.org/698572
+	use cpu_flags_x86_avx2 && append-flags -mavx2
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Georgy Yakovlev]

commit:     84832fd6083888396af61b1587ed01943a38b326
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 04:40:44 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 04:40:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84832fd6

sci-libs/fftw: re-add CPU_FLAGS_PPC

changes made in  480391553a377349046f7fd2b62e2df37ef29752 were lost
in 67a3fff18cedaf357e1a8cff0eae5f8aaf4824eb

re-add them back

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 4 ++--
 sci-libs/fftw/fftw-3.3.8.ebuild    | 6 +++---
 sci-libs/fftw/fftw-9999.ebuild     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index f8105f1e1b4..150c67d958e 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)

diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index b0783f5d9cb..e54af4af14b 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 9266b28d174..d92ed1ac2ad 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Agostino Sarubbo]

commit:     6d91915dd4a5965015cfe8402ccdc2b7ee4f808c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 24 15:08:08 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 24 15:08:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d91915d

sci-libs/fftw: amd64 stable wrt bug #733576

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 150c67d958e..47ebe45150e 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     6ff5e84d118e11dc424f6aed7e05f32c5b303c53
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Jul 25 08:29:51 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 08:42:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff5e84d

sci-libs/fftw: stable 3.3.8-r1 for sparc, bug #733576

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 47ebe45150e..56b961fffcc 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     92049c0411ed4051e08f4a357dc78f093e031df4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 21:49:51 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 21:49:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92049c04

sci-libs/fftw: arm64 stable (bug #733576)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 56b961fffcc..0baa63ed39b 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     c581883a84054ec09dd9c0fb0cb7f1c1a7545f01
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Jul 27 16:24:06 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 18:36:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c581883a

sci-libs/fftw: stable 3.3.8-r1 for hppa, bug #733576

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 0baa63ed39b..fa52ef3aa6b 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     782c31079c20cb2f80264b4125311e981fb2b226
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 08:45:55 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 08:45:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782c3107

sci-libs/fftw: stable 3.3.8-r1 for ppc

stable wrt bug #733576

Package-Manager: Portage-3.0.1, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index fa52ef3aa6b..ba524271d35 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     f3d9b6ea829f4341ebeccbe778c170c5692ecb17
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 09:00:03 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 09:00:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d9b6ea

sci-libs/fftw: stable 3.3.8-r1 for ppc64

stable wrt bug #733576

Package-Manager: Portage-3.0.1, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index ba524271d35..8e21f8a5a91 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Agostino Sarubbo]

commit:     3e22de625bfbf49d5f496807c6fee5378ff27d24
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 14:01:05 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 14:01:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e22de62

sci-libs/fftw: arm stable wrt bug #733576

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 8e21f8a5a91..f952faa1641 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     cfdef48f8c68e3cacfbccf3e9290f171494d292e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 13:21:10 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 13:21:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdef48f

sci-libs/fftw: Remove old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/Manifest             |   1 -
 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 181 ------------------------------------
 sci-libs/fftw/fftw-3.3.8.ebuild    | 182 -------------------------------------
 3 files changed, 364 deletions(-)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6eebda50fbe..e65017032f3 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,3 +1,2 @@
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
-DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38

diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
deleted file mode 100644
index 3d8aa290235..00000000000
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if ! tc-is-gcc; then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-	dodoc CONVENTIONS
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
deleted file mode 100644
index e54af4af14b..00000000000
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	quad? ( sys-devel/gcc[fortran] )
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if ! tc-is-gcc; then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable cpu_flags_ppc_altivec altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-	dodoc CONVENTIONS
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${D}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     2ae020cbacd3b7e7141db23492f8bf5ce15cd494
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 10:23:53 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 10:34:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae020cb

sci-libs/fftw: s390 keyworded (bug #759745)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index a6577c18e01..cebf3cd2360 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     2538a20ff0807ec0071cb1db97a4dea053619ca1
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 21:04:08 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 21:04:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2538a20f

sci-libs/fftw: Version bump to 3.3.9

Bug: https://bugs.gentoo.org/694088
Closes: https://bugs.gentoo.org/759970
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/Manifest          |   1 +
 sci-libs/fftw/fftw-3.3.9.ebuild | 183 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index e65017032f3..edf9d7c5f50 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,2 +1,3 @@
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
+DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
new file mode 100644
index 00000000000..3e76f1f265d
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	quad? ( sys-devel/gcc[fortran] )
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if ! tc-is-gcc; then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		--disable-static
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable cpu_flags_ppc_altivec altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable cpu_flags_arm_neon neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
+}
+
+src_configure() {
+	# upstream does not append proper -m flags
+	# https://bugs.gentoo.org/698572
+	use cpu_flags_x86_avx2 && append-flags -mavx2
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     9ff0405de628c9a266896b1d562af904d3099b27
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 21:04:11 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 21:04:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff0405d

sci-libs/fftw: Sync live ebuild

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/fftw-9999.ebuild | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index d92ed1ac2ad..3d5b307ce05 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
@@ -12,26 +12,27 @@ HOMEPAGE="http://www.fftw.org/"
 
 MY_P=${PN}-${PV/_p/-pl}
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
@@ -60,13 +61,7 @@ src_prepare() {
 	default
 
 	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
@@ -82,13 +77,15 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
-		$(use_enable static-libs static)
+		--disable-static
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
 		$(use_enable zbus mips-zbus-timer)
 		$(use_enable threads)
 		$(use_enable openmp)
 	)
+	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
 	case "${MULTIBUILD_ID}" in
 		single-*)
 			# altivec, sse, single-paired only work for single
@@ -99,7 +96,7 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
 				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
+				$(use_enable cpu_flags_arm_neon neon)
 				$(use_enable mpi)
 			)
 			;;
@@ -166,11 +163,11 @@ src_install() {
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
 	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
-	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
 		local u
 		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
 			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
@@ -178,5 +175,5 @@ src_install() {
 	done
 
 	# fftw uses pkg-config to record its private dependencies
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Fabian Groffen]

commit:     82e2d17634abc457aefa2a967a9ccfff82f5a92c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 15:14:06 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 15:14:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e2d176

sci-libs/fftw: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 4 ++--
 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 4 ++--
 sci-libs/fftw/fftw-3.3.9.ebuild    | 4 ++--
 sci-libs/fftw/fftw-9999.ebuild     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index d4bb1d4b067..0d4eae2fdb7 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index cebf3cd2360..ae84f01be61 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 3e76f1f265d..3db0c3fc13c 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 3d5b307ce05..b0c692bdeac 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     f15919fc18f12da055752980fb14257060a2003e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 07:54:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 07:54:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15919fc

sci-libs/fftw: Stabilize 3.3.9 ppc64, #770025

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 3db0c3fc13c..304c2b14b1b 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     5a237af72d8a47c9f5c776e4b0866ee6ad69bbb2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 07:55:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 07:55:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a237af7

sci-libs/fftw: Stabilize 3.3.9 sparc, #770025

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 304c2b14b1b..e0615fca2e8 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     bfb00f54beffc9bdf4af47efe3b1f4093e7ad8ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 09:56:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 09:56:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfb00f54

sci-libs/fftw: Stabilize 3.3.9 x86, #770025

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index e0615fca2e8..684f38773a7 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     6a6c139e8f92d1fe4e140e7096853f5d32a257be
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 18:30:44 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 18:30:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6c139e

sci-libs/fftw: Remove IUSE=quad

* The feature isn't useful enough right now
  to warrant complicated masking.

Closes: https://bugs.gentoo.org/770346
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 684f38773a7..722091b27a2 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -22,14 +22,13 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
 
 S="${WORKDIR}/${MY_P}"
@@ -46,15 +45,7 @@ pkg_setup() {
 	fi
 
 	fortran-2_pkg_setup
-
 	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if ! tc-is-gcc; then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
 }
 
 src_prepare() {
@@ -65,16 +56,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
 	local myconf=(
 		--enable-shared
 		--disable-static
@@ -86,6 +67,9 @@ multilib_src_configure() {
 	)
 	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
 
+	# --enable-quad-precision is a brittle feature that requires
+	# __float128 support from the toolchain, which is lacking on
+	# most niche architectures. Bug #770346
 	case "${MULTIBUILD_ID}" in
 		single-*)
 			# altivec, sse, single-paired only work for single
@@ -117,13 +101,6 @@ multilib_src_configure() {
 			)
 			;;
 
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
 		*)
 			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
 			;;

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     ffae1305e0a3fb9720cae5936b42e237db7c0fbb
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 18:50:18 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 18:50:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffae1305

sci-libs/fftw: Sync live ebuild

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/fftw-9999.ebuild | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index b0c692bdeac..23c52fd7f3d 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -22,14 +22,13 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
 
 S="${WORKDIR}/${MY_P}"
@@ -46,15 +45,7 @@ pkg_setup() {
 	fi
 
 	fortran-2_pkg_setup
-
 	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if ! tc-is-gcc; then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
 }
 
 src_prepare() {
@@ -65,16 +56,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
 	local myconf=(
 		--enable-shared
 		--disable-static
@@ -86,6 +67,9 @@ multilib_src_configure() {
 	)
 	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
 
+	# --enable-quad-precision is a brittle feature that requires
+	# __float128 support from the toolchain, which is lacking on
+	# most niche architectures. Bug #770346
 	case "${MULTIBUILD_ID}" in
 		single-*)
 			# altivec, sse, single-paired only work for single
@@ -117,13 +101,6 @@ multilib_src_configure() {
 			)
 			;;
 
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
 		*)
 			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
 			;;
@@ -133,6 +110,10 @@ multilib_src_configure() {
 }
 
 src_configure() {
+	# upstream does not append proper -m flags
+	# https://bugs.gentoo.org/698572
+	use cpu_flags_x86_avx2 && append-flags -mavx2
+
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     6c11272699251a850980657d3aebecfe29db446e
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Feb 13 18:39:19 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:47:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c112726

sci-libs/fftw: stable 3.3.9 for hppa, bug #770025

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 722091b27a2..5b57691cc1b 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     2d82713b9b5a8fa75329b00379e188fe10b2e9c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 14:53:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 14:53:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d82713b

sci-libs/fftw: Stabilize 3.3.9 arm64, #770025

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 5b57691cc1b..a7c08875e77 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     179e263d165b72dfcf9529a4d9a975713cdad02b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 19:53:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:53:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179e263d

sci-libs/fftw: Stabilize 3.3.9 amd64, #770025

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index a7c08875e77..7b33de00082 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sergei Trofimovich]

commit:     35e55f35a96b8ff46ca39bf72d6a83bf9e940fe3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 20:00:28 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 20:00:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e55f35

sci-libs/fftw: stable 3.3.9 for ppc

stable wrt bug #770025

Package-Manager: Portage-3.0.14, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 7b33de00082..61cda9c857b 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     11b37e03b748df9a0465a5328826be58d50d1a19
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 02:50:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 02:50:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b37e03

sci-libs/fftw: Stabilize 3.3.9 arm, #770025

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 61cda9c857b..32ce75db90a 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     b2bb9aef1cd130d8057000effd1e1a8a25c91699
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 03:17:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 03:17:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bb9aef

sci-libs/fftw: add github remote-id

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 98e15d67793..bf126e2d080 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -18,6 +18,7 @@
     <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
   </use>
   <upstream>
+    <remote-id type="github">FFTW/fftw3</remote-id>
     <remote-id type="freecode">fftw</remote-id>
   </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     32a54e968b732f3ac089fe18e8ad93d25139a052
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 03:21:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 03:21:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a54e96

sci-libs/fftw: drop older 3.x

Had to restore :2.1 for media-video/videorbits.

Fixes: ee56d7da7ed08caf5546958342eceebc4d9de5ff
Bug: https://bugs.gentoo.org/769896
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/Manifest             |   1 -
 sci-libs/fftw/fftw-3.3.8-r1.ebuild | 186 -------------------------------------
 sci-libs/fftw/metadata.xml         |   1 -
 3 files changed, 188 deletions(-)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index edf9d7c5f50..3db9f31dca7 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,3 +1,2 @@
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
-DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
deleted file mode 100644
index ae84f01be61..00000000000
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	quad? ( sys-devel/gcc[fortran] )
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if ! tc-is-gcc; then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable cpu_flags_ppc_altivec altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
-}
-
-src_configure() {
-	# upstream does not append proper -m flags
-	# https://bugs.gentoo.org/698572
-	use cpu_flags_x86_avx2 && append-flags -mavx2
-
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-	dodoc CONVENTIONS
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index bd41f1af108..c884ae1bb93 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -17,7 +17,6 @@
   <use>
     <flag name="float">Link default library to single precision instead of
     double (symlinks only and fftw-2.1)</flag>
-    <flag name="quad">Build quadruple precision lib</flag>
     <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
   </use>
   <upstream>

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     46056a122449288e449e0f0f8030e20f5bc2e2df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 18:17:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 18:17:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46056a12

sci-libs/fftw: drop 2.1.5-r9 (drop :2.1 slot)

Closes: https://bugs.gentoo.org/772815
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/Manifest             |   1 -
 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 137 -------------------------------------
 2 files changed, 138 deletions(-)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 3db9f31dca7..a4327766903 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,2 +1 @@
-DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
deleted file mode 100644
index 0d4eae2fdb7..00000000000
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools flag-o-matic fortran-2 multibuild toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org"
-SRC_URI="http://www.fftw.org/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-LICENSE="GPL-2+"
-SLOT="2.1"
-IUSE="doc float fortran mpi openmp threads static-libs"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-configure.in.patch
-	"${FILESDIR}"/${P}-no-test.patch
-	"${FILESDIR}"/${P}-cc.patch
-	"${FILESDIR}"/${P}-texinfo5.1.patch
-	"${FILESDIR}"/${P}-parallel-tests.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double )
-}
-
-src_prepare() {
-	default
-
-	# fix info files
-	local infofile
-	for infofile in doc/fftw*info*; do
-		cat >> ${infofile} <<-EOF || die
-			INFO-DIR-SECTION Libraries
-			START-INFO-DIR-ENTRY
-			* fftw: (fftw).				${DESCRIPTION}
-			END-INFO-DIR-ENTRY
-		EOF
-	done
-
-	mv configure.{in,ac} || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-
-	eautoreconf
-
-	# 'FAQ' is actually a dir and causes issues with einstalldocs
-	rm -r FAQ || die
-
-	multibuild_copy_sources
-}
-
-fftw_src_configure() {
-	local myconf=(
-		--with-gcc=$(tc-getCC)
-		--enable-shared
-		--enable-type-prefix
-		--enable-vec-recurse
-		$(use_enable fortran)
-		$(use_enable mpi)
-		$(use_enable static-libs static)
-		$(use_enable x86 i386-hacks)
-		$(use_with openmp)
-	)
-
-	if use openmp || use threads; then
-		myconf+=( --enable-threads )
-	else
-		myconf+=( --disable-threads )
-	fi
-
-	[[ $MULTIBUILD_VARIANT == single ]] && myconf+=( --enable-float )
-
-	econf "${myconf[@]}"
-}
-
-src_configure() {
-	# this one is reported to cause trouble on pentium4 m series
-	filter-mfpmath sse
-
-	# here I need (surprise) to increase optimization:
-	# --enable-i386-hacks requires -fomit-frame-pointer to work properly
-	if use x86; then
-		is-flag -fomit-frame-pointer || append-flags -fomit-frame-pointer
-	fi
-	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
-
-	multibuild_foreach_variant run_in_build_dir fftw_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir default_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant run_in_build_dir default_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/*.{html,gif} )
-	multibuild_foreach_variant run_in_build_dir default_src_install
-
-	doheader fortran/fftw_f77.i
-
-	create_fftw_symlinks() {
-		local i f letter=$1
-		for i in fft rfft; do
-			for f in "${ED%/}"/usr/{include,$(get_libdir)}/*${letter}${i}*; do
-				ln -s $(basename ${f}) ${f/${letter}${i}/${i}} || die
-			done
-		done
-	}
-	create_fftw_symlinks $(usex float s d)
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     f35d47315b0608fb4dea99f44074183627b15bb0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 18:18:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 18:18:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35d4731

Revert "sci-libs/fftw: drop 2.1.5-r9 (drop :2.1 slot)"

Not yet.

This reverts commit 46056a122449288e449e0f0f8030e20f5bc2e2df.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/Manifest             |   1 +
 sci-libs/fftw/fftw-2.1.5-r9.ebuild | 137 +++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index a4327766903..3db9f31dca7 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1 +1,2 @@
+DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
new file mode 100644
index 00000000000..0d4eae2fdb7
--- /dev/null
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools flag-o-matic fortran-2 multibuild toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org"
+SRC_URI="http://www.fftw.org/${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+LICENSE="GPL-2+"
+SLOT="2.1"
+IUSE="doc float fortran mpi openmp threads static-libs"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-configure.in.patch
+	"${FILESDIR}"/${P}-no-test.patch
+	"${FILESDIR}"/${P}-cc.patch
+	"${FILESDIR}"/${P}-texinfo5.1.patch
+	"${FILESDIR}"/${P}-parallel-tests.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double )
+}
+
+src_prepare() {
+	default
+
+	# fix info files
+	local infofile
+	for infofile in doc/fftw*info*; do
+		cat >> ${infofile} <<-EOF || die
+			INFO-DIR-SECTION Libraries
+			START-INFO-DIR-ENTRY
+			* fftw: (fftw).				${DESCRIPTION}
+			END-INFO-DIR-ENTRY
+		EOF
+	done
+
+	mv configure.{in,ac} || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	eautoreconf
+
+	# 'FAQ' is actually a dir and causes issues with einstalldocs
+	rm -r FAQ || die
+
+	multibuild_copy_sources
+}
+
+fftw_src_configure() {
+	local myconf=(
+		--with-gcc=$(tc-getCC)
+		--enable-shared
+		--enable-type-prefix
+		--enable-vec-recurse
+		$(use_enable fortran)
+		$(use_enable mpi)
+		$(use_enable static-libs static)
+		$(use_enable x86 i386-hacks)
+		$(use_with openmp)
+	)
+
+	if use openmp || use threads; then
+		myconf+=( --enable-threads )
+	else
+		myconf+=( --disable-threads )
+	fi
+
+	[[ $MULTIBUILD_VARIANT == single ]] && myconf+=( --enable-float )
+
+	econf "${myconf[@]}"
+}
+
+src_configure() {
+	# this one is reported to cause trouble on pentium4 m series
+	filter-mfpmath sse
+
+	# here I need (surprise) to increase optimization:
+	# --enable-i386-hacks requires -fomit-frame-pointer to work properly
+	if use x86; then
+		is-flag -fomit-frame-pointer || append-flags -fomit-frame-pointer
+	fi
+	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
+
+	multibuild_foreach_variant run_in_build_dir fftw_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir default_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant run_in_build_dir default_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/*.{html,gif} )
+	multibuild_foreach_variant run_in_build_dir default_src_install
+
+	doheader fortran/fftw_f77.i
+
+	create_fftw_symlinks() {
+		local i f letter=$1
+		for i in fft rfft; do
+			for f in "${ED%/}"/usr/{include,$(get_libdir)}/*${letter}${i}*; do
+				ln -s $(basename ${f}) ${f/${letter}${i}/${i}} || die
+			done
+		done
+	}
+	create_fftw_symlinks $(usex float s d)
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Yixun Lan]

commit:     bccd13e128ae7138f84d61f408f4f734e32a3c67
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 01:34:50 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 02:22:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccd13e1

sci-libs/fftw: fix two lib path issue for ARCH=riscv

thanks @soap for helping this

Closes: https://bugs.gentoo.org/794208
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.9.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 32ce75db90a..cb50c0ff687 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -147,13 +147,16 @@ src_install() {
 		rm -r "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
-	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+	augment_pc_files() {
+		local x
+		for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
+			local u
+			for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+				sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
+			done
 		done
-	done
+	}
+	multilib_foreach_abi augment_pc_files
 
 	# fftw uses pkg-config to record its private dependencies
 	find "${ED}" -name '*.la' -delete || die

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     a580532de52c209b8dc15a164a9bcba141fc69d1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 01:41:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 01:41:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a580532d

sci-libs/fftw: add 3.3.10, sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/Manifest                             |  1 +
 .../fftw/{fftw-3.3.9.ebuild => fftw-3.3.10.ebuild} | 16 +++++------
 sci-libs/fftw/fftw-3.3.9.ebuild                    |  4 +--
 sci-libs/fftw/fftw-9999.ebuild                     | 31 ++++++++++++----------
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index a4327766903..77f9c12fde3 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1 +1,2 @@
+DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
similarity index 92%
copy from sci-libs/fftw/fftw-3.3.9.ebuild
copy to sci-libs/fftw/fftw-3.3.10.ebuild
index cbd8e2451a7..c8a32cdc88e 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
+HOMEPAGE="https://www.fftw.org/"
 
 MY_P=${PN}-${PV/_p/-pl}
 
@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-lang/perl )"
+BDEPEND="test? ( dev-lang/perl )"
 
-S="${WORKDIR}/${MY_P}"
 HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
@@ -65,6 +64,7 @@ multilib_src_configure() {
 		$(use_enable threads)
 		$(use_enable openmp)
 	)
+
 	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
 
 	# --enable-quad-precision is a brittle feature that requires

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index cbd8e2451a7..e377ed60541 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
+HOMEPAGE="https://www.fftw.org/"
 
 MY_P=${PN}-${PV/_p/-pl}
 
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 23c52fd7f3d..c8a32cdc88e 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
+HOMEPAGE="https://www.fftw.org/"
 
 MY_P=${PN}-${PV/_p/-pl}
 
@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-lang/perl )"
+BDEPEND="test? ( dev-lang/perl )"
 
-S="${WORKDIR}/${MY_P}"
 HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
@@ -65,6 +64,7 @@ multilib_src_configure() {
 		$(use_enable threads)
 		$(use_enable openmp)
 	)
+
 	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
 
 	# --enable-quad-precision is a brittle feature that requires
@@ -147,13 +147,16 @@ src_install() {
 		rm -r "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
-	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+	augment_pc_files() {
+		local x
+		for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
+			local u
+			for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+				sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
+			done
 		done
-	done
+	}
+	multilib_foreach_abi augment_pc_files
 
 	# fftw uses pkg-config to record its private dependencies
 	find "${ED}" -name '*.la' -delete || die

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     6f518d741e19775185bb29d5239311450c0ecbbc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  5 11:59:44 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Nov  5 11:59:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f518d74

sci-libs/fftw: remove append-flags -mavx2

Closes: https://bugs.gentoo.org/698572
Bug: https://bugs.gentoo.org/821916
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index c8a32cdc88e..f3fa7dd693b 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+inherit fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="https://www.fftw.org/"
@@ -110,10 +110,6 @@ multilib_src_configure() {
 }
 
 src_configure() {
-	# upstream does not append proper -m flags
-	# https://bugs.gentoo.org/698572
-	use cpu_flags_x86_avx2 && append-flags -mavx2
-
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     3673a1a8143fd6a83ee20e2551f944a15ab54ef9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  5 11:59:45 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Nov  5 11:59:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3673a1a8

sci-libs/fftw: sync live

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/fftw-9999.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index c8a32cdc88e..f3fa7dd693b 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+inherit fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="https://www.fftw.org/"
@@ -110,10 +110,6 @@ multilib_src_configure() {
 }
 
 src_configure() {
-	# upstream does not append proper -m flags
-	# https://bugs.gentoo.org/698572
-	use cpu_flags_x86_avx2 && append-flags -mavx2
-
 	multibuild_foreach_variant multilib-minimal_src_configure
 }
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Arthur Zamarin]

commit:     5cad0b7a19016815a2acd9bb71a1a0f59bc093b1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 18:20:18 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 18:21:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cad0b7a

sci-libs/fftw: Stabilize 3.3.10 sparc, #821916

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index f3fa7dd693b0..e4f7b4a83f80 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     ff7b809911ba0d4207203b66ccb5ddb68e9bc2c5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 18:33:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 18:33:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7b8099

sci-libs/fftw: Stabilize 3.3.10 arm64, #821916

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index e4f7b4a83f80..4f5b2428e156 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     a4b5f40a50b0b09d11aef1afcda0efbae050ea2b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 22:05:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 22:05:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b5f40a

sci-libs/fftw: Stabilize 3.3.10 ppc, #821916

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 4f5b2428e156..fbb9ae5ada01 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     320107da54b19a5b267969b3434ac6dfa14182e3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 22:05:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 22:05:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320107da

sci-libs/fftw: Stabilize 3.3.10 ppc64, #821916

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index fbb9ae5ada01..afbddc7d2d48 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     146f95d8df0976d947bb84e66f2d263fa0f5f818
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  5 22:30:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec  5 22:30:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146f95d8

sci-libs/fftw: Stabilize 3.3.10 arm, #821916

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index afbddc7d2d48..54d8ba2fd296 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Jakov Smolić]

commit:     af8925ce5f8d2a87c3f964b8c2014ab2181048f2
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 07:15:14 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 07:15:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8925ce

sci-libs/fftw: Stabilize 3.3.10 amd64, #821916

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 54d8ba2fd296..5fe1d0046656 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Agostino Sarubbo]

commit:     0dacc1b7443f1f333c80a3f3c26a5359d12e3880
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  7 06:24:20 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 06:24:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dacc1b7

sci-libs/fftw: x86 stable wrt bug #821916

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 5fe1d0046656..6b8b39b12013 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Sam James]

commit:     4520d48023ac3df9f7caf5e3c2f65614a1dbaab6
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Dec 14 15:09:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 22:16:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4520d480

sci-libs/fftw: stable 3.3.10 for hppa, bug #821916

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 6b8b39b12013..edbb485453c1 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[James Le Cuirot]

commit:     b448cd0ac67e250a591ff420b3db5712e542d049
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 11:51:55 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 11:51:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b448cd0a

sci-libs/fftw: Keyword 3.3.10 for ~m68k

The tests pass.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index edbb485453c1..d0089f5165db 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.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
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[David Seifert]

commit:     b8adac1bdf06cd045d27725b30e006a3b26740c8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 10:42:16 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 10:42:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8adac1b

sci-libs/fftw: drop 3.3.9

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fftw/Manifest          |   1 -
 sci-libs/fftw/fftw-3.3.9.ebuild | 163 ----------------------------------------
 2 files changed, 164 deletions(-)

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 77f9c12fde3a..8837fa157ed7 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,2 +1 @@
 DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
-DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
deleted file mode 100644
index e377ed60541c..000000000000
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="https://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-HTML_DOCS=( doc/html/. )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-	MULTIBUILD_VARIANTS=( single double longdouble )
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
-
-	# --enable-quad-precision is a brittle feature that requires
-	# __float128 support from the toolchain, which is lacking on
-	# most niche architectures. Bug #770346
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable cpu_flags_ppc_altivec altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable cpu_flags_arm_neon neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
-}
-
-src_configure() {
-	# upstream does not append proper -m flags
-	# https://bugs.gentoo.org/698572
-	use cpu_flags_x86_avx2 && append-flags -mavx2
-
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-	dodoc CONVENTIONS
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	augment_pc_files() {
-		local x
-		for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
-			local u
-			for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-				sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
-			done
-		done
-	}
-	multilib_foreach_abi augment_pc_files
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[WANG Xuerui]

commit:     ed39d7cfc3a7e8052899163a62ce4c1c4753e4f2
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 12:41:18 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue May 17 12:48:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed39d7cf

sci-libs/fftw: keyword 3.3.10 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index d0089f5165db..213b53606d55 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Eli Schwartz]

commit:     fd20dfdcbc8a3eae3ac88c6e7198af0a0fff7584
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 03:48:01 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 08:01:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd20dfdc

sci-libs/fftw: set QA_CONFIG_IMPL_DECL_SKIP for false positive

The autotools check is written to always fail to link. It includes a
header which on some systems contains: "UNICOS _rtc() intrinsic."

On linux, it fails to link and with gcc 14 fails to compile as well,
which is all as expected.

Closes: https://bugs.gentoo.org/898442
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 6 ++++++
 sci-libs/fftw/fftw-9999.ebuild   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 3e3cdf42bc76..ea7a5189348f 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -33,6 +33,12 @@ BDEPEND="test? ( dev-lang/perl )"
 
 HTML_DOCS=( doc/html/. )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# check fails with any version of gcc. On <14:
+	# <artificial>:(.text.startup+0x19): undefined reference to `_rtc'
+	_rtc
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index f1bc2d876ad8..176526968102 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -33,6 +33,12 @@ BDEPEND="test? ( dev-lang/perl )"
 
 HTML_DOCS=( doc/html/. )
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# check fails with any version of gcc. On <14:
+	# <artificial>:(.text.startup+0x19): undefined reference to `_rtc'
+	_rtc
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/

[Eli Schwartz]

commit:     c52f4c6b816c35fe489e83b85dc8a0c925644e47
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 03:43:10 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 08:01:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52f4c6b

sci-libs/fftw: make sure elibtoolize is applied

Needed to e.g. pass LTO warning flags through to the linker.

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 sci-libs/fftw/fftw-3.3.10.ebuild | 12 ++++++++----
 sci-libs/fftw/fftw-9999.ebuild   | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 213b53606d55..3e3cdf42bc76 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit fortran-2 multibuild multilib-minimal toolchain-funcs
+inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="https://www.fftw.org/"
@@ -50,8 +50,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# fix info file for category directory
-	[[ ${PV} == *9999 ]] && eautoreconf
+	if [[ ${PV} == *9999 ]]; then
+		# fix info file for category directory
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 multilib_src_configure() {

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index f3fa7dd693b0..f1bc2d876ad8 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit fortran-2 multibuild multilib-minimal toolchain-funcs
+inherit fortran-2 libtool multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="https://www.fftw.org/"
@@ -50,8 +50,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# fix info file for category directory
-	[[ ${PV} == *9999 ]] && eautoreconf
+	if [[ ${PV} == *9999 ]]; then
+		# fix info file for category directory
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 multilib_src_configure() {