gentoo resync : 16.04.2022

7 files changed, 12 insertions, 265 deletions

diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 2760d9afc4e8..6889be2cae49 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,10 +1,4 @@
-AUX gnulib-autoconf270.patch 895 BLAKE2B af41f5556e598fc1d79376c663cb92d5d595520822ad663c8ddd89763c3c495aeb0921b6fed8e9d99f2eb4ba26fcccee423da3202a3def329d5aa7fb9dcbce53 SHA512 16ba1c4f50104a714e288f0fb9e8272441bdf19b50bfa9369b16b97e52f8a4a930414d1b689bebd5be1b6968a296719af1c6597248f6944f65cb269980f97240
-AUX wget2-1.99.2-autoconf270.patch 731 BLAKE2B 9d2ca6dd7cacdffc4cf1e69ac69e33e0eb58d6a939f1cb3a5879f568d3d510793ac3e993559b30eb1064b84692c3c705228b0d758638a8f3dad7866b954b532b SHA512 2698ba783cec7f53b270078f28b9bd35c034e1a56d5a2e94c1bc11d12fc9c7201db301f187653f715217443848af7d9f97b6fd39ee4daa11f7d3c1674aae78d5
-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-r1.ebuild 2104 BLAKE2B 38100ac5a73934db345d213d554a8e26e7f3280cccf499b3e47253350b39a307bec1fa1a1f9c58d08f6f3b34b0f2e4d1871e04b583a03a12145922d710fbaa8c SHA512 3ccdf6179507af526a964044c21032c4308f74c26673c0f77ce6926b8e746efb668636e4bfef61b5260cc32e3f73af5a96d4562953b01c6fb6022484dff846ac
 EBUILD wget2-2.0.0-r1.ebuild 1848 BLAKE2B 29c9e15fa14842d81817b9638a36a2281175992d9704349f9f718b07c42174b7fc8588a41de668498537890abc3a84a21a896882a88074b5f06b80f657a08567 SHA512 cd96f2efa6b7e03fad24c35d6086110b8524d2a1e5138c561aa5ca418662ae571b61c091b1eb0c2a523a5bb9f960d9cf9c992d6d53437e2b614b6c6a37858bf5
-EBUILD wget2-9999.ebuild 2467 BLAKE2B e74a3d694e56e5ab2459ddb81a2fb128dd22a3124eda17390e9e1a37bdd23b5b68f0c730a634f04df95af8e9121196bebc67a5b9e97d75d129e57119aeda195f SHA512 ae8d7ba174e2ec49914b9034b88ce0bbd166fc87f900094f7f72393a0274f453ca97fb33b93eb2df901dd9570d3194aa4eb46b0ab18b9716c34f2a127061fbaa
+EBUILD wget2-9999.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
 MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40
