gentoo resync : 02.09.2020

3 files changed, 187 insertions, 18 deletions

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ae0fdd91b5bb..31f55f1700f4 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,8 @@
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
-EBUILD neomutt-20200626-r1.ebuild 3399 BLAKE2B 12e370e134d915b71d96a2cb45ade6f5efa4d56ce0f37102044632ac4dacf709b078c6c1caf3e69eba272da5607de8d385800db675b6bb3c473eb30869bf850e SHA512 f3b8a7ff34224b466ed2ad46c389491a9e7fd3345fc9dff93fc3f3c4f6f0380d0612e4889f779ec4229d1fdf4c3a3a15fa68683c24b6e9473ecdc13c6cfc09ca
+DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
+DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
+EBUILD neomutt-20200626-r1.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
 EBUILD neomutt-20200626.ebuild 3296 BLAKE2B 596daf041ca8dc467da3c6443fe5d4ba8253edcb41bd8e1af24c04e55de9503d185adf25ab9eeb793841b2cdac2092cc51a5631057472d5a5f00bcd0539d9198 SHA512 14b9243ed976ccf7fa0d97f7ca5d9eadefcd17f8e178ec1054d5fb2cc3808367cb142785d945e1358c38de4761ab6ded6cb44711c36635cc3f0f59c71637f295
+EBUILD neomutt-20200821.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
 EBUILD neomutt-99999999.ebuild 3315 BLAKE2B e57c78ae79931ca8f0f1945a05b5407482ad8f65713ea42d40a7eb714b0208a5ed52ff33c2e499b4718605cef9481661b4b971ba6c2dc706523fb28effd2c893 SHA512 4f2bd716ebfd892cd06f36dba6fff6ec619419774919154d46d6801b5335a88c91c4dfc3e07cc189695d3715408df2de86bcde0d54931fee2eba774833a1ef65
 MISC metadata.xml 1207 BLAKE2B e0ccd3e85c801540e7bd6d589b27b0a20b22e1fff2ab8621cf3a28349c8fc501c6fa1d79d9151bb150607c813932f884bc183a98e1a807d157b7a68c0ef11f37 SHA512 321d64d899999f43dec107bb12933453290035810f0c009f4e5dc680963a92da6ce7d8f6ede96cdc85c97c628f80ce061167db5990bff97420e4b768fde4fe8b
diff --git a/mail-client/neomutt/neomutt-20200626-r1.ebuild b/mail-client/neomutt/neomutt-20200626-r1.ebuild
index d07e9f9f6842..d45bb5419716 100644
--- a/mail-client/neomutt/neomutt-20200626-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20200626-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic
+inherit eutils
 
 if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
@@ -14,6 +14,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="https://neomutt.org/"
 
@@ -21,11 +24,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet"
-
-# Disable tests until neomutt-test-files are avablae
-# (https://bugs.gentoo.org/734122)
-RESTRICT=test
+	ssl tokyocabinet test"
 
 CDEPEND="
 	app-misc/mime-types
@@ -37,38 +36,45 @@ CDEPEND="
 		)
 		<sys-libs/db-6.3:=
 	)
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
+	lmdb? ( dev-db/lmdb:= )
 	nls? ( virtual/libintl )
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
+	notmuch? ( net-mail/notmuch:= )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
+	!slang? ( sys-libs/ncurses:0= )
 	slang? ( sys-libs/slang )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-1.0.2u:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 "
 DEPEND="${CDEPEND}
-	dev-lang/tcl
+	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 )
-	)"
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-mutt )
 "
 
+RESTRICT="!test? ( test )"
+
 src_configure() {
 	local myconf=(
 		"$(usex doc --full-doc --disable-doc)"
@@ -94,11 +100,22 @@ src_configure() {
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
 		"$(use_enable ssl)"
 		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
 	)
 
 	econf CCACHE=none "${myconf[@]}"
 }
 
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
diff --git a/mail-client/neomutt/neomutt-20200821.ebuild b/mail-client/neomutt/neomutt-20200821.ebuild
new file mode 100644
index 000000000000..d45bb5419716
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200821.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+if [[ ${PV} =~ 99999999$ ]]; 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/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test"
+
+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:= )
+	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-1.0.2u: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 )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic 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)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+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 \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); 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
+}