gentoo resync : 16.09.2021

3 files changed, 98 insertions, 2 deletions

diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 19945ceb4a93..6e2b412fb6d5 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -3,6 +3,8 @@ AUX wget2-1.99.2-autoconf270.patch 731 BLAKE2B 9d2ca6dd7cacdffc4cf1e69ac69e33e0e
 AUX wget2-1.99.2-avoid_bashisms.patch 3381 BLAKE2B 4c7c246641e2289811905424e541b47ee6bc28d84ac99960be5b34661996e08872067c0180482f5445ae4e742e34036198c3c3f0f63dc73ebbe7953406d37ab0 SHA512 7c952ceaa0de02eba20febbe5a74e6c1fd1b5a52a6b8edc464ab16c95c1a593a645d28552f0121a4cdd2f42aeec7d075f4b65f6f985c1b7b1decf30c831b629a
 AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e612851c73bb764c125a4db392c3baf0a1eef05652f883f21d9bf0dc4528fa40cda79edc29f836a27782003bb78f336136fcee1e3a SHA512 75e90ad557cb231aafb5d28f8403c9bdeb2d61f64d10084df20ab077b3fc16cf7bd47d880d04ea6f1db0a09870e7161f5ac644d340ba4526354e62d238b477d3
 DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f
+DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb
 EBUILD wget2-1.99.2.ebuild 2102 BLAKE2B da8f7c03ff6e86568f14e58f23e8d0cb6656bccaa3cff04ffe7c9b1073d5007c598052ee668f6c6e8eacdf80e47ae62a3e30df0453c8ce74b016be3d965669f3 SHA512 cf9b5acba95447cd0c30130052c2ddd9a5316744749fe873ed86b454ab8dec5d692abcbfd70a7c33d89624385ec01114aa629c6daa30629d4d6d18795d04816a
+EBUILD wget2-2.0.0.ebuild 2012 BLAKE2B a19b91f7e59fa9161e590b6df262f69f40489444e8f410d1d54c2dab2cddca7fba00b34b77ca378a76b108dbc5c13885e7b9f67c3b0d6ed4faff0a80e3e5be91 SHA512 2da735658416e1cc74df5c231f772c899cffbd9920b7cbd64b1885f0fe4e2adb562091306241dd6534d8ef6d0223d83953db03d4fa9dc39db3ea3e82cb2e65cb
 EBUILD wget2-9999.ebuild 2579 BLAKE2B 8428353d808b131ecfa1006f20fc8c8101eb9ad62b9a961583495df938d2bf5c0023db1deebe0e5e2e0c3a012e33ac5ff83a0ebba50ff33d5d3bb7f4b7c4de0c SHA512 ca1f07a9893d2fd42ed32e6c4104509fc2a66b8229966821693365ad07e1d2014fea053fca832dcadba4b9f1164f2647209d3530d0d77d571e987fea7e78d3ae
-MISC metadata.xml 735 BLAKE2B 1576145baca52953bb11f3dc62ba91ae020b1307f82c8c0ee41169f9f119db36e3c1db946494d6308cd579d9a911fa0fcd5cefa64f9041970bec9818f26bc821 SHA512 4fb658bde014d80a77cf0532e9dfc24f78fc0e3418d72937ae3ca9ee60508cf945c8812ce189025e808a8994bc82079887dc2a31b91d7254495404b92ffdd3ff
+MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40
diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml
index e11e2ca24ca2..5c9152ae45cd 100644
--- a/net-misc/wget2/metadata.xml
+++ b/net-misc/wget2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
@@ -9,6 +9,7 @@
 		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag>
 		<flag name="http2">Enable HTTP/2.0 support via <pkg>net-libs/nghttp2</pkg></flag>
+		<flag name="lzip">Enable <pkg>app-arch/lzip</pkg> support</flag>
 		<flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag>
 		<flag name="valgrind">Depend on <pkg>dev-util/valgrind</pkg> for test suite</flag>
diff --git a/net-misc/wget2/wget2-2.0.0.ebuild b/net-misc/wget2/wget2-2.0.0.ebuild
new file mode 100644
index 000000000000..2926f4837238
--- /dev/null
+++ b/net-misc/wget2/wget2-2.0.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
+HOMEPAGE="https://gitlab.com/gnuwget/wget2"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/0" # subslot = libwget.so version
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib"
+REQUIRED_USE="valgrind? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli )
+	bzip2? ( app-arch/bzip2 )
+	!gnutls? ( dev-libs/libgcrypt:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	gpgme? (
+		app-crypt/gpgme
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	http2? ( net-libs/nghttp2 )
+	idn? ( net-dns/libidn2:= )
+	lzip? ( app-arch/lzlib )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre2 )
+	psl? ( net-libs/libpsl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	valgrind? ( dev-util/valgrind )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Upstream attempts to be "smart" by calling ldconfig in
+	# install-exec-hook
+	"${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-plugin-support
+		--with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)"
+		--without-libidn
+		--without-libmicrohttpd
+		$(use_enable doc)
+		$(use_enable valgrind valgrind-tests)
+		$(use_enable xattr)
+		$(use_with brotli brotlidec)
+		$(use_with bzip2)
+		$(use_with gpgme)
+		$(use_with http2 libnghttp2)
+		$(use_with idn libidn2)
+		$(use_with lzip lz)
+		$(use_with lzma)
+		$(use_with pcre libpcre2)
+		$(use_with psl libpsl)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	doman docs/man/man{1/*.1,3/*.3}
+
+	find "${D}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/${PN}_noinstall || die
+}