gentoo resync : 03.12.2017

3 files changed, 47 insertions, 21 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 7c020e8a89fe..7b8f819dbb07 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,15 +3,15 @@ AUX 0001-Rename-mutt-to-neomutt-20170912.patch 12034 BLAKE2B 5a152c16a3c732eb2b9
 AUX 0001-Rename-mutt-to-neomutt-20171006.patch 752 BLAKE2B 11554d93bc31e5fd9aa40fe1458979b87a15c0929f558cacd1f5719740e00530518c820388b187dc0c13be86ea72747949669ab7bbb2d6241d4d0c04a1d4d7f1 SHA512 d6975449dc8405a1dde84665d94b3c5668a979de6082e1ffac539de755a9337a6f9e772d811ab2861b0f6675b27ae1e10aedde512e6a7a234a3af440d0384e4c
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
-DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 WHIRLPOOL 455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
-DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
-DIST neomutt-20171006.tar.gz 2706019 SHA256 86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d WHIRLPOOL 75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
-DIST neomutt-20171013.tar.gz 2706753 SHA256 5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55 SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac WHIRLPOOL fde9e7833bc6a469882716d7c9deb4d5146d0a6ffd5769e7d76d952096165b05d29584e057503a1ba3a4887c8afd0efe26401fc9d533250c597527bce8500634
-DIST neomutt-20171027.tar.gz 2682699 SHA256 2d00de2a1cdef4cd59fcf6f894a6fe7e677e1065565f5e01f4dae8e1d910e583 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894 WHIRLPOOL b79f58d4b59c0a4d0bbac46993a4743e659d7b29471ffbef7f291e83b63835629735139b07f911181fed2f8c403c70e7530870330eef6de5733eae9b0dcc6e6e
+DIST neomutt-20170714.tar.gz 2509160 BLAKE2B 33170f85be17d9999414a4034b740e375a71bd7092c5134342aa2b23b35afd83ddf5de95c06fb221c63aac36fbf247204508cc3e6d6259ab8c7606de5b444344 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0
+DIST neomutt-20170912.tar.gz 2533245 BLAKE2B fde5690d2f80b0ef55ddc753487905130b1db027da2ba712d9629d59f79d2c2fcd6025e96dd031045c2c162020991141375c607ae10e9be9cf1f81fe64166c05 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6
+DIST neomutt-20171006.tar.gz 2706019 BLAKE2B b16f065fd1c5b829c6b73614c42e5353b968fe9111d445319927a48ec2612e59ac23dd3e06948c7c5b6f34bdd1646773cf91ae21737adf67ff4019c9850895e2 SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d
+DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e98700c2b3c11dcce7b9cdf132a755403ed1b54216426736c1dde78c580320ebac4fbb6e3ca6f92abc1c1e6d1e4fd1b SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac
+DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894
 EBUILD neomutt-20170714.ebuild 2876 BLAKE2B 3dee3dcf19233937d04031f33cd5b5b8c9d16ced394cbf7d827d6f2939dc1cd8e79afcec749b966f97a5442e7a52b139349d4a239c6c438cce98b8678d1c66e8 SHA512 fab00df2bf15ea4f1f513f3487e1ae40e4d0e94666f0ada62fef6ef2112ecfa868502d972533e7ef5cec5fe7d4754ec6607c03710120bae91d800e56b36a5947
 EBUILD neomutt-20170912.ebuild 2873 BLAKE2B c1d8f2746fc0b4db7b118fa5b45ee72ecebf442fc34158ceec562ec5c45fa436271335850d690790849820abb68f4f9c12ae80ab907390f8be4a6eeb6f6bda6b SHA512 ca2deb8c51648e02b61e892b99c7796184145754aaf016e9ea2f55454c0e6e35c4a6508a9e5d6279571f1ba648413047c56050a74ee6c46130c3e926b4f9e530
 EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd254461da69838ab52dba127ef999f2a8ac90dd4b8cbcf8f4827b1fe4ed81f500bb6957ed57d297d3236fdfeb14d03 SHA512 c7576ab061c3b6726f06dbb584145751a573c5ff19a3e6157d96a7a22d54980fbe70682a37d00003e872b854b658b284a37bb7bda7913023cd8bb7fc3387a4e4
 EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
 EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
