gentoo auto-resync : 17:07:2022 - 20:32:17

3 files changed, 47 insertions, 37 deletions

diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 1f34e91c7793..2519fe4ad5be 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,6 +1,5 @@
-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-r1.ebuild 2176 BLAKE2B f7f3c76d544101ffc2c64966ed60e96dc9efc2848e8ab62d3d6e9f8a306d925ba238b54f6596883447cedccfc2d95768145943fc9a6b1230eed1816bd3fff324 SHA512 af8133ff26554e0a0ff337011362852a274f59b13d9116036f4b801dac397df70444716b7f645c16756870b34fb99a87951748e5122b231d7e4c90f1c534032b
 EBUILD wget2-2.0.1.ebuild 2715 BLAKE2B 3be7e1a72cc0ed2fbc9e0267c380f35aa1accac3a67655089014fff05919b73204f57fbd075da0651eaf90753a80bc2f101095c56ea4af0ceb29af80645498ed SHA512 41fb6d27c190aa083c506e8932cd180440c2413344c2c8f3b9f059ef6647d8c9b3d8f4b3a57b85551fe002bd44d312e41bf5475d502ab5b49425619b7327918e
-EBUILD wget2-9999.ebuild 2715 BLAKE2B 3be7e1a72cc0ed2fbc9e0267c380f35aa1accac3a67655089014fff05919b73204f57fbd075da0651eaf90753a80bc2f101095c56ea4af0ceb29af80645498ed SHA512 41fb6d27c190aa083c506e8932cd180440c2413344c2c8f3b9f059ef6647d8c9b3d8f4b3a57b85551fe002bd44d312e41bf5475d502ab5b49425619b7327918e
+EBUILD wget2-9999.ebuild 2519 BLAKE2B 1ba52b6dd037f081d5bb2ccdb10dbdd87fb0b70be92b1a66ae3e3db6f4a7b2c1ffba9be48f5fa0a214b2d255c496e3f24554f8e68c2cc88733a62f7c6f4a6e11 SHA512 5f0bc1311126366d750e85d6f6b4826908a52c4ce4462507af5d56aa7b2c8873839ea81cbac5ed4141fcf757ad1fbd941529af7c9a437919230ba1542bc05c79
 MISC metadata.xml 834 BLAKE2B 8eab169590bc792f2063eec8dea70a83a9ba7bd4f363bd6c707ab56f183bffa90008acec04cb18e2aaff9a94195c7e578ea986153a52ca6d40bc7054f37cbb5c SHA512 b565e77d2c6a21178f67d26136e08a3a5eda96786dfea254998a74c032c1864983a1a2757be3b8a9bad733909e85640d1fae859bfe4b7a2e6bb50e2f570aa152
diff --git a/net-misc/wget2/wget2-2.0.0-r1.ebuild b/net-misc/wget2/wget2-2.0.1-r1.ebuild
index 3553f054442f..39c4ff7aedd7 100644
--- a/net-misc/wget2/wget2-2.0.0-r1.ebuild
+++ b/net-misc/wget2/wget2-2.0.1-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
 HOMEPAGE="https://gitlab.com/gnuwget/wget2"
@@ -40,12 +42,19 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	valgrind? ( dev-util/valgrind )
 "
 
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	default
+	sed -e "/LIBWGET_VERSION/s/2.1.0/${PV}/" \
+		-i configure.ac ||die
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--disable-static
@@ -61,7 +70,7 @@ src_configure() {
 		$(use_with gpgme)
 		$(use_with http2 libnghttp2)
 		$(use_with idn libidn2)
-		$(use_with lzip lz)
+		$(use_with lzip)
 		$(use_with lzma)
 		$(use_with pcre libpcre2)
 		$(use_with psl libpsl)
@@ -76,7 +85,16 @@ src_configure() {
 src_install() {
 	default
 
-	doman docs/man/man{1/*.1,3/*.3}
+	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
diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild
index ce2c19d3ae57..e724cebc4531 100644
--- a/net-misc/wget2/wget2-9999.ebuild
+++ b/net-misc/wget2/wget2-9999.ebuild
@@ -3,17 +3,15 @@
 
 EAPI=8
 
+inherit autotools git-r3
+
 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
+EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
+
 LICENSE="GPL-3"
 SLOT="0/0" # subslot = libwget.so version
+KEYWORDS=""
 IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib"
 REQUIRED_USE="valgrind? ( test )"
 
@@ -44,40 +42,35 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	valgrind? ( dev-util/valgrind )
 "
 
 RESTRICT="!test? ( test )"
 
 src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
+	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
+	# 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
 }
 
 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
+
+	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
 }
 
 src_configure() {