From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-888237-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id C40D61382C5
	for <garchives@archives.gentoo.org>; Wed, 22 Jun 2016 18:55:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1454C14088;
	Wed, 22 Jun 2016 18:55:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AD86214088
	for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jun 2016 18:55:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 316E23406DD
	for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jun 2016 18:55:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F1AFAA2
	for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jun 2016 18:55:33 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1466621694.a4c200757bc8abff5427a77a4254735b452b9f93.grobian@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/wget/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/wget/wget-1.18.ebuild
X-VCS-Directories: net-misc/wget/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: a4c200757bc8abff5427a77a4254735b452b9f93
X-VCS-Branch: master
Date: Wed, 22 Jun 2016 18:55:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7a97271b-a5f0-4c50-96e3-fb6b6ec91203
X-Archives-Hash: 031c94eed293914d144740d9acfbc7f5

commit:     a4c200757bc8abff5427a77a4254735b452b9f93
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 18:54:42 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 18:54:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c20075

net-misc/wget: fix linking wrt iconv on Darwin/Solaris, bug #585924

Package-Manager: portage-2.2.28

 net-misc/wget/wget-1.18.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net-misc/wget/wget-1.18.ebuild b/net-misc/wget/wget-1.18.ebuild
index 74d2cd2..6fd73f1 100644
--- a/net-misc/wget/wget-1.18.ebuild
+++ b/net-misc/wget/wget-1.18.ebuild
@@ -50,6 +50,12 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.17.1-gnulib-cygwin-sys_select.patch
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
 }
 
 src_configure() {