gentoo new year resync : 01.01.2021

6 files changed, 266 insertions, 1 deletions

diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index e8121cac1bc9..34191edd7391 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,4 +1,8 @@
+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
-EBUILD wget2-1.99.2.ebuild 2021 BLAKE2B b4e1a611f429780746353792c876a1fefc082ad3684e111b2832ec9098fcd7985669eaf5200dc12939a947e636bea52b7c7a142b5036932250989fe177d0dd79 SHA512 98a75a65fff0dc92540b0143fe2765f02f1260d8f47634a62b1ad4cae9791529c36354630b5eedb07f4686c5023e06c0ea1ebcbb3b861e913a2d26d2e953258b
+EBUILD wget2-1.99.2.ebuild 2164 BLAKE2B 68cb44133a25f27e2021ea46c2406f6ba119188fce0a1314d412756aef8e314b7f7247f48d608fad4293d105bb1e0d064be77934f50362646e974c34bea0f8bd SHA512 2db7f7eca437233679730a8cfff77e5e8834d8a5de2319a923ef353626d4e912adee59b8378a3addc6937a23eaee3cc0b3869c62dfa2cb586affa575b1d49cf2
+EBUILD wget2-9999.ebuild 2641 BLAKE2B 1a338e15e660cea0ada7040f1ebef10c89a507b7f0e6efadd51a6cc6ca6724eb0fdab5cca750021676005c125d45ed03081454f0d6c1493522cc3e7470563b7b SHA512 68e227cff7e304bc5ec40f7f3530771d7592d6073e198827915b1069586b4d0311879eed537580efb92c691c739f228aec1757cdd8dee5c4030d19e597aa3b94
 MISC metadata.xml 652 BLAKE2B 3404cf0ecbba0e6fbb3a1e1d232eb379fbcaf0e5f8d295c439a3d5613496c957daf40816f4bc5047df48e35fa4343f6fd874763e6681532412e9446e5860ee27 SHA512 8d98d6217536cd6a0ea07fdd588fd4f44f82e66c4dd6a8ecccbc58ddd5c4e4a0bef8e282fccc0064a442f5d6131b1475c7b1ef956f4841a990ddbcbf619c55b4
diff --git a/net-misc/wget2/files/gnulib-autoconf270.patch b/net-misc/wget2/files/gnulib-autoconf270.patch
new file mode 100644
index 000000000000..b0cfe0e8663e
--- /dev/null
+++ b/net-misc/wget2/files/gnulib-autoconf270.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..f4f3dc192638
--- /dev/null
+++ b/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..8835171bb61c
--- /dev/null
+++ b/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch
@@ -0,0 +1,87 @@
+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/wget2-1.99.2.ebuild b/net-misc/wget2/wget2-1.99.2.ebuild
index 6e48cfdc1eea..f9970c40fb1a 100644
--- a/net-misc/wget2/wget2-1.99.2.ebuild
+++ b/net-misc/wget2/wget2-1.99.2.ebuild
@@ -52,6 +52,11 @@ 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() {
diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild
new file mode 100644
index 000000000000..22f29b168591
--- /dev/null
+++ b/net-misc/wget2/wget2-9999.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 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"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit 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 libressl 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? (
+			libressl? ( dev-libs/libressl:0= )
+			!libressl? ( 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
+)
+
+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() {
+	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
+	fi
+	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
+}