gentoo resync : 04.05.2021

4 files changed, 9 insertions, 18 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 1de516defbb3..e02c81c08579 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -5,7 +5,7 @@ AUX wget-1.21-gnulib-utime-errno.patch 753 BLAKE2B 01d236f8252e1ea2764e317f78740
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
 DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a
-EBUILD wget-1.20.3-r3.ebuild 3373 BLAKE2B c842b2e65de0c7ea244d967d835321eeb774fb263a9098d732378041562e6a5aacfa4307db7dea428da81ef87af403259dca6be869d51be56ffd353309b3518c SHA512 30462ffe42e576503853428665aeed06849f46ffb996c398f84483726d3cfb8c4e98ca8cabd49f31eef9db804cdf8ce4ae0d09e10c41fc38c3733ea9c300c8bc
-EBUILD wget-1.21-r1.ebuild 3519 BLAKE2B bc3853edeead8f9324dcfff52e5585fd0186ec95c4c819a4643a7b6fbee0625cba91036e45fd5126c65547fadb0171694b8cde0b5dd495a5855fef5c25dc4819 SHA512 09cbdebb4f98fcdd6a8899153b37deaeadc388c6931bddf5a415c91f72a15b9cbdfda88dddb947af6f54f1f7799b09b0226619a0b7ec41e8d315cdeb62550114
-EBUILD wget-1.21.1.ebuild 3327 BLAKE2B 6970c184887babbc1c09c236bd50a1146648b76fcf9e17f3aa5c511182cb2248ea16ee0b896ece2662ee6299b598ce8e2b148d0191d4f5370902532cb49e05d5 SHA512 3c8b785e3d7b00759af919aae692ae1dc26dcc9e4ed57007df7d5a6e067a84ea26e0fd38c228ab900da07cabafa7f9b08af7b435f1a4dc62fed7bbf0c67103e0
+EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7
+EBUILD wget-1.21-r1.ebuild 3436 BLAKE2B bc9b13ef84dceed0714a423de3c96bd5cb3540a799803e3e9558dbc864f7da14ba347708b55f810eded4320c0581185aaa2231ea2a4f984f122843216bfdb11e SHA512 8d565683e9a0e28897661b57b9e26e288b9a9864d9a40f4e1efa6d4552b4d050b7835dfbf58e322cd928d2ffb419333a499122017ab9faa97d3b1b74adb831d2
+EBUILD wget-1.21.1.ebuild 3244 BLAKE2B 66fffe658f8c23fdf58b14af890d0007ccd3c8eeee3bd0f6ce849290eb2b7cf30f698bbf368445fe72b59cb7fe57ebae4ab0d088d002aef644f935c022b8b4fd SHA512 48ddfa4bc61e16977f1ccf181be9e1b93dc4667e264552765145ed03f99d6bedcb3a4ff3053fdfea108903d49a668132f98f583bc9f12621fa79ca4f20ff8baf
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 8efcfe141f9c..28c0a2fa04d9 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -14,7 +14,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"
-IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
+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 )"
 
@@ -26,10 +26,7 @@ LIB_DEPEND="
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
+		!gnutls? ( dev-libs/openssl:0=[static-libs(+)] )
 	)
 	uuid? ( sys-apps/util-linux[static-libs(+)] )
 	zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/wget/wget-1.21-r1.ebuild b/net-misc/wget/wget-1.21-r1.ebuild
index 0c99c801bfd6..3337acda223f 100644
--- a/net-misc/wget/wget-1.21-r1.ebuild
+++ b/net-misc/wget/wget-1.21-r1.ebuild
@@ -14,7 +14,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"
-IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
+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 )"
 
@@ -26,10 +26,7 @@ LIB_DEPEND="
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
+		!gnutls? ( dev-libs/openssl:0=[static-libs(+)] )
 	)
 	uuid? ( sys-apps/util-linux[static-libs(+)] )
 	zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild
index 52e3021d7e8b..71aaf01dd5f9 100644
--- a/net-misc/wget/wget-1.21.1.ebuild
+++ b/net-misc/wget/wget-1.21.1.ebuild
@@ -14,7 +14,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"
-IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
+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 )"
 
@@ -26,10 +26,7 @@ LIB_DEPEND="
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
+		!gnutls? ( dev-libs/openssl:0=[static-libs(+)] )
 	)
 	uuid? ( sys-apps/util-linux[static-libs(+)] )
 	zlib? ( sys-libs/zlib[static-libs(+)] )