summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2022-04-10 15:29:53 +0200
committerLars Wendler <polynomial-c@gentoo.org>2022-04-10 17:33:00 +0200
commitd9612fb3ef9ef0d9bac73afdb46acb4f9efed8cc (patch)
tree70a931def769613860f0e515b6c6c07e730e227b /net-misc/wget2
parentnet-libs/gnet: update EAPI 5 -> 8 (diff)
downloadgentoo-d9612fb3ef9ef0d9bac73afdb46acb4f9efed8cc.tar.gz
gentoo-d9612fb3ef9ef0d9bac73afdb46acb4f9efed8cc.tar.bz2
gentoo-d9612fb3ef9ef0d9bac73afdb46acb4f9efed8cc.zip
net-misc/wget2: Removed old
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/wget2')
-rw-r--r--net-misc/wget2/Manifest1
-rw-r--r--net-misc/wget2/files/gnulib-autoconf270.patch22
-rw-r--r--net-misc/wget2/files/wget2-1.99.2-autoconf270.patch26
-rw-r--r--net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch87
-rw-r--r--net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch25
-rw-r--r--net-misc/wget2/wget2-1.99.2-r1.ebuild96
6 files changed, 0 insertions, 257 deletions
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 6477a0cf4793..6ea85dbe2ae0 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,2 +1 @@
-DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f
DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb
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
-}