gentoo resync : 16.01.2021

1 files changed, 19 insertions, 38 deletions

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
-}