gentoo resync : 03.03.2021

4 files changed, 4 insertions, 192 deletions

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 1b7bcb93e453..747138e59ad3 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -5,10 +5,8 @@ AUX fftw-2.1.5-no-test.patch 1028 BLAKE2B 878780d275d1454edff28c6834c118981e8ecb
 AUX fftw-2.1.5-parallel-tests.patch 3720 BLAKE2B 6b18c68e121035c517cf8eae245d32a1b99f51fc01f3baa0b96351f0a0833714c89798fc06b231c3acda6131cb6e0fe9782a0d1c34c76eac04eee8d0b9144857 SHA512 2e02c69dcbae6c11b8bdf0edb1a49c9754c9a599438e1073eb2bcff04c52c38c1e76eb352f21957a0518d61ee2e32d302e5624e234d28344fc99036313394d3e
 AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a19e5e75734a5c7d7901b8464403ceb675efcf6e43b00f10779776a8e9789956bb77e937b754c0a070e15821f4877 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214
 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
 EBUILD fftw-2.1.5-r9.ebuild 3135 BLAKE2B 096f800cef6610c63107d3103c55e7f43c1d62db9ed84d7a346c81f36f49e94a39482d5929be23c7296f100a394c1d6ade83a9965926d69bab2c9b1c7078c8a4 SHA512 fd9ea101212d4fa2e602d00114ce71e2525174a9162f4ed26ae9086b5d021fe1ab10f010d4c95e0e452ca93b79d01347ad4cff72cc866415fa1c64bd2dac1fcb
-EBUILD fftw-3.3.8-r1.ebuild 4631 BLAKE2B eb2025e5b4a8a8c2d0aa26fbdc2f2475fcf877b2f6d19533016d5bef0108f4afdef8161b296a2b0b25bd4a28a60285e664b614f61bd0278fcdc8831a9df5edcf SHA512 bfaa6b2d5c30153378e13fa1910baa514b4243bdd441a3165e74ead0e5035e928c9952494933c488f25cf6df23fc681f9ca26aa0316b0dedba44741e1aa9564f
-EBUILD fftw-3.3.9.ebuild 4056 BLAKE2B 4f9b66a6e0bc43d429e285b3d091d3b686bfb02b3526d82d6f96c8928dd51083b777f18234c215b23a85c4be67a2deea2a6fa862ecd9baaa5e47d2b4b68f26f8 SHA512 764d54e5c6542e85224da496627ab7f421a32cc1a8cc40126623cb85617b62101d0889e9ec89b59e112b0b4723d2f48383fe05d4a11779171a2895a8b9660898
+EBUILD fftw-3.3.9.ebuild 4054 BLAKE2B 11a7746384d1a61d24b66deffa2e20a0e030cecbba14d138196ba99a72d4d37248771607ca2a33af41d42103ca09365c1d66a0b226469eefabd94f1b0baa7f17 SHA512 8e2b8522398387550289b4cdd46ce959ca94577c8b94a5c3d63b676acd0225782210e694efea2423a67c49ffd1bcc2a7d4fdc4a22d816120dd65140f50d0beba
 EBUILD fftw-9999.ebuild 4062 BLAKE2B 2cdb80fdc4d24ea3af6ec1ffc2b73450c76e735130d22e8e01cb479d3c24b5f2bd4926a947a937340988447863bf7d1b222702a337139f5fc1e437556f7f5137 SHA512 0e44b6d0f2262ec0978ab00b909f0b2d6b4c92e0a6a5cc10e9e3317d2b9c7e1d4654315f618ed18f46aa68eeaaadfff29a7a38ef8a71c52435a1012307bbbe47
-MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
+MISC metadata.xml 1081 BLAKE2B ef31000f7d7f02b98d2b982ecfdf9e1560fbce84098b4b1ff8964e35be53b4ac0a4b098c03f07557316de988b6791949fef7e4900d23e9d922293143e42ec1e2 SHA512 bcbac3f302c6c064782c8567a33f2b67f7a03e3efc02e8a2fc8f023286ea91c93b943b92ad7ddd48ec5a6cc5c33f8f2b6c35d985b6f8b361b41f5e9bcf243bfc
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 ae84f01be618..000000000000
--- 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/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 7b33de00082e..32ce75db90af 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+"
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 38679de9df3e..c884ae1bb936 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -17,10 +17,10 @@
   <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>
+    <remote-id type="github">FFTW/fftw3</remote-id>
     <remote-id type="freecode">fftw</remote-id>
   </upstream>
 </pkgmetadata>