diff options
Diffstat (limited to 'net-misc/wget')
| -rw-r--r-- | net-misc/wget/Manifest | 5 | ||||
| -rw-r--r-- | net-misc/wget/wget-1.20.3-r3.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/wget/wget-1.21.ebuild (renamed from net-misc/wget/wget-1.20.3-r1.ebuild) | 25 |
3 files changed, 19 insertions, 13 deletions
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 9561acb63ddb..081a426a2c71 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,5 +1,6 @@ AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c -EBUILD wget-1.20.3-r1.ebuild 3098 BLAKE2B 00c8bf175191e940c69cdfe2171915ffcb617317b2d6ea87d00b564fc6d350a5d1385ee6ffc2e6f1b8c6d29d38a023c3e5d1712874daf7404b0c20172ec38ee6 SHA512 d06353ccee5862395f1fece9fae3e2b51e3c9907872e58600a872708d9d5cfd7e9d92f233d59c13c6ac183a2a61ed6e7a43ae609ac9a9a3c85af849f10565a37 -EBUILD wget-1.20.3-r3.ebuild 3394 BLAKE2B b43aaf9c21666722c63cd1a9cab0a538cb6b401f43ae9c4e66a18a8f7532f8fd2883edc84f0262e01da256322b8285b6a33756bd95f00903dd1ad80d9a7d21f8 SHA512 66140ed90f1887629e162d37a0871aa1068b9647632c43ae0337d8b6cd107eaa439c2cb59176798046304367ea071212f8c16246dd12acdacce7575806d6824a +DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a +EBUILD wget-1.20.3-r3.ebuild 3385 BLAKE2B bff59587a30c3e3d13d736cc39eada0196dc1db6dff6a8ed529ed5bf897de75b0ba20b658b33d0774085743283eb28530cc6221471a247eafbb3cab550e6dd24 SHA512 eb573466f0b0b163d95dc6e34bb12d4e9480a5346d4a21610673c962638f2082e8573eb68f0e0de71dbfa6f84a360bafbc01e89edd566e1a1e77560c9d9ed018 +EBUILD wget-1.21.ebuild 3339 BLAKE2B ebc3d8640844be1e9e34db3df309e779d918fc80a4e9d6e1fc0a45bf69146e749d93014d32625ff51d78d1305867bcdd790cda9aa7aa1860fad863aab384b9dc SHA512 6219dc3ae7f4c048ad1488ce918111a278e8b08e622ba35ebbedaf5eccf7271496392ca0a35bd7b4adf360b5e896b6c7b2675b3449d693f15476350e4a0059a9 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4 diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild index f08c091ddc6c..8f8647ab77b8 100644 --- a/net-misc/wget/wget-1.20.3-r3.ebuild +++ b/net-misc/wget/wget-1.20.3-r3.ebuild @@ -13,7 +13,7 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 )" diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.21.ebuild index d195a6a5b080..6034e4a301c6 100644 --- a/net-misc/wget/wget-1.20.3-r1.ebuild +++ b/net-misc/wget/wget-1.21.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit flag-o-matic python-any-r1 toolchain-funcs @@ -13,14 +13,16 @@ 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" -IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" +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(+)] ) @@ -35,8 +37,6 @@ LIB_DEPEND=" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig static? ( ${LIB_DEPEND} ) test? ( ${PYTHON_DEPS} @@ -45,6 +45,10 @@ DEPEND=" dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) +" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig nls? ( sys-devel/gettext ) " @@ -89,7 +93,6 @@ src_configure() { --disable-pcre --disable-rpath --without-included-libunistring - --without-libpsl --without-libunistring-prefix $(use_enable debug) $(use_enable idn iri) @@ -99,7 +102,9 @@ src_configure() { $(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) @@ -113,8 +118,8 @@ src_install() { 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 \ + "${ED}"/etc/wgetrc \ + "${ED}"/usr/share/man/man1/wget.1 \ + "${ED}"/usr/share/info/wget.info \ || die } |