gentoo resync : 10.09.2021

3 files changed, 10 insertions, 39 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 579d312f1104..3150be3f0946 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,6 +1,5 @@
-AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d
-DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
-EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7
+DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
 EBUILD wget-1.21.1.ebuild 3474 BLAKE2B 61fa48665cd3fba01a0d83529c3e0087941e2d9fc97732409b27077305be0950fb5bc319a3c65c7bfda4c55ffbb231696dfa0568057829669e9f61fb6a0daa1f SHA512 5c5699eb526c63b185cbc95e94c5f68bd1c2b1c6220627b40d85e0f133a96fe45cf43c888baa97dd544fc37c5b7a07e81e41c66e9950ca8a30de034b94a09b3c
+EBUILD wget-1.21.2.ebuild 3482 BLAKE2B ac50120b7656ac61c82dec60d8c5a9d19264830ace1ea71595517879ac60030c338bfd4b1cf4e8ad70f07c9dcd64a6db46400e3244cda2469b02d8ce447c50d1 SHA512 183241d3248c38109fe04a28d458646ff985371e09a09dfba624d8e1cac8abe02e74af4b3f81637d3793befda83a152dbb91b65ca00c2aef793969c0cfd39728
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch
deleted file mode 100644
index 3b99f4071af0..000000000000
--- a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Sat, 22 Feb 2020 13:40:50 +0100
-Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with
- gcc 10
-
----
- tests/unit-tests.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unit-tests.c b/tests/unit-tests.c
-index 5fae8a219..f66e5e664 100644
---- a/tests/unit-tests.c
-+++ b/tests/unit-tests.c
-@@ -37,7 +37,7 @@ as that of the covered work.  */
- 
- #include "unit-tests.h"
- 
--const char *program_argstring = "TEST";
-+extern const char *program_argstring;
- 
- static int tests_run;
- 
-@@ -69,7 +69,7 @@ all_tests(void)
-   return NULL;
- }
- 
--const char *program_name; /* Needed by lib/error.c. */
-+extern const char *program_name; /* Needed by lib/error.c. */
- 
- int
- main (int argc _GL_UNUSED, const char *argv[])
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index 28c0a2fa04d9..5dee2e984f60 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
@@ -51,8 +51,6 @@ BDEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
-PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch )
-
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
@@ -77,6 +75,12 @@ src_configure() {
 	# the included gnutls -- force ioctl.h to include this header
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
 
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
+		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
+		append-cppflags '-D__nonnull\(X\)='
+	fi
+
 	if use static ; then
 		append-ldflags -static
 		tc-export PKG_CONFIG