gentoo resync : 13.10.2019

5 files changed, 6 insertions, 290 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 18a751edd06e..55e5a04a9ef6 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,12 +1,8 @@
-DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc
-DIST neomutt-20180323.tar.gz 2650465 BLAKE2B 59f11208320e514119e60f6c85a876fed2693b9eae3127fc3fa5a35722a80dfd99b0c6b5a5074711d42b35d459e70f4dda3d29e7358e1d95d5d0d350438290d5 SHA512 997c697300768809823b8d8588c93003c6cd7fcc6cbe7ce524096033e91c618119f78c697ccd15b4c93751b3156d50e611974e8f8b332efb467c031385e9f819
 DIST neomutt-20180512.tar.gz 2758674 BLAKE2B 47a8d1fe5d5e2725a6ee868b937eea3807ab35dc8eefe47f0d9b1db3aeaa97e69c36e3b8544fc43f1ce0a9980017d654bace8d342094fd7d26ecdb13cdf54253 SHA512 033faa27b01998895d2452d541ed5942cf7dede7a935fc807e6a7f88f3a8c182ea0ab5b4ed7db852ff2afb4d3b990db05477d9ff0dcf7dee186c393244d1db66
 DIST neomutt-20180622.tar.gz 2769280 BLAKE2B 57e708a0502d8de795a08150dd92c4b2a8ba9d0594102f4d4d4b183f29caad147e233586882ca68aa23df6e69b0c55345120ca40ddc9db80e76c734409ff5a3b SHA512 8085bf2bcf25ee4a4531cc5f950f862f58e3bf6ebfb96450479132ed60b4d87e35bc54f9b5e110d93dbd8e9684c1eceb36012753fc7bf5d3fb5046d9d42b69e0
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
-EBUILD neomutt-20180223.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
-EBUILD neomutt-20180323.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20180512.ebuild 4151 BLAKE2B de49b44fd2b4eb865b5457e6379e908cfc7f1500cd1ce6a97a1d9d19eb29b59efa595fc92227b4138ae55418b5b0fd32ab600f363adbf2ebf77865099e39a6d9 SHA512 31dfc159c61781e58f3e721b5ba827d6b526ef0fd201cb29b94fbff4affdd8a1a2f77546d56b4fb0deaca60f427f9fe76125c138875a989290e606c161991c75
 EBUILD neomutt-20180622.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
-EBUILD neomutt-20180716.ebuild 3266 BLAKE2B 3d5454b96d2c042e2f16bc817fba9a35b2e04b942c05066ee083109efd801d5350ca56b141b786b54de3bb370aab57670e8b36daed8c37c2e78f68e1f6a51c37 SHA512 ffdd24c85f79fd840d150e2f8529cb6a8b99f4979c434f47957c06cebf8983a6f8fdd76da689a270383124eca2503da242aef93111009942fe74b65f99264967
-EBUILD neomutt-99999999.ebuild 3271 BLAKE2B 37bd175aca2c3d77a365a90df65be546f4724f8af5c13c841459eec58e0b70aee9be9fcbf66cdf47c64884f953fe872341d87cc5f8090dc6785a7106b1f50b81 SHA512 b22729f9cafdac9b477d0cf82e428852a2202f53992eb9ecc341dbc0f6caf95488eb5c47ffcd39f00af0f9ac8e03400375e2eec920d64e0789dad90aeba7b036
+EBUILD neomutt-20180716.ebuild 3278 BLAKE2B 02747c8e7443aa7a57c4a9d24f71698f897a1f720cd95e3386544e0b9cbb96e3527f4d4cc96a9a23bcb6e74cfc9a7b04123ed5c9e0888a85231dc3ce633cd18c SHA512 4f8d617c55d0af52170ca62b97c1910c5d536e6284d4457fdfddc403b830d8bd980715e63b4af1fa35a00a8e120813c8b989562ef8d5047d8ea28325d40a5f7c
+EBUILD neomutt-99999999.ebuild 3280 BLAKE2B d5c6684857bf7a9a09e2e0878c6ca9062fb9c6e05328c50c723fcc5fa76d0bef938b678f8118102e5bc1519539f6ca1fbabdcc3c8c596e93ef8514167c84d5ec SHA512 19eb91219a5558dbdb1946ce675c732fe398b6793376fc27dd392615d5a53720f8eee019f62eaa2311820665b3e14e79233c6d0bf9499eb95030616a2992c8d9
 MISC metadata.xml 1332 BLAKE2B 03068e00332dbed7607b733e32e41154626c62a658ced69371dfea002486638f6b91c04aadea4b85645151561e4578f210314086d8f427de099e58e3781570f9 SHA512 c69a4305018cb7d4af07fed533da86334632625ab406fed1ffb49339675882931996d1836a8207dac60a1ab50936366cb7ab50e6c32ca24252ce7893499b95d0
diff --git a/mail-client/neomutt/neomutt-20180223.ebuild b/mail-client/neomutt/neomutt-20180223.ebuild
deleted file mode 100644
index f90289f77c00..000000000000
--- a/mail-client/neomutt/neomutt-20180223.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-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 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
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	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 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		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."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20180323.ebuild b/mail-client/neomutt/neomutt-20180323.ebuild
deleted file mode 100644
index f90289f77c00..000000000000
--- a/mail-client/neomutt/neomutt-20180323.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-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 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
-	berkdb? (
-		|| (
-			sys-libs/db:6.2
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-		<sys-libs/db-6.3:=
-	)
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	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 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	dev-lang/tcl
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		# During the transition of the crypto USE flags we need to support
-		# both sets of flags. We do not want to emit a configuration setting
-		# twice, since the second flag overrides the first, potentially
-		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
-		# details.
-		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
-		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
-		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
-		# Database backends.
-		"$(use_enable berkdb bdb)"
-		"$(use_enable gdbm)"
-		"$(use_enable kyotocabinet)"
-		"$(use_enable qdbm)"
-		"$(use_enable tokyocabinet)"
-
-		"$(use_enable idn)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--with-ui=$(usex slang slang ncurses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
-	if use !doc; then
-		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
-			Makefile > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
-	if use crypt || use gpg || use smime; then
-		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."
-		if use gpg && ( use crypt || use smime ); then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-}
diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
index ccd0f97bec9f..e29f859a066f 100644
--- a/mail-client/neomutt/neomutt-20180716.ebuild
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -94,7 +94,7 @@ src_configure() {
 		"$(use_enable gnutls)"
 	)
 
-	econf "${myconf[@]}"
+	econf CCACHE=none "${myconf[@]}"
 }
 
 src_install() {
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 4d1742196c36..e97f8da78b1c 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.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
@@ -94,7 +94,7 @@ src_configure() {
 		"$(use_enable gnutls)"
 	)
 
-	econf "${myconf[@]}"
+	econf CCACHE=none "${myconf[@]}"
 }
 
 src_install() {