diff --git a/net-misc/wget2/files/gnulib-autoconf270.patch b/net-misc/wget2/files/gnulib-autoconf270.patch
deleted file mode 100644
index b0cfe0e8663e..000000000000
--- a/net-misc/wget2/files/gnulib-autoconf270.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blobdiff_plain;f=m4%2Fstd-gnu11.m4;h=b5ab8abed0288b1197fe9f49dcf6aeb6b503ddf3;hp=db833d820f3b5b26e0f218ef87daf4fc1be54f2d;hb=a3b3fc85e3e632374811b27cb2111e50fa177e36;hpb=c6b798d3754a4ee18c3e5e0fff4310105d7894b2
-
-diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
-index db833d8..b5ab8ab 100644
---- a/m4/std-gnu11.m4
-+++ b/m4/std-gnu11.m4
-@@ -6,6 +6,8 @@
- # This implementation will be obsolete once we can assume Autoconf 2.70
- # or later is installed everywhere a Gnulib program might be developed.
- 
-+m4_version_prereq([2.70], [], [
-+
- 
- # Copyright (C) 2001-2020 Free Software Foundation, Inc.
- 
-@@ -822,3 +824,6 @@ dnl Tru64	N/A (no support)
- dnl with extended modes being tried first.
- [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
- ])# _AC_PROG_CXX_CXX11
-+
-+
-+])# m4_version_prereq
diff --git a/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch b/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch
deleted file mode 100644
index f4f3dc192638..000000000000
--- a/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 580af869093cfda6bc8a9d5901850354a16b3666 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Fri, 25 Dec 2020 18:55:34 +0100
-Subject: [PATCH] * configure.ac: Use AC_CONFIG_MACRO_DIR only once
-
-This fixes #547 (autotools 2.70 is more restrictive).
-Reported by: Gabriele Balducci
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7e29b8cba..0a4dc05b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,7 +100,6 @@ AC_CONFIG_FILES([include/wget/wgetver.h])
- 
- AC_CONFIG_SRCDIR([src/wget.c])
- AC_CONFIG_HEADERS([config.h])
--AC_CONFIG_MACRO_DIR([m4])
- 
- # Non-verbose make
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--- 
-GitLab
-
diff --git a/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch b/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch
deleted file mode 100644
index 8835171bb61c..000000000000
--- a/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 60b50a9076c06933f7255afc8df0733a4311f767 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Thu, 29 Oct 2020 23:05:18 +0100
-Subject: [PATCH] * configure.ac: Fix configure.ac bashisms
-
-Reported-by: Brian Inglis
-
-Backported to 1.99.2 release
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ab3d9fdf..4cc5eff2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -350,13 +350,13 @@ if test "$enable_doc" = yes; then
-   if test -n "$DOXYGEN" || test -n "$PANDOC"; then
-     LIBWGET_DOCS_INFO="yes (found:"
-     if test -n "$DOXYGEN"; then
--      LIBWGET_DOCS_INFO+=" Doxygen)"
-+      LIBWGET_DOCS_INFO="$LIBWGET_DOCS_INFO Doxygen)"
- 	else
- 	  LIBWGET_DOCS_INFO="no"
-     fi
-     WGET2_DOCS_INFO="yes (found:"
-     if test -n "$PANDOC"; then
--      WGET2_DOCS_INFO+=" Pandoc)"
-+      WGET2_DOCS_INFO="$WGET2_DOCS_INFO Pandoc)"
- 	else
- 	  WGET2_DOCS_INFO="no"
-     fi
-@@ -440,7 +440,7 @@ PKG_PROG_PKG_CONFIG
- 
- AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl], [Use SSL/TLS with specified library. Options: 'gnutls' (default), 'openssl', 'wolfssl' or 'none']), with_ssl=$withval, with_ssl=gnutls)
- 
--AS_IF([test "x$with_ssl" == "xgnutls"], [
-+AS_IF([test "x$with_ssl" = "xgnutls"], [
-   PKG_CHECK_MODULES([GNUTLS], [gnutls], [
-     with_gnutls=yes
-     LIBS="$GNUTLS_LIBS $LIBS"
-@@ -452,16 +452,16 @@ AS_IF([test "x$with_ssl" == "xgnutls"], [
-       [with_gnutls=no;  AC_MSG_WARN(*** GNUTLS was not found. You will not be able to use HTTPS. Fallback to libnettle for hashing and checksumming.)])
-   ])
- 
--  AS_IF([test "x$with_gnutls" == xyes], [
-+  AS_IF([test "x$with_gnutls" = xyes], [
-     AC_SEARCH_LIBS(gnutls_hash, gnutls, [with_gnutls_hash=yes])
--    AS_IF([test "x$with_gnutls_hash" == xyes],
-+    AS_IF([test "x$with_gnutls_hash" = xyes],
-       [AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [#include <gnutls/gnutls.h>])])
-     AC_CHECK_HEADERS([gnutls/ocsp.h])
-     AC_CHECK_FUNCS(gnutls_srp_server_get_username gnutls_transport_get_int)
-   ])
- ])
- 
--AS_IF([test "x$with_ssl" == "xopenssl"], [
-+AS_IF([test "x$with_ssl" = "xopenssl"], [
-   PKG_CHECK_MODULES([OPENSSL], [openssl], [
-     with_openssl=yes
-     LIBS="$OPENSSL_LIBS $LIBS"
-@@ -474,7 +474,7 @@ AS_IF([test "x$with_ssl" == "xopenssl"], [
-     ])
-   ])
- 
--  AS_IF([test "x$with_openssl" == xyes], [
-+  AS_IF([test "x$with_openssl" = xyes], [
-     AC_CHECK_HEADERS([openssl/ssl.h])
-     AC_CHECK_HEADERS([openssl/x509_vfy.h])
-     AC_CHECK_FUNCS(SSL_new X509_STORE_add_lookup)
-@@ -846,9 +846,9 @@ AC_CONFIG_FILES([Makefile
- AC_OUTPUT
- 
- # Check if expected TLS library was found and print it
--AS_IF([test "x$with_ssl" == xwolfssl && test "x$with_wolfssl" == xno], [ssl_enabled="(not found)"],
--  [test "x$with_ssl" == xopenssl && test "x$with_openssl" == xno], [ssl_enabled="(not found)"],
--  [test "x$with_ssl" == xgnutls && test "x$with_gnutls" == xno], [ssl_enabled="(not found)"],
-+AS_IF([test "x$with_ssl" = xwolfssl && test "x$with_wolfssl" = xno], [ssl_enabled="(not found)"],
-+  [test "x$with_ssl" = xopenssl && test "x$with_openssl" = xno], [ssl_enabled="(not found)"],
-+  [test "x$with_ssl" = xgnutls && test "x$with_gnutls" = xno], [ssl_enabled="(not found)"],
-   [])
- 
- AC_MSG_NOTICE([Summary of build options:
--- 
-2.30.0
-
diff --git a/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch b/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch
deleted file mode 100644
index 6953b7314b63..000000000000
--- a/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eb2aefb01868e91f2e1252ddd1bcdb9c075e5b49 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 8 Mar 2020 21:46:15 +0100
-Subject: [PATCH] Don't run ldconfig by default
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Makefile.am | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 979ad1b1..5bc6f6ce 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -75,7 +75,3 @@ fuzz-coverage: clean clean-lcov
- check-local:
- 	$(AM_V_at)$(MAKE) -s syntax-check >/dev/null
- 	$(AM_V_at)$(srcdir)/contrib/check_options $(srcdir)/docs/wget2.md $(builddir)/src/wget2$(EXEEXT)
--
--# ppl often forget to run ldconfig after an install, so let's do it here
--install-exec-hook:
--	$(AM_V_at)$(LDCONFIG) || :
--- 
-2.25.1
-
diff --git a/net-misc/wget2/wget2-1.99.2-r1.ebuild b/net-misc/wget2/wget2-1.99.2-r1.ebuild
deleted file mode 100644
index 162be638c908..000000000000
--- a/net-misc/wget2/wget2-1.99.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 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 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 )"
-
-PATCHES=(
-	# Upstream attempts to be "smart" by calling ldconfig in
-	# install-exec-hook
-	"${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch
-
-	# Fixes from upstream
-	"${FILESDIR}"/${P}-avoid_bashisms.patch
-	"${FILESDIR}"/${P}-autoconf270.patch
-	"${FILESDIR}"/gnulib-autoconf270.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 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
-}
diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild
index 632bafad63f9..57cdc0a2f977 100644
--- a/net-misc/wget2/wget2-9999.ebuild
+++ b/net-misc/wget2/wget2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
 HOMEPAGE="https://gitlab.com/gnuwget/wget2"
@@ -108,7 +108,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