gentoo resync : 16.06.2019

5 files changed, 17 insertions, 132 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 9ddf02be0a7d..74450f614455 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,7 +1,4 @@
-DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc
-DIST wget-1.20.2.tar.gz 4486237 BLAKE2B 7392e445cb801ac5fafee804e6b0459d0a001b91b5b413f1a5592da6bea690a2d6b864b64a1add1c4114085def7a73312a88cd1cf1c12434c6535f79de222d9a SHA512 42d59ddb3abec6ff30e2be890ceeec35fc144acd8e2def25f5280c2f8c21e6fd54dc71217e9ca7fb1d4f0470716bf288e90501e8e6e39b09938e3f5710a3016a
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
-EBUILD wget-1.20.1.ebuild 3186 BLAKE2B 0d8a494f8eedb24e7d24b963f489615ff61b1197e36ed588539c39835ac237b0c2bc7291ecec9e77b477a44addc0214dc84776520b3466592ce5c9d50e70d741 SHA512 fffa7b02c2c8386889d205e1e85d347d582fce184953deed59022d1918e5b64f818272557e0d7834843d89e5b6457e766bdbe0b0c5c759f43da19e30509c9b3f
-EBUILD wget-1.20.2.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
-EBUILD wget-1.20.3.ebuild 3195 BLAKE2B 99634e4899ab9fa5ecacf4da2b52515f460a332c7fa0c3d6ee03b4738f1c81c8ed6548d42af428b96009ef4428d43610af3be3912e607528154922dc02151c23 SHA512 4f2db0c0c1baa073cff43ae5d32ebd6a6b9f7cffff4587e2fc1e24b057e035fc390372ecd4bb9cdea366abb5a16632cd487b082eead018bd981465291cd02969
-MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
+EBUILD wget-1.20.3-r1.ebuild 3214 BLAKE2B 1b910aac7b541f7412f253af9296bdcf3ebb3891004cefd8df2f0a28ccc9406768a910718cd21a12a4f3724fecc583bc41f671c76677ec441d1c3831dec2dd1f SHA512 eb0f81e9e0792137f01d9e7d783e0cfa2768acfdeaa36c3bb758e642607cb88950e9f3da1108c432ec1a09c021204519cd663fc6dd9da13ca9c27003b2dbab19
+EBUILD wget-1.20.3-r2.ebuild 3282 BLAKE2B ff7eeeaef719110f60e3686f9f25137c4aa59c3542cfdffdcefb4942e4cf1f19547a18e153a7bb6a0c666e48ebacbe409ec8729f389dc9abbba86d0cb4603dae SHA512 4e255cf3df386504a8040c1d9baf3bbd919f2239ca7e33aa560f7fdc9102e51e2621d8179393162ade6a19c10015e4db314c76260a05cd0a58f893321e7ab7f5
+MISC metadata.xml 656 BLAKE2B 0616f06a26ee8dfa23132a9abf38e1a156da6365b9ac202ff1a0985c0f19b1965f156c68fea81958fb86d3282aa1b6732087060c781bfcc500efeb8bffcb5098 SHA512 9d0acbcaccf5107a6b98e460cd6dd848b2e1f4f7bae5963a65e36919ed062563854a5f4315bd1f0903f6fb7b37d7fc58bc63c05efdadbc5644f6916c8858d068
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 85b6f1cfa8ce..d0383b4091d2 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.1.ebuild b/net-misc/wget/wget-1.20.1.ebuild
deleted file mode 100644
index db7181db9c4a..000000000000
--- a/net-misc/wget/wget-1.20.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
-	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}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	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 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.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild
index 624c485f43ec..d71dbd3cf2a9 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.2.ebuild b/net-misc/wget/wget-1.20.3-r2.ebuild
index b9c1aa3290a5..59a3d90a05dd 100644
--- a/net-misc/wget/wget-1.20.2.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 ~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
 }