From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- net-misc/wget/Manifest | 6 +- net-misc/wget/metadata.xml | 1 + net-misc/wget/wget-1.20.3-r1.ebuild | 1 + net-misc/wget/wget-1.20.3-r2.ebuild | 122 ----------------------------------- net-misc/wget/wget-1.20.3-r3.ebuild | 125 ++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 125 deletions(-) delete mode 100644 net-misc/wget/wget-1.20.3-r2.ebuild create mode 100644 net-misc/wget/wget-1.20.3-r3.ebuild (limited to 'net-misc/wget') diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 590a189a93f1..13ff3d579d5a 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,4 +1,4 @@ DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c -EBUILD wget-1.20.3-r1.ebuild 3192 BLAKE2B 6752e9bc4448a2634eaf8674fa524898c348ebe3ce9ea2721be1ff515df79d1c5e8d5a63963d770fdfcce7811aea9e72805203ba80cfef9dbf671b76a1664d34 SHA512 6cc28cf552b46888cbbaad7ae6bb0dbe5fa87b582cad177a940f9cfa6bc15e01d6cdc4c8295a31f0e32b12b4ecb936c22dade35c788a2cd2d02d39d0310b5347 -EBUILD wget-1.20.3-r2.ebuild 3272 BLAKE2B 392499b16500fef79f19252115a807c038ff53f3070a43b7c4bce15a0d0ab9337284d91ddc0b7bffc8b894f035efe3fced5fe16152010eaa61af51580132df4b SHA512 c269c1c139438d6c1bc1bcff2c58c1ce0bdc09c5ac02a6eeeb25d35e4f97d5705260465a9963a030876f1372890ec079a1fa78b41462ac3d65152dc70e4ff4ca -MISC metadata.xml 656 BLAKE2B 0616f06a26ee8dfa23132a9abf38e1a156da6365b9ac202ff1a0985c0f19b1965f156c68fea81958fb86d3282aa1b6732087060c781bfcc500efeb8bffcb5098 SHA512 9d0acbcaccf5107a6b98e460cd6dd848b2e1f4f7bae5963a65e36919ed062563854a5f4315bd1f0903f6fb7b37d7fc58bc63c05efdadbc5644f6916c8858d068 +EBUILD wget-1.20.3-r1.ebuild 3219 BLAKE2B ed62068ae8d769c614ddd05ae6904bf02b94eb0e6783ce03e6bd70199ea3ca0a3139dc4cdd2840a1e314950499db00398c09b01f9f3d8e77f28352618b78859a SHA512 ea9506291f2c2ee7964bae9d716862334b2cf3eff5b80dc1410ea4d8a90e809daaa6cb04b3c7990986048f0205858cddc0ccab017998a7d94f8f1a7e6e3a98e8 +EBUILD wget-1.20.3-r3.ebuild 3369 BLAKE2B 1067e0773119113426771b55d68664749fbc6cdc0df105656d8ed1f29dd22ee79dbf67176b7c76e4a8fcf86dd93ad84e591b821c8ab47586382ae095df331d2e SHA512 6c8b38e33a902b837419ac3fe4c190b09c5d5f855b74d7a739883b9f9d3be0404ac8112847dbb43c5043e94038b312df3c5cf16625c5da64550ff039c16d7ae1 +MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4 diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml index d0383b4091d2..bcdf4d308b75 100644 --- a/net-misc/wget/metadata.xml +++ b/net-misc/wget/metadata.xml @@ -7,6 +7,7 @@ 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.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild index 36f1872b43b8..7d72a792dcb9 100644 --- a/net-misc/wget/wget-1.20.3-r1.ebuild +++ b/net-misc/wget/wget-1.20.3-r1.ebuild @@ -16,6 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug gnutls idn ipv6 libressl 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=" diff --git a/net-misc/wget/wget-1.20.3-r2.ebuild b/net-misc/wget/wget-1.20.3-r2.ebuild deleted file mode 100644 index 2d73864ac716..000000000000 --- a/net-misc/wget/wget-1.20.3-r2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7} ) - -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cookie_check debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND=" - cookie_check? ( net-libs/libpsl ) - idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) - 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 ) - -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 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.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild new file mode 100644 index 000000000000..9b186d6be020 --- /dev/null +++ b/net-misc/wget/wget-1.20.3-r3.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ) + +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 +} -- cgit v1.2.3