From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 6 Jan 2019 20:42:09 +0000 (+0100)
Subject: mail-client/mutt: fix dependencies for USE=idn, thanks jer
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=89625734e2102b1e2f7f76532321e0cd76941150;p=gentoo.git

mail-client/mutt: fix dependencies for USE=idn, thanks jer

Closes: https://bugs.gentoo.org/674682
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
---

diff --git a/mail-client/mutt/mutt-1.11.1-r1.ebuild b/mail-client/mutt/mutt-1.11.1-r2.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-1.11.1-r1.ebuild
rename to mail-client/mutt/mutt-1.11.1-r2.ebuild
index 1907b053b7fd..9471fe0aa43d 100644
--- a/mail-client/mutt/mutt-1.11.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.11.1-r2.ebuild
@@ -33,6 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
 	app-misc/mime-types
+	virtual/libiconv
 
 	berkdb?        ( >=sys-libs/db-4:= )
 	gdbm?          ( sys-libs/gdbm )
@@ -153,13 +154,14 @@ src_configure() {
 		$(use !ssl &&                echo --without-gnutls --without-ssl)
 
 		$(use_with sasl)
-		$(use_with idn)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
 		$(use_with kerberos gss)
 		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
 		"$(use_with !slang curses "${EPREFIX}"/usr)"
 
 		"--enable-compressed"
 		"--enable-external-dotlock"
+		"--enable-iconv"
 		"--enable-nfs-fix"
 		"--enable-sidebar"
 		"--sysconfdir=${EPREFIX}/etc/${PN}"