gentoo resync : 12.01.2019

4 files changed, 25 insertions, 12 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index ff4e1fea80d9..1dff33f78500 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,10 +2,11 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
 DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
+DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
-DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
-DIST mutt-gentoo-1.11.1-patches-r0.tar.xz 108864 BLAKE2B 22d2fca8395ad0a6aaec8c2ede7acd011408df5c2d71ece29077355ee83ad694440286793f609734b2231e7ce8f9f785ad9f4a3ba8045670971e59addeec7c3e SHA512 ba6923ed11b3d92a71a93e6bb296083648f32fbb0801faa0ac1d4f1ea0fd97fa65eb1abd057bd231f55b7896838c03cd981564ccad0376f38be0a4ce264723be
-EBUILD mutt-1.10.1-r1.ebuild 9194 BLAKE2B da9d4600117ea3feda606c584b80cb2d29d18a978287cdd325443c80edecf7be31cf9e691f9d27dda42ff4faac9caf73181ec57f215207b1e272570e69393c44 SHA512 383bea4158740cbe594b73811b34d5d09668a54852411afc4dea4c1c68dced92158694c6a994df07cdc177b40c06f8d270d77ac7589267c8905c8a11cbe4d196
-EBUILD mutt-1.10.1.ebuild 9186 BLAKE2B c7a021dea37478bfd55c1987cbc3387cbf84e9be2d83441e6e3349a39ff6343ebd8cf7f4d864bb6565ddbf8681175dbc8d052e88aae5b4d886c97d2b00b52e76 SHA512 4531b6ab5e7cde1e90fc155869cd6c5fb102d8b9b2638d23262430fa252eb491d45c06c74666044bbe6e4f4be210f3fc5268f5f7afc901370fab5f4430ff3fe8
-EBUILD mutt-1.11.1.ebuild 9191 BLAKE2B b169430f19d635e93328eac63a1bf1ea6378b8fa104918b384a4d3cb6922b880c970d653be9a4331c04ffc7a0b37f482714ec18ea7bd05cf56071d67ede41ddf SHA512 795e77a1d851dc5f3414cd8088de3221001157128d83bbb5db680ac1c84fc8630aad83c5d02a0f0b04fa43d0740ec6c3df23df64c4a03c2627887937b862d2ec
+DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
+DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e
+EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287
+EBUILD mutt-1.11.1-r2.ebuild 9465 BLAKE2B 51353a7eb0ee7cd6f8e12c5320bbb94693d66c00067f19d5cf74e9b96d6536ba6d83ed01e73d276b3d95dd6ec73a25d232c5f3ad2804c2cec3911839082319b4 SHA512 db08486c09688f4022ddc396aab1a1faab19f8d9ed4838df591c352f3ac166e274ad85b6efa984d3f8b206b78a7ee38128a7bf53f6508816999e7fe3c2be42bb
+EBUILD mutt-1.11.2-r1.ebuild 9465 BLAKE2B 9428dcce9c36e85acab9748da77333f83861fe5ccb3af9aa496b68e819aec1629ba95f6576a4a5988ffb7b6774a45362c9d44206826ea3c1f32b50f06c3c2af6 SHA512 f6a9ed44d57149977e0c1c5199cfbdff9f6bda540a63eb7955413a005cc3901ce4a25e8cb2957c5f4eb2cded95f398ebcc2d71f6befb35880968c26482d5f56c
 MISC metadata.xml 1809 BLAKE2B 55772e2ff845cd7106179138fcb98c96eb4e3b6a40adf43fee91119d0c8608853f10aa1c32cfe44ff6bbde858670411fa78a9ba33cfb9a34d320d3c9f34ad8d9 SHA512 fca920e7ee455ce8991635f46a1badd4f4a191a21fdaffffea78cabfdb556ad23ca3eaed6dc8474b239a7e71d7610590c3df8b697a996fefbf01143c94bfc36a
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index fbd14407b225..2dd27636988e 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.11.1.ebuild b/mail-client/mutt/mutt-1.11.1-r2.ebuild
index 84e3dc40704b..9471fe0aa43d 100644
--- a/mail-client/mutt/mutt-1.11.1.ebuild
+++ b/mail-client/mutt/mutt-1.11.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHREV="r0"
+PATCHREV="r2"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
 
 DESCRIPTION="A small but very powerful text-based mail client"
@@ -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}"
@@ -257,6 +259,10 @@ pkg_postinst() {
 		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
 		elog "   https://wiki.gentoo.org/wiki/Mutt"
 		echo
+	else
+		ewarn "This release removes the conditional date feature in favour"
+		ewarn "of Dynamic \$index_format Content, see:"
+		ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
 	fi
 	if use crypt || use gpg || use smime ; then
 		ewarn "Please note that the crypto related USE-flags of mutt have changed."
diff --git a/mail-client/mutt/mutt-1.10.1-r1.ebuild b/mail-client/mutt/mutt-1.11.2-r1.ebuild
index c23817e7155b..a33f730ccdb5 100644
--- a/mail-client/mutt/mutt-1.10.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.11.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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}"
@@ -257,6 +259,10 @@ pkg_postinst() {
 		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
 		elog "   https://wiki.gentoo.org/wiki/Mutt"
 		echo
+	else
+		ewarn "This release removes the conditional date feature in favour"
+		ewarn "of Dynamic \$index_format Content, see:"
+		ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
 	fi
 	if use crypt || use gpg || use smime ; then
 		ewarn "Please note that the crypto related USE-flags of mutt have changed."