gentoo resync : 14.05.2020

3 files changed, 38 insertions, 3 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 8306d7ed6094..44c9ad96e437 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +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
 EBUILD wget-1.20.3-r1.ebuild 3215 BLAKE2B 046366c62070b9bfb055fc9b31f1e68817fd34d72f6e1ef60b5810b9d3a0154159a984100b85a7cda4f2dbf6c0d7f7d2e4c423a4742df9c88ca8d3bd396674bd SHA512 20f4632b350d918a04552e92ae61b742d8a99d4c2f5889a8eeb7cd6feb522707b997d5d433e8fcffb40f0851a7e259f704c5ae1aab4a7971c3b3adaa16bf7146
-EBUILD wget-1.20.3-r3.ebuild 3363 BLAKE2B 882c30312ff53b013c38cf4c9b3f2e9d4a5068dbc1c2454f7c0c90b2ff0d7e12ff6a9f88d576966129a62608828a4e608c7dab939497e9cdde366e6ec89d5a62 SHA512 84bb45efe21d6766c5a4c503103305318e3a16a6fb44f0e447cb8f9083cd6ae91f97828be547ff1d7dab095f678e65a12a313315483010ba8933d5b046ae2eb4
+EBUILD wget-1.20.3-r3.ebuild 3411 BLAKE2B 4aeaafbb078031c212673afd0ab734d0415873ed5fed8d773afcdf468d23b8533e6abcf16bc014eaf6641ae361dd5c0852eedab3759e30e961432983b6796325 SHA512 c777144fce1f8d35b56181830f266222deb372e06109df5ff91052012e9db9cbdcaeeff8637fca2f08cf763911bf8680c46402a3e0cf1c8b7249670d23803582
 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
new file mode 100644
index 000000000000..3b99f4071af0
--- /dev/null
+++ b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch
@@ -0,0 +1,32 @@
+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.20.3-r3.ebuild
index dc1e481def73..b66e2ea1140a 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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,8 @@ 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
 }