-EBUILD neomutt-9999.ebuild 2675 BLAKE2B fb78bbf4fc12cb8b0d689193cabc7869c7843b6d004c911829dfba456bc14d0ff810b0d3dbc6a476e21bfc1bcf8712f6ccd0dc75781902e11e4953c5e4559f98 SHA512 04dc0cd01085458b53b446525c8e4d8922a1097ed32f898d31a5003351f5e6639037ac37b78308e260dbdcc9699047e5c070347ef48c267d397e42235ba6f79d
-MISC metadata.xml 1031 BLAKE2B 1aa1a88b40fa4ac08c94351da257d01941acffbb776319947fae24c432281f4d676e045da943e9173c495eaa1841a9015b3476314a8d7036f8ba93d19f6c1ed0 SHA512 26586b2a10c52fbe6e2736a8c28e24f349a96f4d0f4877b600e593c96a1fa6615814e6ffebc44b0f342394f1bc64bd4abf74133313335873b60cdcd1602e3410
+EBUILD neomutt-9999.ebuild 3286 BLAKE2B 41c39525cfc3774d6c0672f86ce0fedfe817c20da301e1acd6645ec523efcab933337179a9a1cb28e237bf9768e69ca9caf2347ed796cdc6eeb2c8079dafd64e SHA512 072bfd48cee94c00b24393b2e1dcd06284d752510f8273bb66becee40fd58e7c0a792a651f5bbfaaa1eb9bc3a1300964ee60e74b26a655f2408fad88bcb8ba3c
+MISC metadata.xml 1332 BLAKE2B 0a89334063778b8eabe6e3e3e73005a70c83d362cc874db715cb6c41ccd06f9ac95e358fa75352a4f5b5ec85a73b74084cc0d819dc615cccae29d824a99bd150 SHA512 06bfe8a9dde4a0ba25eef156e6b39552ab9dc7b1ad68a3dcbdb102e4416ded8ab536cf6ef4737e61561117eed21ebe0ce2aaf6ee3463b252f0a02177561a3c3e
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2cce62e661b3..9810e2b83198 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -22,5 +22,11 @@
 		<flag name="smime">Enable support for smime</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
+		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+			traditional/inline PGP</flag>
+		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
+			and traditional/inline PGP</flag>
+		<flag name="smime_classic">Build classic_smime backend to support
+			S/MIME</flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 5dc34a207c8a..8a0f8bb25dd2 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -3,19 +3,26 @@
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic git-r3
+inherit autotools eutils flag-o-matic
 
-EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-KEYWORDS=""
+if (( ${PV} == 9999 )); then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="https://www.neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
-	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types
@@ -28,6 +35,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
 	idn? ( net-dns/libidn )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
@@ -60,22 +68,24 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
 		"$(use_enable doc)"
 		"$(use_enable gpg gpgme)"
+		"$(use_enable gpgme)"
 		"$(use_enable nls)"
-		"$(use_enable smime)"
 		"$(use_enable notmuch)"
+		"$(use_enable crypt pgp)"
+		"$(use_enable pgp_classic pgp)"
+		"$(use_enable smime)"
+		"$(use_enable smime_classic smime)"
+		"$(use_with berkdb bdb)"
+		"$(use_with gdbm)"
 		"$(use_with idn)"
 		"$(use_with kerberos gss)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
 		"$(use_with kyotocabinet)"
-		"$(use_with qdbm)"
-		"$(use_with gdbm)"
-		"$(use_with berkdb bdb)"
 		"$(use_with lmdb)"
+		"$(use_with qdbm)"
+		"$(use_with sasl)"
+		"$(use_with tokyocabinet)"
 		"--with-$(usex slang slang curses)"
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
 		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
@@ -108,3 +118,13 @@ src_install() {
 
 	dodoc COPYRIGHT LICENSE* ChangeLog* README*
 }
+
+pkg_postinst() {
+	ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+	ewarn "(https://bugs.gentoo.org/637176)"
+	ewarn "crypt -> pgp_classic"
+	ewarn "gpg -> gpgme"
+	ewarn "smime -> smime_classic"
+	ewarn "The old USE flags still work but their use is deprecated and will"
+	ewarn "be removed in a future release."
+}