commit: 9bf03680ff02e09c1cef7dd05f9634d459a3957f Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Jan 2 18:48:23 2021 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Jan 2 18:48:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf03680
net-misc/wget-1.21-r1: revbump, gnulib fix for Darwin, Solaris Closes: https://bugs.gentoo.org/763123 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> .../wget/files/wget-1.21-gnulib-utime-errno.patch | 30 +++++ net-misc/wget/wget-1.21-r1.ebuild | 129 +++++++++++++++++++++ 2 files changed, 159 insertions(+) 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 new file mode 100644 index 00000000000..546028c83df --- /dev/null +++ b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 00000000000..9d919f50edb --- /dev/null +++ b/net-misc/wget/wget-1.21-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="cookie_check debug gnutls idn ipv6 libressl 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? ( + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl: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 +) + +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 +}
