From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- net-misc/wget/Manifest | 6 +- net-misc/wget/metadata.xml | 2 +- net-misc/wget/wget-1.21.1.ebuild | 127 --------------------------------------- net-misc/wget/wget-1.21.2.ebuild | 57 ++++++------------ 4 files changed, 22 insertions(+), 170 deletions(-) delete mode 100644 net-misc/wget/wget-1.21.1.ebuild (limited to 'net-misc/wget') diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 4a2a04b9b426..16cf7ef9e973 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,5 +1,3 @@ -DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d -EBUILD wget-1.21.1.ebuild 3441 BLAKE2B 04cde1ee54f6d0253270f2e61a24d424055a51c5188356cfaabf6f31b5c36c931ad7759aec0e26583baf1d8a19d2e85764a26be23c41f008d8744448cd46c114 SHA512 d25b64ebd446bb6457e52643b5ef10cd150e1479fb47cee0a08fe16096735f1837f39999aaf57f0db95c7538ca792e8b02caaf1a5f9975306c86e0074019cb5c -EBUILD wget-1.21.2.ebuild 3561 BLAKE2B dce0e2c5e3139570873393ebf1f4a2819693f3a008dcc298cff4e5085ec0a3105714ad0eaf4ea68a7824193421d197ea0b01bca2e38228fda4edeee0b355f023 SHA512 d836c81242aa0c07af0d3e84fb5f57793c9ef568f967f0dc57c31579038f84141d74d045a516f3133eb0cd69b2ed67516e30440f607c8f9bc116010aa4e24640 -MISC metadata.xml 740 BLAKE2B edacdb0309ad76e024fe551f53c21c87f2f8242879fbc59f6a9ad2e8cef7741e44a75bc9cb211b0a1f11fc2c89868fed7f1325132d3b30fad6a648d2aa9e5414 SHA512 563748bfa80727d7782f6a084fdbf7578eaaceb8501a2a349422fb38026d288eb72df4103173733a88345f22b43f30bdf45ea2dfe516a5e1724ca89ec2a67608 +EBUILD wget-1.21.2.ebuild 3043 BLAKE2B c415c2a851b86e244b00c30db3eb28bc1f3ddc7d25cf739a9f69b68e24fa9e50faf9490e7978934273460ed6d8e438d455badb3217a45cfaad0f4311264d222d SHA512 7d9b9c0a11cddd11f055fc49ce774fe23d7cd9053cfc7f782e35b75684a1e8dfe0660013b78a1074d029f5fbdfaeaa9d63c8ae4983fc0cc4d00c6137bcbdd51a +MISC metadata.xml 740 BLAKE2B 1b36b1f6e8add5fcbbc757974dd8d9f89b4fb62ad1cdde882ec464e2348773e28f923c89259fa56b8d080be1b1975d91c113e4f10553fdd87c3d270bf29c393d SHA512 25e2e34967bd2a04f5aae19849353c798084031888a3aa300a4f9d4ef9029c41a4cc013a842c906dcc2720af155085e047ed99e45a102589f59625bc60042238 diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml index 8df2cebe3bd8..574ac5004315 100644 --- a/net-misc/wget/metadata.xml +++ b/net-misc/wget/metadata.xml @@ -6,7 +6,7 @@ Gentoo Base System - Enable cookie checks via net-libs/libpsl + Enable cookie checks via net-libs/libpsl Enable support for media-libs/libmetalink Enable support for NTLM (Windows-based) authorization Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator) diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild deleted file mode 100644 index 2a526b27a951..000000000000 --- a/net-misc/wget/wget-1.21.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -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 ~m68k ~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 ) - -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} == *-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 [[ ${CHOST} == *-darwin* ]] ; then - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html - append-cppflags '-D__nonnull\(X\)=' - fi - - 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 -} diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild index f50b041c1a7a..d29f599f5169 100644 --- a/net-misc/wget/wget-1.21.2.ebuild +++ b/net-misc/wget/wget-1.21.2.ebuild @@ -13,14 +13,14 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ) + cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) @@ -35,21 +35,22 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + nls? ( sys-devel/gettext ) 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 ) +DOCS=( AUTHORS MAILING-LIST NEWS README ) pkg_setup() { use test && python-any-r1_pkg_setup @@ -59,22 +60,13 @@ src_prepare() { default # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi + case ${CHOST} in + *-darwin*|*-solaris*|*-cygwin*) + sed -i -e 's/^ LIBICONV=$/:/' configure || die + ;; + esac - if [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -le 17 ]] ; then - # Fix older Darwin inline definition problem - # fixed upstream - # https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=29d79d473f52b0ec58f50c95ef782c66fc0ead21 - sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \ - src/config.h.in || die - fi + sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die } src_configure() { @@ -93,6 +85,7 @@ src_configure() { # Further, libunistring is only needed w/older libidn2 installs, # and since we force the latest, we can force off libunistring. #612498 local myeconfargs=( + ac_cv_libunistring=no --disable-assert --disable-pcre --disable-rpath @@ -106,24 +99,12 @@ src_configure() { $(use_enable pcre pcre2) $(use_enable ssl digest) $(use_enable ssl opie) - $(use_with cookie_check libpsl) + $(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 -} -- cgit v1.2.3