6 files changed, 83 insertions, 7 deletions
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 081a426a2c71..13d7e90a10e2 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,6 +1,9 @@
 AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d
+AUX wget-1.21-avoid_bashisms.patch 870 BLAKE2B 12c695361b55fe9f1cccac1d99294af9685f83a6dc7a05fc0eb90a1fcf9b12677638de9a78db6889a573b365e2688911ba4ddc9b2f9cfb8675b4b1cb594a7d51 SHA512 62c462fca5b4c7600e12c6e0f8895d91ae11f1b14dcdac642e8e248abf83a93bfc045e10245872677d72b5d3720ebaeb62473e6d396e5ced9c77714928d105cf
+AUX wget-1.21-avoid_eautoreconf.patch 214 BLAKE2B f03448fb7d494544d3fe579cc4460ab8d36bb033f0bdcb700fcf851c4e0e2e539bdc5d1bd08dd3fcecf3aa1957ff7ac68a858716fd96a9510f6cbdde64e0b92c SHA512 161f728b002335753ed085052092ae0563ce8120f44ec8bc06a47743ed6528996ec9e00a92de017eb5de863216c1521bd69663f97cc69f64e2579b08b6bb5f27
+AUX wget-1.21-gnulib-utime-errno.patch 753 BLAKE2B 01d236f8252e1ea2764e317f78740fa6479407ec2e25ff92b8be39e5bbadb33b73d263c326f12372a542cb044f52d60cab76caab1f496739c5b4d3a795c3ae1a SHA512 02b48efcad960e7b1b9b623bd8e99a55ce546e149536b9a43a15f494ee256d7c4616a5587734ee3b5c1c90759950cf48ecd54f1918f1a828fabf28e9158347c3
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a
-EBUILD wget-1.20.3-r3.ebuild 3385 BLAKE2B bff59587a30c3e3d13d736cc39eada0196dc1db6dff6a8ed529ed5bf897de75b0ba20b658b33d0774085743283eb28530cc6221471a247eafbb3cab550e6dd24 SHA512 eb573466f0b0b163d95dc6e34bb12d4e9480a5346d4a21610673c962638f2082e8573eb68f0e0de71dbfa6f84a360bafbc01e89edd566e1a1e77560c9d9ed018
-EBUILD wget-1.21.ebuild 3339 BLAKE2B ebc3d8640844be1e9e34db3df309e779d918fc80a4e9d6e1fc0a45bf69146e749d93014d32625ff51d78d1305867bcdd790cda9aa7aa1860fad863aab384b9dc SHA512 6219dc3ae7f4c048ad1488ce918111a278e8b08e622ba35ebbedaf5eccf7271496392ca0a35bd7b4adf360b5e896b6c7b2675b3449d693f15476350e4a0059a9
+EBUILD wget-1.20.3-r3.ebuild 3374 BLAKE2B b18227c786df61dbe839e4beaa0650ca1a04c34641997d8a8b967ff1a4cab06c662e1e702dc47b6fc90e2dde17e6c4d5c230b002e8613c3b2f82739af7fa2d98 SHA512 d62288f05bd78a46a97b018b9bdcbc2905f337b7a2f10809aa8c5cc421b570548ac611c2b1f67b1ced3361789de1c13783647fa3c6cfc7807afce037d7ee95ea
+EBUILD wget-1.21-r1.ebuild 3519 BLAKE2B 6d428d18831082a16876330751a51a0f9b0f8ddc8360b3c50f359a040f821fe91f50ebcdc3ef5c0a5ee5053e5be23e9db0451eee3d763abb55bd8a620231d6bb SHA512 dfe77397419662fd39e70cca783d53665ce68847180708274a02ac0b879b95d09da92a35bfd0d36ee8bf82af6cb4c343dd7fadb964b749e969a4a037496dfc5b
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/files/wget-1.21-avoid_bashisms.patch b/net-misc/wget/files/wget-1.21-avoid_bashisms.patch
new file mode 100644
index 000000000000..478621ecb594
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21-avoid_bashisms.patch
@@ -0,0 +1,26 @@
+From a9092887e0e98877a205e9052930692f35fb179e Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <gentoo@mattwhitlock.name>
+Date: Sat, 2 Jan 2021 16:27:57 +0100
+Subject: [PATCH] configure.ac: Don't use bashisms
+
+Gentoo-bug: https://bugs.gentoo.org/762946
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96adf13b..f6268fd5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -978,7 +978,7 @@ AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
+ AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"])
+ AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$with_metalink" != "Xno"])
+ AM_CONDITIONAL([WITH_XATTR], [test "X$ENABLE_XATTR" != "Xno"])
+-AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" == "Xyes"])
++AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" = "Xyes"])
+ 
+ dnl
+ dnl Create output
+-- 
+2.30.0
+
diff --git a/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch b/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch
new file mode 100644
index 000000000000..0e02851a2577
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -55925,7 +55925,7 @@
+   WITH_XATTR_FALSE=
+ fi
+ 
+- if test "X$ENABLE_NTLM" == "Xyes"; then
++ if test "X$ENABLE_NTLM" = "Xyes"; then
+   WITH_NTLM_TRUE=
+   WITH_NTLM_FALSE='#'
+ else
diff --git a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch
new file mode 100644
index 000000000000..546028c83df0
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch
@@ -0,0 +1,30 @@
+From 6a76832db224ac5671599ce332717f985a2addc7 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 31 Dec 2020 17:16:57 +0100
+Subject: utime: Fix compilation error on macOS and Solaris 9 (regr.
+ 2020-12-24).
+
+Reported by Tom G. Christensen <tgc@jupiterrise.com> in
+<https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00295.html>.
+
+* lib/utime.c: Include <errno.h>.
+---
+ ChangeLog   | 7 +++++++
+ lib/utime.c | 1 +
+ 2 files changed, 8 insertions(+)
+
+diff --git a/lib/utime.c b/lib/utime.c
+index bf7d7c534..337217950 100644
+--- a/lib/utime.c
++++ b/lib/utime.c
+@@ -261,6 +261,7 @@ utime (const char *name, const struct utimbuf *ts)
+ 
+ #else
+ 
++# include <errno.h>
+ # include <sys/stat.h>
+ # include "filename.h"
+ 
+-- 
+cgit v1.2.1
+
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 8f8647ab77b8..13b6b24cb0d6 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.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
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/wget/wget-1.21.ebuild b/net-misc/wget/wget-1.21-r1.ebuild
index 6034e4a301c6..c8a19550b708 100644
--- a/net-misc/wget/wget-1.21.ebuild
+++ b/net-misc/wget/wget-1.21-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
@@ -54,6 +54,12 @@ BDEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gnulib-utime-errno.patch  # 763123, drop next release
+	"${FILESDIR}"/${PN}-1.21-avoid_bashisms.patch #762946
+	"${FILESDIR}"/${PN}-1.21-avoid_eautoreconf.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }