commit: 2b66c75d3c5a6a33ee59eddc8b2910fe53f164b7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 11:18:45 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 11:21:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b66c75d
net-misc/wget: Revbumps to avoid automagic dep on net-libs/libpsl
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/wget/metadata.xml | 1 +
.../{wget-1.20.3.ebuild => wget-1.20.3-r1.ebuild} | 1 +
.../{wget-1.20.3.ebuild => wget-1.20.3-r2.ebuild} | 20 ++++++++++++--------
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 85b6f1cfa8c..d0383b4091d 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Base System</name>
</maintainer>
<use>
+ <flag name="cookie_check">Enable cookie checks via
<pkg>net-libs/libpsl</pkg></flag>
<flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
<flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using
libuuid; otherwise use a simple RNG (random number generator)</flag>
</use>
diff --git a/net-misc/wget/wget-1.20.3.ebuild
b/net-misc/wget/wget-1.20.3-r1.ebuild
similarity index 99%
copy from net-misc/wget/wget-1.20.3.ebuild
copy to net-misc/wget/wget-1.20.3-r1.ebuild
index 624c485f43e..d71dbd3cf2a 100644
--- a/net-misc/wget/wget-1.20.3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r1.ebuild
@@ -88,6 +88,7 @@ src_configure() {
--disable-pcre
--disable-rpath
--without-included-libunistring
+ --without-libpsl
--without-libunistring-prefix
$(use_enable debug)
$(use_enable idn iri)
diff --git a/net-misc/wget/wget-1.20.3.ebuild
b/net-misc/wget/wget-1.20.3-r2.ebuild
similarity index 83%
rename from net-misc/wget/wget-1.20.3.ebuild
rename to net-misc/wget/wget-1.20.3-r2.ebuild
index 624c485f43e..59a3d90a05d 100644
--- a/net-misc/wget/wget-1.20.3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
@@ -13,12 +13,13 @@ 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-fbsd ~x86-fbsd ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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? (
@@ -34,8 +35,6 @@ LIB_DEPEND="
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="
${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
static? ( ${LIB_DEPEND} )
test? (
${PYTHON_DEPS}
@@ -44,6 +43,10 @@ DEPEND="
dev-perl/HTTP-Message
dev-perl/IO-Socket-SSL
)
+"
+BDEPEND="
+ app-arch/xz-utils
+ virtual/pkgconfig
nls? ( sys-devel/gettext )
"
@@ -97,6 +100,7 @@ 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 ssl ssl $(usex gnutls gnutls openssl))
$(use_with uuid libuuid)
@@ -111,8 +115,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
}
