gentoo resync : 29.12.2022

3 files changed, 128 insertions, 5 deletions

diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 6889be2cae49..b617157a965a 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,4 +1,6 @@
 DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb
+DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
 EBUILD wget2-2.0.0-r1.ebuild 1848 BLAKE2B 29c9e15fa14842d81817b9638a36a2281175992d9704349f9f718b07c42174b7fc8588a41de668498537890abc3a84a21a896882a88074b5f06b80f657a08567 SHA512 cd96f2efa6b7e03fad24c35d6086110b8524d2a1e5138c561aa5ca418662ae571b61c091b1eb0c2a523a5bb9f960d9cf9c992d6d53437e2b614b6c6a37858bf5
+EBUILD wget2-2.0.1.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
 EBUILD wget2-9999.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
-MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40
+MISC metadata.xml 719 BLAKE2B 5461e4ca50d06c5f53726d5922ffdf72ca33beb77b093e64b7a0d0d2e62511c815d1aefd1bb0d8f2f066d466ecd11da2e2a3e8cfc3b4923abc20dc6900bbce6e SHA512 7d0ef8c43239610cc56574bcdf7d4b9e52abb9a3dfa39a24ab669ad3ab740587080f913c48311cf518026198d6ac6571dd7f96d8ba24154a64201e0cc5b8d7c0
diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml
index 5c9152ae45cd..7d7d6c67e605 100644
--- a/net-misc/wget2/metadata.xml
+++ b/net-misc/wget2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag>
diff --git a/net-misc/wget2/wget2-2.0.1.ebuild b/net-misc/wget2/wget2-2.0.1.ebuild
new file mode 100644
index 000000000000..57cdc0a2f977
--- /dev/null
+++ b/net-misc/wget2/wget2-2.0.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
+HOMEPAGE="https://gitlab.com/gnuwget/wget2"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
+else
+	SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3"
+SLOT="0/0" # subslot = libwget.so version
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn 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:= )
+	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 )"
+
+src_unpack() {
+	if [[ "${PV}" == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib :-/
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+			--skip-po
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+		eautoreconf
+	fi
+}
+
+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 lzma)
+		$(use_with pcre libpcre2)
+		$(use_with psl libpsl)
+		$(use_with zlib)
+
+		# Avoid calling ldconfig
+		LDCONFIG=:
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		if use doc ; then
+			local mpage
+			for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do
+				doman ${mpage}
+			done
+		fi
+	else
+		doman docs/man/man{1/*.1,3/*.3}
+	fi
+
+	find "${D}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/${PN}_noinstall || die
+}