gentoo resync : 08.10.2021

4 files changed, 27 insertions, 70 deletions

diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index 8afd69708ee4..53a5a7909dcc 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -1,7 +1,7 @@
 AUX djbfft-0.76-gcc3.patch 1176 BLAKE2B a5a3301b5aefad844fc08fb8172b6b9be1f538f38f918c1f2a72a36710bea5ebe1a3c3c77362d8585d8167a8ef8a68d246f4e37063f4a3ddec5939e129f4d1ee SHA512 e7de40d8ecf5447921fd5f9c21a0a44f58c7351457d029d9848514e032e495a13da2f282c6c3d05f00fd85c1af8d0799db64c786b1a0286ab03dc7c2148dd23c
 AUX djbfft-0.76-headers.patch 627 BLAKE2B 297b8211ec302d127501d5bcdd27f6c08b04cf9bc77938d4dd8e2d215d0a856836d4e2960676b77fe05fe64d0ce3a667cec198aeb6ef56aaecfa88ed59e0453e SHA512 c3ba289a6f0c316db55f42784749c02d41b94fa7cbe8e306eb2e982cac5e2c0a8d90456ea0992fce2a99f54ca63b21123b52c7decc9049005cb9f571b4e2271e
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
+AUX djbfft-0.76-tc-directly.patch 654 BLAKE2B 1e564386a6601e2459b0a9c06ccb35c2d13ce64e979badce90bc34cc0a5dcee531691e8bd73bfcdac50884a5f8d2b40b21d61b81f666cc383463fe6575a2a2c6 SHA512 52a37e7c8afc04fd2e3557caff78f9df985ce57dcc9c28e9741e8d8fefe0ce5e57cb731d3f48f52a83c57315ba656cc4e9cd13eabf659b341a5a0206dbc63918
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r2.ebuild 1796 BLAKE2B 7da42e19ec9df3deb3379b9a2a7c086ace410eb0e705808249eadb6fe23fdae6fcc0c9c1f61b3c12ecc2cd098e15f7b45d1cb6e9207bfa7a3fb8fb72af6cf716 SHA512 b8d642c003a3f1dc6007ad6e4448b79b12e096c8716403642d6c594ef7cd93a9049ea6c5f9d26f673e6a487e6e7a16f896b2777d14edc3166e4ab7a31a2b1646
-EBUILD djbfft-0.76-r3.ebuild 1798 BLAKE2B 4a4670cc0720fbcab8a2d6eeb4080c51030e120b4207708792a8439d5750a29c9f30a3545c8152b36b4a2ca29145945714a592af57dfaa449fe6dd1bdb15ba24 SHA512 d663489b64e4d86051f408a3ccc979e016ce79b8bee1d80d4804226d807d59dc2cd68aa7ae3c700ec0870e687734ea982956f158968036b07627715a4a41b155
+EBUILD djbfft-0.76-r3.ebuild 1850 BLAKE2B d25320e4c06973c03f38d51389da51667c1069f9ecfb9bb262bbb02b1bdbf85c112cd6bfab326d28f106b03af4f0a24ae50a0f82facbc9e5462f97709f4f56f8 SHA512 ca8b97ae9a9c7e37bce10d89bd9696f33c9a8e1cda9494bae0c3c56e5ab0038104410dde57a1f13089b33ad0ebc386553ee1ee411c816c57f8138e66a9a75fd3
 MISC metadata.xml 841 BLAKE2B b9f05655100626962240f98de3ac56c04f5d7ce5b39e7d7fb22e5eef30af63159c2442ba1e21b86b68e829fa094cc7d0afd444fd01f3e9a9bbaa4130fa95250c SHA512 f40530a4793232de9a19f3675fc1f77fcfb8c2a6cc588fbcb2587611c8bd5c92e49181ce020f48698c01cea4614a6f38abe60673ae3fc1c4392097e5a983b9d9
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
deleted file mode 100644
index b631df7d2c3a..000000000000
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Extremely fast library for floating-point convolution"
-HOMEPAGE="http://cr.yp.to/djbfft.html"
-SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DOCS=( CHANGES README TODO VERSION )
-
-src_prepare() {
-	SOVER="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
-	# mask out everything, which is not suggested by the author (RTFM)!
-	ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math"
-	strip-flags
-
-	SONAME="libdjbfft.so.${SOVER}"
-
-	epatch \
-		"${FILESDIR}"/${P}-gcc3.patch \
-		"${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${P}-headers.patch
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == x86* ]] && append-cflags -malign-double
-
-	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
-	echo "$(tc-getCC) ${CFLAGS} -fPIC" > "conf-cc"
-	echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld"
-	echo "${ED}usr" > "conf-home"
-	einfo "conf-cc: $(<conf-cc)"
-}
-
-multilib_src_compile() {
-	emake \
-		LIBDJBFFT=${SONAME} \
-		LIBPERMS=0755 \
-		${SONAME}
-	echo "the compile function was:"
-	cat ./compile
-	echo "the conf-ld function was:"
-	cat ./conf-ld
-}
-
-multilib_src_test() {
-	local t
-	for t in accuracy accuracy2 speed; do
-		emake ${t}
-		einfo "Testing ${t}"
-		LD_LIBRARY_PATH=. ./${t} > ${t}.out || die "test ${t} failed"
-	done
-}
-
-multilib_src_install() {
-	emake LIBDJBFFT=${SONAME} install
-	./install || die "install failed"
-	dosym ${SONAME} /usr/$(get_libdir)/libdjbfft.so
-	dosym ${SONAME} /usr/$(get_libdir)/libdjbfft.so.${SOVER%%.*}
-}
diff --git a/sci-libs/djbfft/djbfft-0.76-r3.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
index 87ed3a30bcda..eee460123e69 100644
--- a/sci-libs/djbfft/djbfft-0.76-r3.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
@@ -11,12 +11,13 @@ SRC_URI="https://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc3.patch
 	"${FILESDIR}"/${P}-shared.patch
 	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-tc-directly.patch
 )
 
 DOCS=( CHANGES README TODO VERSION )
@@ -35,6 +36,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	tc-export AR RANLIB
 	[[ ${ABI} == x86* ]] && append-cflags -malign-double
 
 	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
diff --git a/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
new file mode 100644
index 000000000000..340d3b7be6a6
--- /dev/null
+++ b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
@@ -0,0 +1,22 @@
+# https://bugs.gentoo.org/731874
+# https://bugs.gentoo.org/725432
+--- a/Makefile
++++ b/Makefile
+@@ -736,7 +736,7 @@ warn-auto.sh systype
+ 	echo 'rm -f "$$main"'; \
+ 	echo 'if [ "$${main##*.}" = "a" ]'; \
+ 	echo 'then'; \
+-	echo '  ar cr "$$main" $${1+"$$@"}'; \
++	echo '  $(AR) cr "$$main" $${1+"$$@"}'; \
+ 	case "`cat systype`" in \
+ 	sunos-5.*) ;; \
+ 	unix_sv*) ;; \
+@@ -745,7 +745,7 @@ warn-auto.sh systype
+ 	dgux-*) ;; \
+ 	hp-ux-*) ;; \
+ 	sco*) ;; \
+-	*) echo '  ranlib "$$main"' ;; \
++	*) echo '  $(RANLIB) "$$main"' ;; \
+ 	esac; \
+ 	echo 'else'; \
+ 	echo '  exec `head -1 conf-ld` -shared -Wl,-soname,libdjbfft.so.0.7.6 -o "$$main" $${1+"$$@"}'; \