commit: 72e3f286ea1d1f001d6b10ebe53179b06b988379 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun May 23 12:14:14 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun May 23 12:14:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e3f286
net-misc/wget: drop 1.21-r1 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-misc/wget/Manifest | 1 - net-misc/wget/files/wget-1.21-avoid_bashisms.patch | 26 ----- .../wget/files/wget-1.21-avoid_eautoreconf.patch | 11 -- .../wget/files/wget-1.21-gnulib-utime-errno.patch | 30 ----- net-misc/wget/wget-1.21-r1.ebuild | 128 --------------------- 5 files changed, 196 deletions(-) diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index ff2b3735a29..e8fccc9a3bc 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,3 +1,2 @@ DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 -DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a diff --git a/net-misc/wget/files/wget-1.21-avoid_bashisms.patch b/net-misc/wget/files/wget-1.21-avoid_bashisms.patch deleted file mode 100644 index 478621ecb59..00000000000 --- a/net-misc/wget/files/wget-1.21-avoid_bashisms.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a9092887e0e98877a205e9052930692f35fb179e Mon Sep 17 00:00:00 2001 -From: Matt Whitlock <[email protected]> -Date: Sat, 2 Jan 2021 16:27:57 +0100 -Subject: [PATCH] configure.ac: Don't use bashisms - -Gentoo-bug: https://bugs.gentoo.org/762946 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 96adf13b..f6268fd5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -978,7 +978,7 @@ AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) - AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"]) - AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$with_metalink" != "Xno"]) - AM_CONDITIONAL([WITH_XATTR], [test "X$ENABLE_XATTR" != "Xno"]) --AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" == "Xyes"]) -+AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" = "Xyes"]) - - dnl - dnl Create output --- -2.30.0 - diff --git a/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch b/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch deleted file mode 100644 index 0e02851a257..00000000000 --- a/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -55925,7 +55925,7 @@ - WITH_XATTR_FALSE= - fi - -- if test "X$ENABLE_NTLM" == "Xyes"; then -+ if test "X$ENABLE_NTLM" = "Xyes"; then - WITH_NTLM_TRUE= - WITH_NTLM_FALSE='#' - else diff --git a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch deleted file mode 100644 index 546028c83df..00000000000 --- a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6a76832db224ac5671599ce332717f985a2addc7 Mon Sep 17 00:00:00 2001 -From: Bruno Haible <[email protected]> -Date: Thu, 31 Dec 2020 17:16:57 +0100 -Subject: utime: Fix compilation error on macOS and Solaris 9 (regr. - 2020-12-24). - -Reported by Tom G. Christensen <[email protected]> in -<https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00295.html>. - -* lib/utime.c: Include <errno.h>. ---- - ChangeLog | 7 +++++++ - lib/utime.c | 1 + - 2 files changed, 8 insertions(+) - -diff --git a/lib/utime.c b/lib/utime.c -index bf7d7c534..337217950 100644 ---- a/lib/utime.c -+++ b/lib/utime.c -@@ -261,6 +261,7 @@ utime (const char *name, const struct utimbuf *ts) - - #else - -+# include <errno.h> - # include <sys/stat.h> - # include "filename.h" - --- -cgit v1.2.1 - diff --git a/net-misc/wget/wget-1.21-r1.ebuild b/net-misc/wget/wget-1.21-r1.ebuild deleted file mode 100644 index 3337acda223..00000000000 --- a/net-misc/wget/wget-1.21-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/"; -SRC_URI="mirror://gnu/wget/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" -RESTRICT="!test? ( test )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND=" - cookie_check? ( net-libs/libpsl ) - idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) - metalink? ( media-libs/libmetalink ) - pcre? ( dev-libs/libpcre2[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) -" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -PATCHES=( - "${FILESDIR}"/${P}-gnulib-utime-errno.patch # 763123, drop next release - "${FILESDIR}"/${PN}-1.21-avoid_bashisms.patch #762946 - "${FILESDIR}"/${PN}-1.21-avoid_eautoreconf.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-uclibc* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - local myeconfargs=( - --disable-assert - --disable-pcre - --disable-rpath - --without-included-libunistring - --without-libunistring-prefix - $(use_enable debug) - $(use_enable idn iri) - $(use_enable ipv6) - $(use_enable nls) - $(use_enable ntlm) - $(use_enable pcre pcre2) - $(use_enable ssl digest) - $(use_enable ssl opie) - $(use_with cookie_check libpsl) - $(use_with idn libidn) - $(use_with metalink) - $(use_with ssl ssl $(usex gnutls gnutls openssl)) - $(use_with uuid libuuid) - $(use_with zlib) - ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info \ - || die -}
