public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-02-23 12:34 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-02-23 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0f08d93be86aff7da2cd6fb1fcbf320eaeac85a8
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 12:33:25 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 12:33:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f08d93b

mail-client/neomutt: Version bump to 2018-02-23

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20180223.ebuild | 140 ++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 089703f9b08..bc80149ff37 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,3 +3,4 @@ DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e9
 DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894
 DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
 DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
+DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc

diff --git a/mail-client/neomutt/neomutt-20180223.ebuild b/mail-client/neomutt/neomutt-20180223.ebuild
new file mode 100644
index 00000000000..f90289f77c0
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180223.ebuild
@@ -0,0 +1,140 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2024-05-25  6:27 Arthur Zamarin
  0 siblings, 0 replies; 129+ messages in thread
From: Arthur Zamarin @ 2024-05-25  6:27 UTC (permalink / raw
  To: gentoo-commits

commit:     f0ad4978628f7b04effd90dd6e276066cca6e05f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 06:27:37 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 25 06:27:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ad4978

mail-client/neomutt: Stabilize 20240201 x86, #931124

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20240201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20240201.ebuild b/mail-client/neomutt/neomutt-20240201.ebuild
index 9b86f293c2e9..bc0ff8ea016a 100644
--- a/mail-client/neomutt/neomutt-20240201.ebuild
+++ b/mail-client/neomutt/neomutt-20240201.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2024-05-25  6:27 Arthur Zamarin
  0 siblings, 0 replies; 129+ messages in thread
From: Arthur Zamarin @ 2024-05-25  6:27 UTC (permalink / raw
  To: gentoo-commits

commit:     7c984dcb08cdcdce7051f376fd38ab5c0fbd339e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 06:27:38 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 25 06:27:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c984dcb

mail-client/neomutt: Stabilize 20240201 amd64, #931124

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20240201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20240201.ebuild b/mail-client/neomutt/neomutt-20240201.ebuild
index bc0ff8ea016a..ae00a5bd52f9 100644
--- a/mail-client/neomutt/neomutt-20240201.ebuild
+++ b/mail-client/neomutt/neomutt-20240201.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~ppc64 ~riscv x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2024-05-12 23:00 Marc Schiffbauer
  0 siblings, 0 replies; 129+ messages in thread
From: Marc Schiffbauer @ 2024-05-12 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     12636c14cd0e59fff7621dee9ce37bbde1e8b09d
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 22:59:26 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun May 12 22:59:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12636c14

mail-client/neomutt: fix minor pkgcheck warning

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 mail-client/neomutt/neomutt-99999999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 65f398c671f3..f0e77fe65e6e 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
 if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
@@ -16,9 +19,6 @@ 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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2024-05-12 23:00 Marc Schiffbauer
  0 siblings, 0 replies; 129+ messages in thread
From: Marc Schiffbauer @ 2024-05-12 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a5e04c36786e49edd80cc8ca1c7f28a0d1163937
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 22:58:57 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun May 12 22:59:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e04c36

mail-client/neomutt: add 20240425

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20240425.ebuild | 176 ++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index bd7e9037bc43..66c187171e2a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,4 +3,5 @@ DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c
 DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
 DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465d6ff641065d88982a7bef959a6c7fe1ee9622a1f166fc71ea74099145ae2f88cc28a258821dcc1f3acd493f74273b SHA512 a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138
 DIST neomutt-20240201.tar.gz 3831010 BLAKE2B 70654b8edb5b6e01585bb3551a7af3722aebc44a70804ec9e16511eec9b892a4bcf68e043699591b2610095558f3893d4d7f5c15e860c7b8c17458a872c3f170 SHA512 431270a093bfa5024f2565aa8921e3482262210ca03c410362b6fa504aa1f2e299d1f6eb63cb05dcaf7b1328051b5d32c4fd719b5cb7ddec83a176a85ff5dc53
+DIST neomutt-20240425.tar.gz 4092419 BLAKE2B 35728b226a3c6d59b95daf7f2af1d155ed15b9f82958f79fc4c012df1014c5995f8e542ca2df2cdb6d79bbc537c13e7e941355dab5e4879c999f23f107db1ace SHA512 bb47aba1aa8ecc824d9d0a8f6be23f2d39f0aac06739920ee349ff96bc27cbe39b6cfa797f648eb683fe49f01fa1873805a3ed2e7cbf4124dae12517591c02c9
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20240425.ebuild b/mail-client/neomutt/neomutt-20240425.ebuild
new file mode 100644
index 000000000000..f0e77fe65e6e
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20240425.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2024-02-19 13:36 Marc Schiffbauer
  0 siblings, 0 replies; 129+ messages in thread
From: Marc Schiffbauer @ 2024-02-19 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     80f8b20d0d0430526555bf97582787da50df0268
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 13:36:11 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 13:36:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f8b20d

mail-client/neomutt: add 20240201

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20240201.ebuild | 176 ++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 0d7cd569c869..bd7e9037bc43 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,4 +2,5 @@ DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7c
 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e
 DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
 DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465d6ff641065d88982a7bef959a6c7fe1ee9622a1f166fc71ea74099145ae2f88cc28a258821dcc1f3acd493f74273b SHA512 a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138
+DIST neomutt-20240201.tar.gz 3831010 BLAKE2B 70654b8edb5b6e01585bb3551a7af3722aebc44a70804ec9e16511eec9b892a4bcf68e043699591b2610095558f3893d4d7f5c15e860c7b8c17458a872c3f170 SHA512 431270a093bfa5024f2565aa8921e3482262210ca03c410362b6fa504aa1f2e299d1f6eb63cb05dcaf7b1328051b5d32c4fd719b5cb7ddec83a176a85ff5dc53
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20240201.ebuild b/mail-client/neomutt/neomutt-20240201.ebuild
new file mode 100644
index 000000000000..9b86f293c2e9
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20240201.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-12-21 17:47 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-12-21 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f092f81d7aa539e9e7cbe1f798694fcde69d099f
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 17:45:27 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 17:45:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f092f81d

mail-client/neomutt: Version bump to 2023-12-21

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20231221.ebuild | 174 ++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5fae1267db3a..608ba4075c47 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,4 +4,5 @@ DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b
 DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e
 DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
+DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465d6ff641065d88982a7bef959a6c7fe1ee9622a1f166fc71ea74099145ae2f88cc28a258821dcc1f3acd493f74273b SHA512 a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20231221.ebuild b/mail-client/neomutt/neomutt-20231221.ebuild
new file mode 100644
index 000000000000..441d25a8c748
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20231221.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-12-21 17:47 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-12-21 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fea6ab5861863bab1e8c4db640b4ee6635119ec4
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 17:47:22 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 17:47:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea6ab58

mail-client/neomutt: Clean up old versions

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   3 -
 mail-client/neomutt/neomutt-20230407-r1.ebuild | 167 ------------------------
 mail-client/neomutt/neomutt-20230407.ebuild    | 172 -------------------------
 mail-client/neomutt/neomutt-20230512.ebuild    | 167 ------------------------
 mail-client/neomutt/neomutt-20230517.ebuild    | 167 ------------------------
 5 files changed, 676 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 608ba4075c47..0d7cd569c869 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,7 +1,4 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
-DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
-DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
-DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e
 DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
 DIST neomutt-20231221.tar.gz 3812682 BLAKE2B 367435e30d7e4259c1e8b6ece9531949465d6ff641065d88982a7bef959a6c7fe1ee9622a1f166fc71ea74099145ae2f88cc28a258821dcc1f3acd493f74273b SHA512 a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138

diff --git a/mail-client/neomutt/neomutt-20230407-r1.ebuild b/mail-client/neomutt/neomutt-20230407-r1.ebuild
deleted file mode 100644
index 9769219b8f76..000000000000
--- a/mail-client/neomutt/neomutt-20230407-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
-	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
-	test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230407.ebuild b/mail-client/neomutt/neomutt-20230407.ebuild
deleted file mode 100644
index 07e7a55be324..000000000000
--- a/mail-client/neomutt/neomutt-20230407.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.0
-			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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230512.ebuild b/mail-client/neomutt/neomutt-20230512.ebuild
deleted file mode 100644
index 9769219b8f76..000000000000
--- a/mail-client/neomutt/neomutt-20230512.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
-	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
-	test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230517.ebuild b/mail-client/neomutt/neomutt-20230517.ebuild
deleted file mode 100644
index 9769219b8f76..000000000000
--- a/mail-client/neomutt/neomutt-20230517.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
-	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
-	test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-11-14 14:40 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-11-14 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     24db6924ca172cc88273a15abbe9114f802114d7
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 14:37:37 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 14:40:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24db6924

Revert "mail-client/neomutt: Clean out old versions"

This reverts commit 7548d173936c39c3c16ffd7a914cbb38845b175d.

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   2 +
 mail-client/neomutt/neomutt-20220415.ebuild    | 171 ++++++++++++++++++++++++
 mail-client/neomutt/neomutt-20230407-r1.ebuild | 167 ++++++++++++++++++++++++
 mail-client/neomutt/neomutt-20230407.ebuild    | 172 +++++++++++++++++++++++++
 4 files changed, 512 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 125c7170cc51..5fae1267db3a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,5 @@
+DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
+DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
new file mode 100644
index 000000000000..de71a419eef0
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~ppc64 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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}

diff --git a/mail-client/neomutt/neomutt-20230407-r1.ebuild b/mail-client/neomutt/neomutt-20230407-r1.ebuild
new file mode 100644
index 000000000000..9769219b8f76
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230407-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
+	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}

diff --git a/mail-client/neomutt/neomutt-20230407.ebuild b/mail-client/neomutt/neomutt-20230407.ebuild
new file mode 100644
index 000000000000..07e7a55be324
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230407.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-11-14 14:24 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-11-14 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     aafb5e4327be3b9bb6530c88312051a35316d782
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 14:23:48 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 14:23:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafb5e43

mail-client/neomutt: Update neomutt-99999999

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-99999999.ebuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 07e7a55be324..65f398c671f3 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
@@ -21,9 +21,9 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
 REQUIRED_USE="
 	autocrypt? ( gpgme )"
 
@@ -50,8 +50,6 @@ CDEPEND="
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
 	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
 	lz4? ( app-arch/lz4 )
 	zlib? ( sys-libs/zlib )
@@ -114,7 +112,6 @@ src_configure() {
 		"$(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)"
@@ -122,6 +119,13 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
 	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-11-14 14:20 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-11-14 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f12bf652c28eb8807bf37017975598a39a17f32c
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 14:20:42 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 14:20:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12bf652

mail-client/neomutt: Fix manifest

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5fae1267db3a..125c7170cc51 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
-DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-11-14 14:19 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-11-14 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7548d173936c39c3c16ffd7a914cbb38845b175d
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 14:19:35 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 14:19:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7548d173

mail-client/neomutt: Clean out old versions

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20220415.ebuild    | 171 ------------------------
 mail-client/neomutt/neomutt-20230407-r1.ebuild | 167 ------------------------
 mail-client/neomutt/neomutt-20230407.ebuild    | 172 -------------------------
 3 files changed, 510 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
deleted file mode 100644
index de71a419eef0..000000000000
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.0
-			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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230407-r1.ebuild b/mail-client/neomutt/neomutt-20230407-r1.ebuild
deleted file mode 100644
index 9769219b8f76..000000000000
--- a/mail-client/neomutt/neomutt-20230407-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
-	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
-	test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(use_enable kerberos gss)"
-		"$(use_enable lmdb)"
-		"$(use_enable sasl)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"$(use_enable ssl)"
-		"$(use_enable gnutls)"
-
-		"$(usex test --testing --disable-testing)"
-	)
-
-	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230407.ebuild b/mail-client/neomutt/neomutt-20230407.ebuild
deleted file mode 100644
index 07e7a55be324..000000000000
--- a/mail-client/neomutt/neomutt-20230407.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.0
-			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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-11-14  4:32 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-11-14  4:32 UTC (permalink / raw
  To: gentoo-commits

commit:     4de47c94f583d30b2cbb6325dc695c4184d04f2f
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 13:00:12 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 04:32:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de47c94

mail-client/neomutt: Version bump 20231103

This change also addresses Sam James' suggestion regarding the two
sanitize compile flags. They are now activated via CFLAGS and not USE
flags.

Bug: https://bugs.gentoo.org/905838
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20231103.ebuild | 174 ++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 1ac5dfdb67a0..5fae1267db3a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,4 +3,5 @@ DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e
+DIST neomutt-20231103.tar.gz 3816069 BLAKE2B 5ed767fd0c7a37fc24bebd853d6a6b3cb0c9e15f6e8df89a7a82c79327986db2814024fb43afe78f87565e438544834e8668f6d7e0448db374a46840a4f63152 SHA512 f60911fa479dc2ff99fc90a6d62a6f1c914443d38ef7de055a6bce87808f4682f798f1faef005b0e5fbe9417f4d42588d9b4b1fc56968c02f871d6f3355aa446
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20231103.ebuild b/mail-client/neomutt/neomutt-20231103.ebuild
new file mode 100644
index 000000000000..441d25a8c748
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20231103.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	if is-flagq -fsanitize=address; then
+		myconf+=( --asan )
+	fi
+	if is-flagq -fsanitize=undefined; then
+		myconf+=( --ubsan )
+	fi
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-11-03 15:05 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-11-03 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     77c0c87ee152193d718dfcf2869ca8c817e18b47
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 15:05:05 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 15:05:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c0c87e

mail-client/neomutt: Add debugging flags

This change adds `asan` and `ubsan` USE flags for debugging.

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/metadata.xml               |   2 +
 mail-client/neomutt/neomutt-20231023-r1.ebuild | 170 +++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 583a2caccf5e..6adb8f922fb6 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -10,6 +10,8 @@
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 	<use>
+		<flag name="asan">Enable Address sanitizer for debugging</flag>
+		<flag name="ubsan">Enable undefined behavior sanitizer for debugging</flag>
 		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable BDB (Berkley DB) backend for header
 			caching</flag>

diff --git a/mail-client/neomutt/neomutt-20231023-r1.ebuild b/mail-client/neomutt/neomutt-20231023-r1.ebuild
new file mode 100644
index 000000000000..717320f71275
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20231023-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4
+	nls notmuch pgp-classic qdbm asan ubsan sasl selinux smime-classic ssl
+	tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable asan)"
+		"$(use_enable ubsan)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-10-29 11:33 Marc Schiffbauer
  0 siblings, 0 replies; 129+ messages in thread
From: Marc Schiffbauer @ 2023-10-29 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     802c3c881bf5e8de558fc4e57ce028627776a3f0
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 11:32:44 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 11:32:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802c3c88

mail-client/neomutt: add myself as a maintainer

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 mail-client/neomutt/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index f0351b470d80..583a2caccf5e 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -5,6 +5,10 @@
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
 	<use>
 		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable BDB (Berkley DB) backend for header


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-10-28 17:24 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-10-28 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     521961a1b33d2fe3e501b9dd97ca131d7e62271e
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Oct 27 18:41:06 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 17:24:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521961a1

mail-client/neomutt: add 20231023

Closes: https://github.com/gentoo/gentoo/pull/33549
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20231023.ebuild | 167 ++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index e9cc908ee15d..1ac5dfdb67a0 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,4 +2,5 @@ DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7c
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
+DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20231023.ebuild b/mail-client/neomutt/neomutt-20231023.ebuild
new file mode 100644
index 000000000000..9769219b8f76
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20231023.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
+	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-05-17 19:01 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-05-17 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     8ef2657b76dd61f9e3590e681853dd53d6c41f97
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 18:50:46 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed May 17 19:01:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef2657b

mail-client/neomutt: Version bump 20230517

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20230517.ebuild | 167 ++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5c73ed0b2c40..e9cc908ee15d 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1,5 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
+DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20230517.ebuild b/mail-client/neomutt/neomutt-20230517.ebuild
new file mode 100644
index 000000000000..9769219b8f76
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230517.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
+	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-05-12 17:56 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-05-12 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     89df086b114243ceb0c290cb11578638cc10ac9c
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 17:55:57 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri May 12 17:55:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89df086b

mail-client/neomutt: cleanup

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   1 -
 mail-client/neomutt/neomutt-20230322-r1.ebuild | 170 ------------------------
 mail-client/neomutt/neomutt-20230322.ebuild    | 171 -------------------------
 3 files changed, 342 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index a022380af2f6..5c73ed0b2c40 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,4 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
-DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20230322-r1.ebuild b/mail-client/neomutt/neomutt-20230322-r1.ebuild
deleted file mode 100644
index 5568bdc1402c..000000000000
--- a/mail-client/neomutt/neomutt-20230322-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:5.3
-			sys-libs/db:4.8
-		)
-	)
-	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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn2:= )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		--disable-idn
-		"$(use_enable idn idn2)"
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230322.ebuild b/mail-client/neomutt/neomutt-20230322.ebuild
deleted file mode 100644
index 771367cdb4f5..000000000000
--- a/mail-client/neomutt/neomutt-20230322.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.0
-			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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-05-12 17:54 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-05-12 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9de45acf7226c01437397e93569079e4b1044285
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 17:37:36 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri May 12 17:53:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9de45acf

mail-client/neomutt: Version bump to 20230512

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20230512.ebuild | 167 ++++++++++++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 1887694806ff..a022380af2f6 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1,5 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
+DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20230512.ebuild b/mail-client/neomutt/neomutt-20230512.ebuild
new file mode 100644
index 000000000000..9769219b8f76
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230512.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
+	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+	)
+	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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-05-05 13:47 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-05-05 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     15627b8c10ca978941176a0f5a8a3acf561c2537
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 13:45:17 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri May  5 13:47:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15627b8c

mail-client/neomutt: Cleanup

Remove broken dependency on BerkeleyDB:6.0 and remove old version of
neomutt.

Closes: https://bugs.gentoo.org/904068
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   1 -
 mail-client/neomutt/neomutt-20220429.ebuild    | 171 -------------------------
 mail-client/neomutt/neomutt-20230322-r1.ebuild |   2 -
 mail-client/neomutt/neomutt-20230407-r1.ebuild |   2 -
 4 files changed, 176 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d9208b3c339a..1887694806ff 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,4 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
-DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
 DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3
 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
deleted file mode 100644
index 771367cdb4f5..000000000000
--- a/mail-client/neomutt/neomutt-20220429.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? (
-		|| (
-			sys-libs/db:6.0
-			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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20230322-r1.ebuild b/mail-client/neomutt/neomutt-20230322-r1.ebuild
index 07e7a55be324..5568bdc1402c 100644
--- a/mail-client/neomutt/neomutt-20230322-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20230322-r1.ebuild
@@ -31,11 +31,9 @@ CDEPEND="
 	app-misc/mime-types
 	berkdb? (
 		|| (
-			sys-libs/db:6.0
 			sys-libs/db:5.3
 			sys-libs/db:4.8
 		)
-		<sys-libs/db-6.3:=
 	)
 	gdbm? ( sys-libs/gdbm:= )
 	kyotocabinet? ( dev-db/kyotocabinet )

diff --git a/mail-client/neomutt/neomutt-20230407-r1.ebuild b/mail-client/neomutt/neomutt-20230407-r1.ebuild
index 12c4520575e0..9769219b8f76 100644
--- a/mail-client/neomutt/neomutt-20230407-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20230407-r1.ebuild
@@ -31,11 +31,9 @@ CDEPEND="
 	app-misc/mime-types
 	berkdb? (
 		|| (
-			sys-libs/db:6.0
 			sys-libs/db:5.3
 			sys-libs/db:4.8
 		)
-		<sys-libs/db-6.3:=
 	)
 	gdbm? ( sys-libs/gdbm:= )
 	kyotocabinet? ( dev-db/kyotocabinet )


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-05-02 20:31 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-05-02 20:31 UTC (permalink / raw
  To: gentoo-commits

commit:     1f832d0b9617cf04b3623caf305398332a466607
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:29:59 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:31:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f832d0b

mail-client/neomutt: Remove obsolete --with-ui

Closes: https://bugs.gentoo.org/820038
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20230407-r1.ebuild | 169 +++++++++++++++++++++++++
 1 file changed, 169 insertions(+)

diff --git a/mail-client/neomutt/neomutt-20230407-r1.ebuild b/mail-client/neomutt/neomutt-20230407-r1.ebuild
new file mode 100644
index 000000000000..12c4520575e0
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230407-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb
+	lz4 nls notmuch pgp-classic qdbm sasl selinux smime-classic ssl tokyocabinet
+	test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-04-27 16:25 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-04-27 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     16efb723ec2a74b2972de762a7d8c07ff6674617
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 16:11:26 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 16:12:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16efb723

mail-client/neomutt: Version bump 20230407

Closes: https://bugs.gentoo.org/905171
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20230407.ebuild | 172 ++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 31393abf5e2f..d9208b3c339a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1,5 @@
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
 DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3
+DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20230407.ebuild b/mail-client/neomutt/neomutt-20230407.ebuild
new file mode 100644
index 000000000000..07e7a55be324
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230407.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.0
+			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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		--disable-idn
+		"$(use_enable idn idn2)"
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-04-07 10:07 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-04-07 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1be106daf0a7fc2f36d129c74a97bbdbbe3220ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 10:03:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  7 10:03:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be106da

mail-client/neomutt: switch to libidn2

libidn is obsolete.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{neomutt-99999999.ebuild => neomutt-20230322-r1.ebuild}      | 9 +++++----
 mail-client/neomutt/neomutt-99999999.ebuild                      | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-20230322-r1.ebuild
similarity index 96%
copy from mail-client/neomutt/neomutt-99999999.ebuild
copy to mail-client/neomutt/neomutt-20230322-r1.ebuild
index 75602e5c7587..07e7a55be324 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-20230322-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
@@ -46,7 +46,7 @@ CDEPEND="
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
 	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn:= )
+	idn? ( net-dns/libidn2:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
@@ -109,7 +109,8 @@ src_configure() {
 		"$(use_enable zlib)"
 		"$(use_enable zstd)"
 
-		"$(use_enable idn)"
+		--disable-idn
+		"$(use_enable idn idn2)"
 		"$(use_enable kerberos gss)"
 		"$(use_enable lmdb)"
 		"$(use_enable sasl)"

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 75602e5c7587..07e7a55be324 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
@@ -46,7 +46,7 @@ CDEPEND="
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
 	autocrypt? ( >=dev-db/sqlite-3 )
-	idn? ( net-dns/libidn:= )
+	idn? ( net-dns/libidn2:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
@@ -109,7 +109,8 @@ src_configure() {
 		"$(use_enable zlib)"
 		"$(use_enable zstd)"
 
-		"$(use_enable idn)"
+		--disable-idn
+		"$(use_enable idn idn2)"
 		"$(use_enable kerberos gss)"
 		"$(use_enable lmdb)"
 		"$(use_enable sasl)"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-03-23 13:22 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-03-23 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     a110723c2307df622d975ffda19abc90cfbd7b8e
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 13:21:28 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 13:22:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a110723c

mail-client/neomutt: Fix pkgcheck suggestions

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20220415.ebuild | 2 +-
 mail-client/neomutt/neomutt-20220429.ebuild | 2 +-
 mail-client/neomutt/neomutt-20230322.ebuild | 2 +-
 mail-client/neomutt/neomutt-99999999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index 7fa4e2445830..de71a419eef0 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -31,7 +31,7 @@ CDEPEND="
 	app-misc/mime-types
 	berkdb? (
 		|| (
-			sys-libs/db:6.2
+			sys-libs/db:6.0
 			sys-libs/db:5.3
 			sys-libs/db:4.8
 		)

diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
index 40d5ddfd9f82..771367cdb4f5 100644
--- a/mail-client/neomutt/neomutt-20220429.ebuild
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -31,7 +31,7 @@ CDEPEND="
 	app-misc/mime-types
 	berkdb? (
 		|| (
-			sys-libs/db:6.2
+			sys-libs/db:6.0
 			sys-libs/db:5.3
 			sys-libs/db:4.8
 		)

diff --git a/mail-client/neomutt/neomutt-20230322.ebuild b/mail-client/neomutt/neomutt-20230322.ebuild
index 40d5ddfd9f82..771367cdb4f5 100644
--- a/mail-client/neomutt/neomutt-20230322.ebuild
+++ b/mail-client/neomutt/neomutt-20230322.ebuild
@@ -31,7 +31,7 @@ CDEPEND="
 	app-misc/mime-types
 	berkdb? (
 		|| (
-			sys-libs/db:6.2
+			sys-libs/db:6.0
 			sys-libs/db:5.3
 			sys-libs/db:4.8
 		)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index f149b539eac9..75602e5c7587 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -31,7 +31,7 @@ CDEPEND="
 	app-misc/mime-types
 	berkdb? (
 		|| (
-			sys-libs/db:6.2
+			sys-libs/db:6.0
 			sys-libs/db:5.3
 			sys-libs/db:4.8
 		)


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-03-23  3:42 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-03-23  3:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d52fcab61a69eadd207ebe615ae109f5ac39fe48
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 03:42:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 03:42:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52fcab6

mail-client/neomutt: update Manifest

Fixes: 766122049eaee76f115a4855fdf8d0ed9aefd155
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/Manifest | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index a817a101592f..31393abf5e2f 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
-DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
 DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-03-22 17:26 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-03-22 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     4551b5e6e58dd9c53b8a82e5948481b4662ef459
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 16:46:48 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 17:26:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4551b5e6

mail-client/neomutt: Version bump to 2023-03-22

Closes: https://github.com/gentoo/gentoo/pull/30305
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20230322.ebuild | 171 ++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index b3f865088f51..a817a101592f 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,4 +2,5 @@ DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd82
 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
+DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20230322.ebuild b/mail-client/neomutt/neomutt-20230322.ebuild
new file mode 100644
index 000000000000..40d5ddfd9f82
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20230322.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-03-22 17:26 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2023-03-22 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     766122049eaee76f115a4855fdf8d0ed9aefd155
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 16:49:19 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 17:26:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76612204

mail-client/neomutt: Remove old versions

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20211029-r1.ebuild | 171 -------------------------
 mail-client/neomutt/neomutt-20211029.ebuild    | 162 -----------------------
 mail-client/neomutt/neomutt-20220408.ebuild    | 171 -------------------------
 3 files changed, 504 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
deleted file mode 100644
index 21f921b4b59e..000000000000
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
deleted file mode 100644
index 57bee1ffc254..000000000000
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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 autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
deleted file mode 100644
index f149b539eac9..000000000000
--- a/mail-client/neomutt/neomutt-20220408.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-	fi
-	if [[ ${PV} =~ 99999999$ ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-01-06 20:03 Arthur Zamarin
  0 siblings, 0 replies; 129+ messages in thread
From: Arthur Zamarin @ 2023-01-06 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     63ca1a210810258c57a57b63d82e9d3caf0a4ee3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 20:03:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 20:03:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ca1a21

mail-client/neomutt: Stabilize 20220415 x86, #889954

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20220415.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index 241ae7373f0e..7fa4e2445830 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2023-01-06 20:03 Arthur Zamarin
  0 siblings, 0 replies; 129+ messages in thread
From: Arthur Zamarin @ 2023-01-06 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7d3ba86fc2d368d624660278f51c647a1caa3cd5
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 20:03:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 20:03:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3ba86f

mail-client/neomutt: Stabilize 20220415 amd64, #889954

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20220415.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index f149b539eac9..241ae7373f0e 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-08-30  8:27 Jakov Smolić
  0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-08-30  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     502c61508314e685b63cb7246aeb49937e2907fb
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 08:19:29 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 08:19:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502c6150

mail-client/neomutt: Keyword 20220429 riscv, #866179

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 mail-client/neomutt/neomutt-20220429.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
index f149b539eac9..40d5ddfd9f82 100644
--- a/mail-client/neomutt/neomutt-20220429.ebuild
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-06-16 16:30 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-06-16 16:30 UTC (permalink / raw
  To: gentoo-commits

commit:     04ecc291513efdd4f7e8677e8d965d83087d9778
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Wed Jun  8 19:57:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 16:30:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ecc291

mail-client/neomutt: fix unquoted variable S

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20211029-r1.ebuild | 2 +-
 mail-client/neomutt/neomutt-20211029.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20220408.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20220415.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20220429.ebuild    | 2 +-
 mail-client/neomutt/neomutt-99999999.ebuild    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index b8a28e2720eb..21f921b4b59e 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	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"

diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
index 6c5d607b8a48..57bee1ffc254 100644
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -116,7 +116,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	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"

diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-20220408.ebuild
+++ b/mail-client/neomutt/neomutt-20220408.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	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"

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	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"

diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-20220429.ebuild
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	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"

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index b3f780bca0ac..f149b539eac9 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	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"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-05-23 19:37 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2022-05-23 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     16d95b6a025690fb69ed0cf6f92a2b338bec2a9f
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 19:31:04 2022 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon May 23 19:37:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d95b6a

mail-client/neomutt: Remove old versions

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   3 -
 mail-client/neomutt/neomutt-20210205-r1.ebuild | 166 -------------------------
 mail-client/neomutt/neomutt-20211015.ebuild    | 162 ------------------------
 mail-client/neomutt/neomutt-20211022.ebuild    | 162 ------------------------
 4 files changed, 493 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 92f1651f0e2d..b3f865088f51 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,3 @@
-DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
-DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
-DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0
 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
deleted file mode 100644
index 5db3c1afba0c..000000000000
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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 )"
-
-PATCHES=(
-		"${FILESDIR}/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch"
-)
-
-src_configure() {
-	local myconf=(
-		"$(usex doc --full-doc --disable-doc)"
-		"$(use_enable nls)"
-		"$(use_enable notmuch)"
-
-		"$(use_enable autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
deleted file mode 100644
index 6c5d607b8a48..000000000000
--- a/mail-client/neomutt/neomutt-20211015.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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 autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20211022.ebuild b/mail-client/neomutt/neomutt-20211022.ebuild
deleted file mode 100644
index 6c5d607b8a48..000000000000
--- a/mail-client/neomutt/neomutt-20211022.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test zlib zstd"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-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 autocrypt)"
-		"$(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)"
-
-		# Header compression.
-		"$(use_enable lz4)"
-		"$(use_enable zlib)"
-		"$(use_enable zstd)"
-
-		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-04-29 18:32 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2022-04-29 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     366dff1d38f4bf4ca1ea2467cbb87876f907b920
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 18:30:04 2022 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 18:32:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=366dff1d

mail-client/neomutt: Version bump to 20220429

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20220429.ebuild | 171 ++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5749f04cd9b4..92f1651f0e2d 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,4 +4,5 @@ DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c
 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
 DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
+DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
new file mode 100644
index 000000000000..b3f780bca0ac
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-04-26  2:27 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-04-26  2:27 UTC (permalink / raw
  To: gentoo-commits

commit:     5d7efd4ff70dfb6282f43e73cde1cd8b61c16201
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 18:36:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 02:26:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7efd4f

mail-client/neomutt: drop ~s390

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20210205-r1.ebuild | 2 +-
 mail-client/neomutt/neomutt-20211015.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20211022.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20211029-r1.ebuild | 2 +-
 mail-client/neomutt/neomutt-20211029.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20220408.ebuild    | 2 +-
 mail-client/neomutt/neomutt-20220415.ebuild    | 2 +-
 mail-client/neomutt/neomutt-99999999.ebuild    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index f0ec73388d4d..5db3c1afba0c 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~s390 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
index 85f32fdfd081..6c5d607b8a48 100644
--- a/mail-client/neomutt/neomutt-20211015.ebuild
+++ b/mail-client/neomutt/neomutt-20211015.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20211022.ebuild b/mail-client/neomutt/neomutt-20211022.ebuild
index 85f32fdfd081..6c5d607b8a48 100644
--- a/mail-client/neomutt/neomutt-20211022.ebuild
+++ b/mail-client/neomutt/neomutt-20211022.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index dbe164997e6e..b8a28e2720eb 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~s390 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
index 85f32fdfd081..6c5d607b8a48 100644
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
index ec67e6bc7849..b3f780bca0ac 100644
--- a/mail-client/neomutt/neomutt-20220408.ebuild
+++ b/mail-client/neomutt/neomutt-20220408.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index ec67e6bc7849..b3f780bca0ac 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index ec67e6bc7849..b3f780bca0ac 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-04-15 18:29 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2022-04-15 18:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c4209a54758bda0edb782332210dd6d0fc55160e
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:26:59 2022 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:29:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4209a54

mail-client/neomutt: Version bump to 2022-04-15

Closes: https://bugs.gentoo.org/838499
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20220415.ebuild | 171 ++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 8f89a54ee2c8..5749f04cd9b4 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,4 +3,5 @@ DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c0
 DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0
 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
+DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
new file mode 100644
index 000000000000..ec67e6bc7849
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-04-08 17:04 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2022-04-08 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2ac1c0b164ead45df3372e1a8f288fd3f2d58875
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 17:03:59 2022 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 17:04:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac1c0b1

mail-client/neomutt: Version bump to 2022-04-08

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20220408.ebuild | 171 ++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 77081a6f1900..8f89a54ee2c8 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,4 +2,5 @@ DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b0041
 DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
 DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0
 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
+DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
new file mode 100644
index 000000000000..ec67e6bc7849
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20220408.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD="$(tc-getCC)" "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-03-28  6:53 Agostino Sarubbo
  0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2022-03-28  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     bb940b1e8c7d06b0c0fb982b2a0b84b5b3634471
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 06:53:16 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 06:53:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb940b1e

mail-client/neomutt: x86 stable wrt bug #836017

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-client/neomutt/neomutt-20211029-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index 8b90c9db4135..dbe164997e6e 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~s390 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-03-26 19:47 Agostino Sarubbo
  0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2022-03-26 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     593c61052d88267adfdc9db2eae0ba9508c5a8b6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 19:47:32 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 19:47:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593c6105

mail-client/neomutt: amd64 stable wrt bug #836017

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-client/neomutt/neomutt-20211029-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index ec67e6bc7849..8b90c9db4135 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~s390 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-03-26  0:12 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-03-26  0:12 UTC (permalink / raw
  To: gentoo-commits

commit:     25da31562b252e41cb35cc6ca430fcf965862fcc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 00:10:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 00:10:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25da3156

mail-client/neomutt: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20210205-r1.ebuild | 4 ++--
 mail-client/neomutt/neomutt-20211015.ebuild    | 4 ++--
 mail-client/neomutt/neomutt-20211022.ebuild    | 4 ++--
 mail-client/neomutt/neomutt-20211029-r1.ebuild | 4 ++--
 mail-client/neomutt/neomutt-20211029.ebuild    | 4 ++--
 mail-client/neomutt/neomutt-99999999.ebuild    | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index cf9c213f4c7e..f0ec73388d4d 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -116,7 +116,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 
 src_test() {

diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
index dd0fe7e9a572..85f32fdfd081 100644
--- a/mail-client/neomutt/neomutt-20211015.ebuild
+++ b/mail-client/neomutt/neomutt-20211015.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -112,7 +112,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 
 src_test() {

diff --git a/mail-client/neomutt/neomutt-20211022.ebuild b/mail-client/neomutt/neomutt-20211022.ebuild
index dd0fe7e9a572..85f32fdfd081 100644
--- a/mail-client/neomutt/neomutt-20211022.ebuild
+++ b/mail-client/neomutt/neomutt-20211022.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -112,7 +112,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 
 src_test() {

diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index a861264f1710..ec67e6bc7849 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -121,7 +121,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 
 src_test() {

diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
index dd0fe7e9a572..85f32fdfd081 100644
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -112,7 +112,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 
 src_test() {

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index a861264f1710..ec67e6bc7849 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -121,7 +121,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
 }
 
 src_test() {


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2022-03-08 22:03 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2022-03-08 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9a3152345b0ed89f6ed32bc47398c7c6062723c7
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 22:02:31 2022 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 22:03:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a315234

mail-client/neomutt: bump EAPI to 8

* Bump EAPI to 8
* Fix broken tests for live ebuild

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 .../{neomutt-99999999.ebuild => neomutt-20211029-r1.ebuild}   | 11 ++++++++++-
 mail-client/neomutt/neomutt-99999999.ebuild                   | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
similarity index 97%
copy from mail-client/neomutt/neomutt-99999999.ebuild
copy to mail-client/neomutt/neomutt-20211029-r1.ebuild
index dd0fe7e9a572..a861264f1710 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -77,6 +77,15 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="!test? ( test )"
 
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
 src_configure() {
 	local myconf=(
 		"$(usex doc --full-doc --disable-doc)"

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index dd0fe7e9a572..a861264f1710 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -77,6 +77,15 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="!test? ( test )"
 
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
 src_configure() {
 	local myconf=(
 		"$(usex doc --full-doc --disable-doc)"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-10-29 19:19 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2021-10-29 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     55e57d3d2ebef33004b523a95c8d9c9891ac1c1e
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 19:18:11 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 19:19:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e57d3d

mail-client/neomutt: Version bump to 20211029

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20211029.ebuild | 162 ++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 16c0661c665..77081a6f190 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1,5 @@
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
 DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0
+DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
new file mode 100644
index 00000000000..dd0fe7e9a57
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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 autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD=$(tc-getCC) "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-10-22 13:42 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2021-10-22 13:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d991734e4b86114c58930668d4bf7ed1aeed6dd9
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 22 13:39:32 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 22 13:42:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d991734e

mail-client/neomutt: Version bump

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20211022.ebuild | 162 ++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d5903cf7521..16c0661c665 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,4 @@
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
+DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20211022.ebuild b/mail-client/neomutt/neomutt-20211022.ebuild
new file mode 100644
index 00000000000..dd0fe7e9a57
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20211022.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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 autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD=$(tc-getCC) "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-10-15 17:41 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2021-10-15 17:41 UTC (permalink / raw
  To: gentoo-commits

commit:     7d5fb55938debf3717a4ed44ee8012de440c2e0d
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 17:38:23 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 17:39:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5fb559

mail-client/neomutt: Version bump to 20211015

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20211015.ebuild | 162 ++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 222c371feb0..d5903cf7521 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,2 +1,3 @@
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
+DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
new file mode 100644
index 00000000000..dd0fe7e9a57
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20211015.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+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-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	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? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+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 autocrypt)"
+		"$(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)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(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 CC_FOR_BUILD=$(tc-getCC) "${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
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-09-28 16:38 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2021-09-28 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     d1cd167ddc27dc858630490c9b3048d6f33de393
Author:     Jan Krieg <git <AT> jankrieg <DOT> anonaddy <DOT> com>
AuthorDate: Mon Sep 27 21:24:54 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Sep 28 16:37:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cd167d

mail-client/neomutt: Add use flags for header cache compression

Add the use flags lz4, zlib, and zstd to enable header cache
compression, which is supported by upstream since release 2020-03-13.

Closes: https://bugs.gentoo.org/815187
Closes: https://github.com/gentoo/gentoo/pull/22425
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jan Krieg <git <AT> jankrieg.anonaddy.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/metadata.xml               |  3 +++
 mail-client/neomutt/neomutt-20210205-r1.ebuild | 12 ++++++++++--
 mail-client/neomutt/neomutt-99999999.ebuild    | 12 ++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index ba1eb61f14b..f0351b470d8 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -27,6 +27,9 @@
 			traditional/inline PGP</flag>
 		<flag name="smime-classic">Build classic-smime backend to support
 			S/MIME</flag>
+		<flag name="lz4">Add lz4 support for header cache compression</flag>
+		<flag name="zlib">Add zlib support for header cache compression</flag>
+		<flag name="zstd">Add zstd support for header cache compression</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">neomutt/neomutt</remote-id>

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index ca913af6f3c..cf9c213f4c7 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -22,8 +22,8 @@ HOMEPAGE="https://neomutt.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
 REQUIRED_USE="
 	autocrypt? ( gpgme )"
 
@@ -53,6 +53,9 @@ CDEPEND="
 	!slang? ( sys-libs/ncurses:0= )
 	slang? ( sys-libs/slang )
 	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=
@@ -96,6 +99,11 @@ src_configure() {
 		"$(use_enable qdbm)"
 		"$(use_enable tokyocabinet)"
 
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
 		"$(use_enable idn)"
 		"$(use_enable kerberos gss)"
 		"$(use_enable lmdb)"

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 2731fc6fe9f..dd0fe7e9a57 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -22,8 +22,8 @@ HOMEPAGE="https://neomutt.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
 REQUIRED_USE="
 	autocrypt? ( gpgme )"
 
@@ -53,6 +53,9 @@ CDEPEND="
 	!slang? ( sys-libs/ncurses:0= )
 	slang? ( sys-libs/slang )
 	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=
@@ -92,6 +95,11 @@ src_configure() {
 		"$(use_enable qdbm)"
 		"$(use_enable tokyocabinet)"
 
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
 		"$(use_enable idn)"
 		"$(use_enable kerberos gss)"
 		"$(use_enable lmdb)"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-05-26  8:09 Thomas Deutschmann
  0 siblings, 0 replies; 129+ messages in thread
From: Thomas Deutschmann @ 2021-05-26  8:09 UTC (permalink / raw
  To: gentoo-commits

commit:     57995b9b5da2f30571e8ef0221616f8f5018d624
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 08:09:25 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed May 26 08:09:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57995b9b

mail-client/neomutt: security cleanup

Bug: https://bugs.gentoo.org/788391
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   1 -
 mail-client/neomutt/neomutt-20201127-r1.ebuild | 152 -------------------------
 mail-client/neomutt/neomutt-20201127.ebuild    | 152 -------------------------
 mail-client/neomutt/neomutt-20210205.ebuild    | 152 -------------------------
 4 files changed, 457 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index b99eaaa1de5..222c371feb0 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,2 @@
-DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
deleted file mode 100644
index 7bb8a219d5f..00000000000
--- a/mail-client/neomutt/neomutt-20201127-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-	"
-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 autocrypt)"
-		"$(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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
deleted file mode 100644
index 4e1643d3b1f..00000000000
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.8.0:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-"
-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 autocrypt)"
-		"$(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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}

diff --git a/mail-client/neomutt/neomutt-20210205.ebuild b/mail-client/neomutt/neomutt-20210205.ebuild
deleted file mode 100644
index ac3c11deb6f..00000000000
--- a/mail-client/neomutt/neomutt-20210205.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} =~ 99999999$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~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="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
-	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet test"
-REQUIRED_USE="
-	autocrypt? ( gpgme )"
-
-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-1.13.1:= )
-	autocrypt? ( >=dev-db/sqlite-3 )
-	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? ( >=dev-libs/openssl-1.0.2u:0= )
-"
-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 autocrypt)"
-		"$(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
-
-	if use autocrypt && ! use idn; then
-		ewarn "  It is highly recommended that NeoMutt be also configured"
-		ewarn "  with idn when autocrypt is enabled."
-	fi
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-05-25 19:10 Agostino Sarubbo
  0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2021-05-25 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     00874df6342e185934e2f2d540051e80f0403d76
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 19:10:25 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 25 19:10:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00874df6

mail-client/neomutt: x86 stable wrt bug #788391

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-client/neomutt/neomutt-20210205-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index 537c1b22a79..ca913af6f3c 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~s390 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-05-25 18:58 Agostino Sarubbo
  0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2021-05-25 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     46d4e415dd101ebcfd2c952f274095d09cfd6e4e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 18:58:09 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 25 18:58:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d4e415

mail-client/neomutt: amd64 stable wrt bug #788391

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 mail-client/neomutt/neomutt-20210205-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index e8395c25d1e..537c1b22a79 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~s390 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-05-14  0:22 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-05-14  0:22 UTC (permalink / raw
  To: gentoo-commits

commit:     12abfe9e49c4d244e9d4e237f1329356880e1bdf
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 18:26:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 14 00:22:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12abfe9e

mail-client/neomutt: Do not call `cc`

Closes: https://bugs.gentoo.org/724716
Closes: https://github.com/gentoo/gentoo/pull/20796
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20210205-r1.ebuild | 4 +++-
 mail-client/neomutt/neomutt-99999999.ebuild    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild
index 3c05cf9fd23..e8395c25d1e 100644
--- a/mail-client/neomutt/neomutt-20210205-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20210205-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
@@ -106,7 +108,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
 }
 
 src_test() {

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index ac3c11deb6f..2731fc6fe9f 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
@@ -102,7 +104,7 @@ src_configure() {
 		"$(usex test --testing --disable-testing)"
 	)
 
-	econf CCACHE=none "${myconf[@]}"
+	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
 }
 
 src_test() {


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-04-30 12:47 Mikle Kolyada
  0 siblings, 0 replies; 129+ messages in thread
From: Mikle Kolyada @ 2021-04-30 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f26644d7be7dee522e33735e3786c8aef1d254e2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 12:46:34 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 12:46:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26644d7

mail-client/neomutt: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 mail-client/neomutt/neomutt-20201127-r1.ebuild | 9 +++------
 mail-client/neomutt/neomutt-20201127.ebuild    | 7 ++-----
 mail-client/neomutt/neomutt-20210205.ebuild    | 7 ++-----
 mail-client/neomutt/neomutt-99999999.ebuild    | 7 ++-----
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
index 461ba50bfac..7bb8a219d5f 100644
--- a/mail-client/neomutt/neomutt-20201127-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
 REQUIRED_USE="
@@ -50,11 +50,8 @@ CDEPEND="
 	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:= )
-	)
-"
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	"
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=
 	net-mail/mailbase

diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index 893ffb6bacd..4e1643d3b1f 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
 REQUIRED_USE="
@@ -50,10 +50,7 @@ CDEPEND="
 	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:= )
-	)
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=

diff --git a/mail-client/neomutt/neomutt-20210205.ebuild b/mail-client/neomutt/neomutt-20210205.ebuild
index 461ba50bfac..ac3c11deb6f 100644
--- a/mail-client/neomutt/neomutt-20210205.ebuild
+++ b/mail-client/neomutt/neomutt-20210205.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
 REQUIRED_USE="
@@ -50,10 +50,7 @@ CDEPEND="
 	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:= )
-	)
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 461ba50bfac..ac3c11deb6f 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
 REQUIRED_USE="
@@ -50,10 +50,7 @@ CDEPEND="
 	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:= )
-	)
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
 "
 DEPEND="${CDEPEND}
 	dev-lang/tcl:=


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-03-10 14:32 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2021-03-10 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2a4623f6bf9ff7a3f607840fc4ceef896993ee6c
Author:     Stefan Huber <shuber <AT> sthu <DOT> org>
AuthorDate: Tue Feb  9 21:50:17 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 14:30:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4623f6

mail-client/neomutt: Add autocrypt use flag

NeoMutt supports autocrypt since version 2019-10-25. It requires gpgme
of version 1.8.0 or higher and sqlite. It is recommended that idn or
idn2 is enabled according to the manual.

The minimum requirement of gpgme of neomutt-20201127.ebuild is increased
from 0.9.0 to 1.8.0. This change has no consquence as the minimum
available version in portage is 1.14.0.

Closes: https://bugs.gentoo.org/769698
Closes: https://github.com/gentoo/gentoo/pull/19392
Signed-off-by: Stefan Huber <shuber <AT> sthu.org>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/metadata.xml               |  1 +
 mail-client/neomutt/neomutt-20201127-r1.ebuild | 11 ++++++++++-
 mail-client/neomutt/neomutt-20201127.ebuild    | 13 +++++++++++--
 mail-client/neomutt/neomutt-20210205.ebuild    | 11 ++++++++++-
 mail-client/neomutt/neomutt-99999999.ebuild    | 11 ++++++++++-
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2fbef90b636..59bca750020 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Nicolas Bock</name>
 	</maintainer>
 	<use>
+		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable BDB (Berkley DB) backend for header
 			caching</flag>
 		<flag name="gdbm">Enable GDBM (GNU dbm) backend for header

diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
index 863e199daac..494bea47a6c 100644
--- a/mail-client/neomutt/neomutt-20201127-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }

diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index 2fbecf8b780..4a1c914f9bb 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -42,7 +44,8 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme? ( >=app-crypt/gpgme-1.8.0:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }

diff --git a/mail-client/neomutt/neomutt-20210205.ebuild b/mail-client/neomutt/neomutt-20210205.ebuild
index aec8ac34925..74180642cbc 100644
--- a/mail-client/neomutt/neomutt-20210205.ebuild
+++ b/mail-client/neomutt/neomutt-20210205.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index aec8ac34925..74180642cbc 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-02-05 18:58 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2021-02-05 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     30b0b12889fed698bd2cd4bad933d28bb7a20561
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 16:23:50 2021 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 18:58:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b0b128

mail-client/neomutt: Version bump to 2021-02-05

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                                          | 1 +
 .../neomutt/{neomutt-99999999.ebuild => neomutt-20210205.ebuild}      | 4 ++--
 mail-client/neomutt/neomutt-99999999.ebuild                           | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ae551638601..b99eaaa1de5 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,2 +1,3 @@
 DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
+DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-20210205.ebuild
similarity index 98%
copy from mail-client/neomutt/neomutt-99999999.ebuild
copy to mail-client/neomutt/neomutt-20210205.ebuild
index c2227b88db2..aec8ac34925 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-20210205.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index c2227b88db2..aec8ac34925 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2021-01-25 23:39 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-01-25 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     fadf3a014ec0d9db19d16ba8348883b651186a40
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 23:34:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 23:39:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fadf3a01

mail-client/neomutt: add github remote-id

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index f0b7a7e0338..2fbef90b636 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -27,4 +27,7 @@
 		<flag name="smime-classic">Build classic-smime backend to support
 			S/MIME</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">neomutt/neomutt</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-12-13  0:16 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2020-12-13  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     fa0764f41d1398609e3379796064276c7c2f59ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 00:08:04 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 00:08:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0764f4

mail-client/neomutt: Keyword 20201127-r1 s390, #750950

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20201127-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
index c2227b88db2..863e199daac 100644
--- a/mail-client/neomutt/neomutt-20201127-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-12-03 15:26 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-12-03 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     3a02f96d25538695778dd30af5664166caec386b
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 15:25:19 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 15:26:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a02f96d

mail-client/neomutt: Clean up of older ebuilds

Bug: https://bugs.gentoo.org/755833
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   4 -
 mail-client/neomutt/neomutt-20200626-r1.ebuild | 149 -------------------------
 mail-client/neomutt/neomutt-20200626.ebuild    | 128 ---------------------
 mail-client/neomutt/neomutt-20200821.ebuild    | 149 -------------------------
 mail-client/neomutt/neomutt-20200925.ebuild    | 149 -------------------------
 mail-client/neomutt/neomutt-20201120.ebuild    | 149 -------------------------
 6 files changed, 728 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 4c190fd7299..ae551638601 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,2 @@
-DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
-DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
-DIST neomutt-20200925.tar.gz 3440056 BLAKE2B 6f9858a02bdfc8a947ba1a26557e1b5c0ec027845e67a15b6811853e5b8820b9a27419ced4eaa407ca9b32efcd53d7cf878c44c0a54a277018aef36127c49e59 SHA512 1ee89ee1b3581fe2b7dafd091e315fcf4d6f7b0644c15b08af8eb2720e83f07ae526b5659abb44430309821f48013fc85af0dd6f140729b2e52e5f874cf3bc50
-DIST neomutt-20201120.tar.gz 3456322 BLAKE2B c5735140a553e5e4ae8072cb79466b9c5d7e9f65df5de7b7823842676d3eb44660d31c0407bb8253e2857a39b31b4252c8c18815a25d964d26cb30e70d81c7c2 SHA512 31c0cbfdf2b772f61b4c9bce97c9a2ad9fffb6ae21e562522544ad94247dfaa530334d90bd550eae1efc2b94a467ed959e4abb79b14261da7092f146a2e08e11
 DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20200626-r1.ebuild b/mail-client/neomutt/neomutt-20200626-r1.ebuild
deleted file mode 100644
index d45bb541971..00000000000
--- a/mail-client/neomutt/neomutt-20200626-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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
-}

diff --git a/mail-client/neomutt/neomutt-20200626.ebuild b/mail-client/neomutt/neomutt-20200626.ebuild
deleted file mode 100644
index 73acfc7fb6d..00000000000
--- a/mail-client/neomutt/neomutt-20200626.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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
-}

diff --git a/mail-client/neomutt/neomutt-20200821.ebuild b/mail-client/neomutt/neomutt-20200821.ebuild
deleted file mode 100644
index d45bb541971..00000000000
--- a/mail-client/neomutt/neomutt-20200821.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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
-}

diff --git a/mail-client/neomutt/neomutt-20200925.ebuild b/mail-client/neomutt/neomutt-20200925.ebuild
deleted file mode 100644
index d25f26c5ada..00000000000
--- a/mail-client/neomutt/neomutt-20200925.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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 ~ppc64 ~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
-}

diff --git a/mail-client/neomutt/neomutt-20201120.ebuild b/mail-client/neomutt/neomutt-20201120.ebuild
deleted file mode 100644
index d25f26c5ada..00000000000
--- a/mail-client/neomutt/neomutt-20201120.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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 ~ppc64 ~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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-12-02  3:06 Thomas Deutschmann
  0 siblings, 0 replies; 129+ messages in thread
From: Thomas Deutschmann @ 2020-12-02  3:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c468a1272801b2ea009d30d1ff65531c0fe6e766
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  2 02:57:28 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 02:57:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c468a127

mail-client/neomutt: x86 stable (bug #755833)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/neomutt/neomutt-20201127.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index f49ea4c191c..2fbecf8b780 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-12-01 14:02 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-12-01 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     1efbee1283ba2234861a680f8d91bdd6161630bf
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 13:52:30 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 14:02:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efbee12

mail-client/neomutt: Bump gpgme requirement

This change bumps the minimum version requirement for `app-crypt/gpgme`
to 1.13.1 as reported in https://bugs.gentoo.org/727026. Note that this
version of gpgme is currently not stable on s390 (see
https://bugs.gentoo.org/750950).

Closes: https://bugs.gentoo.org/727026
Bug: https://bugs.gentoo.org/750950
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 .../neomutt/{neomutt-99999999.ebuild => neomutt-20201127-r1.ebuild}     | 2 +-
 mail-client/neomutt/neomutt-99999999.ebuild                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
similarity index 98%
copy from mail-client/neomutt/neomutt-99999999.ebuild
copy to mail-client/neomutt/neomutt-20201127-r1.ebuild
index 0903176798d..c2227b88db2 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 0903176798d..c2227b88db2 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-12-01 12:10 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2020-12-01 12:10 UTC (permalink / raw
  To: gentoo-commits

commit:     512180203c484582bc168be740b865cb9ae072fc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 12:09:52 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 12:09:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51218020

mail-client/neomutt: Stabilize 20201127 amd64, #755833

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20201127.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index 0903176798d..f49ea4c191c 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-11-30 16:53 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-11-30 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     e373098c795d6d3a9b8ed5a17a5b94026af58388
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 16:53:18 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 16:53:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e373098c

Fix spelling in metadata

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index eca0e6b3489..f0b7a7e0338 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -20,11 +20,11 @@
 			backend for header caching</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
-		<flag name="pgp-classic">Build classic_pgp backend to support PGP/MIME
+		<flag name="pgp-classic">Build classic-pgp backend to support PGP/MIME
 			and traditional/inline PGP</flag>
 		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
 			traditional/inline PGP</flag>
-		<flag name="smime-classic">Build classic_smime backend to support
+		<flag name="smime-classic">Build classic-smime backend to support
 			S/MIME</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-11-27 15:34 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-11-27 15:34 UTC (permalink / raw
  To: gentoo-commits

commit:     7858677e87ae4ff2664abb878164eb832c7668c5
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 15:31:56 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 15:34:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7858677e

mail-client/neomutt: Version bump to 2020-11-27

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                                           | 1 +
 mail-client/neomutt/neomutt-20201120.ebuild                            | 2 +-
 .../neomutt/{neomutt-20201120.ebuild => neomutt-20201127.ebuild}       | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index cf2d5f972ca..4c190fd7299 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,4 +2,5 @@ DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f8
 DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
 DIST neomutt-20200925.tar.gz 3440056 BLAKE2B 6f9858a02bdfc8a947ba1a26557e1b5c0ec027845e67a15b6811853e5b8820b9a27419ced4eaa407ca9b32efcd53d7cf878c44c0a54a277018aef36127c49e59 SHA512 1ee89ee1b3581fe2b7dafd091e315fcf4d6f7b0644c15b08af8eb2720e83f07ae526b5659abb44430309821f48013fc85af0dd6f140729b2e52e5f874cf3bc50
 DIST neomutt-20201120.tar.gz 3456322 BLAKE2B c5735140a553e5e4ae8072cb79466b9c5d7e9f65df5de7b7823842676d3eb44660d31c0407bb8253e2857a39b31b4252c8c18815a25d964d26cb30e70d81c7c2 SHA512 31c0cbfdf2b772f61b4c9bce97c9a2ad9fffb6ae21e562522544ad94247dfaa530334d90bd550eae1efc2b94a467ed959e4abb79b14261da7092f146a2e08e11
+DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20201120.ebuild b/mail-client/neomutt/neomutt-20201120.ebuild
index d45bb541971..d25f26c5ada 100644
--- a/mail-client/neomutt/neomutt-20201120.ebuild
+++ b/mail-client/neomutt/neomutt-20201120.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75

diff --git a/mail-client/neomutt/neomutt-20201120.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
similarity index 98%
copy from mail-client/neomutt/neomutt-20201120.ebuild
copy to mail-client/neomutt/neomutt-20201127.ebuild
index d45bb541971..0903176798d 100644
--- a/mail-client/neomutt/neomutt-20201120.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -8,10 +8,9 @@ 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"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-11-23 17:49 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-11-23 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bff7b7f99b533258eb6c5094de4f415b03fceb53
Author:     Austin Ray <austin <AT> austinray <DOT> io>
AuthorDate: Mon Nov 23 05:08:02 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 17:48:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff7b7f9

mail-client/neomutt: fix live ebuild src dir

Commit e4ef3e09eaf dropped the assignment of "S", changing its value
from "${WORKDIR}/${PN}-${P}" to the default value of
"${WORKDIR}/${P}". However, the live ebuild still checkouts out source
code to previous location so portage says the source directory doesn't
exist.

This commit drops the custom checkout directory and uses the default
value provided, which corresponds to the default value of "S".

Closes: https://bugs.gentoo.org/756166

Signed-off-by: Austin Ray <austin <AT> austinray.io>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-99999999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index d25f26c5ada..0903176798d 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -8,7 +8,6 @@ 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 ~ppc64 ~x86"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-11-22 19:10 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-11-22 19:10 UTC (permalink / raw
  To: gentoo-commits

commit:     ff96f46db13467f8519afe3cd84c07f1e1a9940f
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 18:44:31 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 19:10:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff96f46d

mail-client/neomutt: Version bump to 20201120

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20201120.ebuild | 149 ++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 7337c9469ab..cf2d5f972ca 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1,5 @@
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
 DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
 DIST neomutt-20200925.tar.gz 3440056 BLAKE2B 6f9858a02bdfc8a947ba1a26557e1b5c0ec027845e67a15b6811853e5b8820b9a27419ced4eaa407ca9b32efcd53d7cf878c44c0a54a277018aef36127c49e59 SHA512 1ee89ee1b3581fe2b7dafd091e315fcf4d6f7b0644c15b08af8eb2720e83f07ae526b5659abb44430309821f48013fc85af0dd6f140729b2e52e5f874cf3bc50
+DIST neomutt-20201120.tar.gz 3456322 BLAKE2B c5735140a553e5e4ae8072cb79466b9c5d7e9f65df5de7b7823842676d3eb44660d31c0407bb8253e2857a39b31b4252c8c18815a25d964d26cb30e70d81c7c2 SHA512 31c0cbfdf2b772f61b4c9bce97c9a2ad9fffb6ae21e562522544ad94247dfaa530334d90bd550eae1efc2b94a467ed959e4abb79b14261da7092f146a2e08e11
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20201120.ebuild b/mail-client/neomutt/neomutt-20201120.ebuild
new file mode 100644
index 00000000000..d45bb541971
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20201120.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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-11-01 11:18 Georgy Yakovlev
  0 siblings, 0 replies; 129+ messages in thread
From: Georgy Yakovlev @ 2020-11-01 11:18 UTC (permalink / raw
  To: gentoo-commits

commit:     0328901050f219489ca70bba89d665e12fda035c
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 11:13:47 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 11:18:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03289010

mail-client/neomutt: sync live ebuild keywords

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 mail-client/neomutt/neomutt-99999999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index d45bb541971..d25f26c5ada 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-11-01 11:18 Georgy Yakovlev
  0 siblings, 0 replies; 129+ messages in thread
From: Georgy Yakovlev @ 2020-11-01 11:18 UTC (permalink / raw
  To: gentoo-commits

commit:     58bf450b19da2f2a11a09f0cb70aa1dbd7e10662
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 05:58:36 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 11:18:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58bf450b

mail-client/neomutt: add ~ppc64 keyword

SUCCESS: All unit tests have passed
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 mail-client/neomutt/neomutt-20200925.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20200925.ebuild b/mail-client/neomutt/neomutt-20200925.ebuild
index d45bb541971..d25f26c5ada 100644
--- a/mail-client/neomutt/neomutt-20200925.ebuild
+++ b/mail-client/neomutt/neomutt-20200925.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-09-25 14:46 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-09-25 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e4ef3e09eaff3575e918104c835ebded6e94b3fc
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 13:57:07 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 14:46:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ef3e09

mail-client/neomutt: Updated live ebuild

This change syncronizes the live ebuild with the latest release version
of neomutt. This includes the new tests.

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-99999999.ebuild | 65 +++++++++++++++++++----------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 7cfa7fbe26d..d45bb541971 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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,7 +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"
+	ssl tokyocabinet test"
 
 CDEPEND="
 	app-misc/mime-types
@@ -33,39 +36,44 @@ 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 )
 "
 
-S="${WORKDIR}/${PN}-${P}"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local myconf=(
@@ -92,29 +100,40 @@ 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
 
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
+	# 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 > doc/Makefile.fakedoc || die
+			Makefile > docs/Makefile.fakedoc || die
 		sed -n \
 			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
+			-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*


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-09-25 13:59 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-09-25 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     837fedab5b6d0832cdf26f75f9c1c865991e8e43
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 13:05:14 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 13:59:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=837fedab

mail-client/neomutt: version bump to 2020-09-25

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200925.ebuild | 149 ++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ae4fa4a23a4..7337c9469ab 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,4 @@
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
 DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
+DIST neomutt-20200925.tar.gz 3440056 BLAKE2B 6f9858a02bdfc8a947ba1a26557e1b5c0ec027845e67a15b6811853e5b8820b9a27419ced4eaa407ca9b32efcd53d7cf878c44c0a54a277018aef36127c49e59 SHA512 1ee89ee1b3581fe2b7dafd091e315fcf4d6f7b0644c15b08af8eb2720e83f07ae526b5659abb44430309821f48013fc85af0dd6f140729b2e52e5f874cf3bc50
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20200925.ebuild b/mail-client/neomutt/neomutt-20200925.ebuild
new file mode 100644
index 00000000000..d45bb541971
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200925.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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-08-26 11:45 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-08-26 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     73b2695d16c80a3bdb84e3edaf3289089ad7f60a
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 18:07:51 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 11:44:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b2695d

mail-client/neomutt: Add unit tests

This change addds unit tests to neomutt. Those tests come from a
separate repository.

Closes: https://bugs.gentoo.org/734122
Closes: https://bugs.gentoo.org/728886
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |  1 +
 mail-client/neomutt/neomutt-20200626-r1.ebuild | 51 +++++++++++++++++---------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 10ccd55623e..c00474b5dc0 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1 +1,2 @@
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
+DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20200626-r1.ebuild b/mail-client/neomutt/neomutt-20200626-r1.ebuild
index d07e9f9f684..d45bb541971 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
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-08-26 11:45 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-08-26 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2944d68e094359f913d142345201988a881786d3
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 20:51:14 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 11:44:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2944d68e

mail-client/neomutt: Version bump

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200821.ebuild | 149 ++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c00474b5dc0..ae4fa4a23a4 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,2 +1,3 @@
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
+DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3

diff --git a/mail-client/neomutt/neomutt-20200821.ebuild b/mail-client/neomutt/neomutt-20200821.ebuild
new file mode 100644
index 00000000000..d45bb541971
--- /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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-07-29  0:20 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2020-07-29  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     68fc4385c792dd15b53c29355943fd94e1ef801f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 00:19:28 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 00:19:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fc4385

mail-client/neomutt: security cleanup

Bug: https://bugs.gentoo.org/728302
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   3 -
 mail-client/neomutt/metadata.xml            |   4 -
 mail-client/neomutt/neomutt-20180716.ebuild | 130 ----------------------------
 mail-client/neomutt/neomutt-20200501.ebuild | 128 ---------------------------
 mail-client/neomutt/neomutt-20200619.ebuild | 128 ---------------------------
 5 files changed, 393 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 9aaa4419b40..10ccd55623e 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1 @@
-DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
-DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
-DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 1f7c112a0b2..eca0e6b3489 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -20,14 +20,10 @@
 			backend for header caching</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
-		<flag name="pgp_classic">Build classic_pgp backend to support 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="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
 			traditional/inline PGP</flag>
-		<flag name="smime_classic">Build classic_smime backend to support
-			S/MIME</flag>
 		<flag name="smime-classic">Build classic_smime backend to support
 			S/MIME</flag>
 	</use>

diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
deleted file mode 100644
index e29f859a066..00000000000
--- a/mail-client/neomutt/neomutt-20180716.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-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"
-
-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-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)"
-
-		"$(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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20200501.ebuild b/mail-client/neomutt/neomutt-20200501.ebuild
deleted file mode 100644
index 169bb2a3aa6..00000000000
--- a/mail-client/neomutt/neomutt-20200501.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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
-}

diff --git a/mail-client/neomutt/neomutt-20200619.ebuild b/mail-client/neomutt/neomutt-20200619.ebuild
deleted file mode 100644
index 169bb2a3aa6..00000000000
--- a/mail-client/neomutt/neomutt-20200619.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-07-27 22:25 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2020-07-27 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     7e30d676a05f25705b15b265aed4807e6f97f322
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 21:34:03 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 22:25:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e30d676

mail-client/neomutt: x86 stable (bug #728302)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20200626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20200626.ebuild b/mail-client/neomutt/neomutt-20200626.ebuild
index bcbc1fc4634..73acfc7fb6d 100644
--- a/mail-client/neomutt/neomutt-20200626.ebuild
+++ b/mail-client/neomutt/neomutt-20200626.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-07-27 21:15 Sam James
  0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2020-07-27 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3422c82f2137a0e25ec1d30583e725c81d5829a5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 21:14:03 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 21:14:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3422c82f

mail-client/neomutt: amd64 stable (bug #728302)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-client/neomutt/neomutt-20200626.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20200626.ebuild b/mail-client/neomutt/neomutt-20200626.ebuild
index 169bb2a3aa6..bcbc1fc4634 100644
--- a/mail-client/neomutt/neomutt-20200626.ebuild
+++ b/mail-client/neomutt/neomutt-20200626.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-07-27 19:51 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-07-27 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     91b07cdad4baf740d28423902536fa81d75100ab
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 19:48:22 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 19:51:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b07cda

mail-client/neomutt: Upgrade to EAPI 7

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-99999999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index ed9a77dec26..7cfa7fbe26d 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils flag-o-matic
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-07-27 19:51 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-07-27 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     8005d1631e0cfab528407180940052c18d69f3b2
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 19:20:57 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 19:51:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8005d163

mail-client/neomutt: Disable tests

Upstream split the unit tests out into a separate repository. Until this
neomutt-test-files repository is packaged, the unit tests in this
package will fail. This change disables the tests.

Bug: https://bugs.gentoo.org/734122
Bug: https://bugs.gentoo.org/734122
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20200626-r1.ebuild | 132 +++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/mail-client/neomutt/neomutt-20200626-r1.ebuild b/mail-client/neomutt/neomutt-20200626-r1.ebuild
new file mode 100644
index 00000000000..d07e9f9f684
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200626-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+# Disable tests until neomutt-test-files are avablae
+# (https://bugs.gentoo.org/734122)
+RESTRICT=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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-06-29 14:29 Thomas Deutschmann
  0 siblings, 0 replies; 129+ messages in thread
From: Thomas Deutschmann @ 2020-06-29 14:29 UTC (permalink / raw
  To: gentoo-commits

commit:     20afce9d3b77944662fb6233f2ecd118637cfcb5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 14:29:37 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 14:29:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20afce9d

mail-client/neomutt: fix Manifest

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/neomutt/Manifest | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5cec41c3de3..9aaa4419b40 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,8 +1,4 @@
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
-DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
-DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
-DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
-DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
 DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
 DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-06-29 13:25 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-06-29 13:25 UTC (permalink / raw
  To: gentoo-commits

commit:     2bedd92e93580c6fd313d9556ce95e99ddddd54e
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 13:24:28 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 13:24:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bedd92e

mail-client/neomutt: Remove old versions

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20200313.ebuild | 128 ----------------------------
 mail-client/neomutt/neomutt-20200320.ebuild | 128 ----------------------------
 mail-client/neomutt/neomutt-20200417.ebuild | 128 ----------------------------
 mail-client/neomutt/neomutt-20200424.ebuild | 128 ----------------------------
 4 files changed, 512 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20200313.ebuild b/mail-client/neomutt/neomutt-20200313.ebuild
deleted file mode 100644
index d195e95a243..00000000000
--- a/mail-client/neomutt/neomutt-20200313.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20200320.ebuild b/mail-client/neomutt/neomutt-20200320.ebuild
deleted file mode 100644
index d195e95a243..00000000000
--- a/mail-client/neomutt/neomutt-20200320.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20200417.ebuild b/mail-client/neomutt/neomutt-20200417.ebuild
deleted file mode 100644
index 169bb2a3aa6..00000000000
--- a/mail-client/neomutt/neomutt-20200417.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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
-}

diff --git a/mail-client/neomutt/neomutt-20200424.ebuild b/mail-client/neomutt/neomutt-20200424.ebuild
deleted file mode 100644
index 169bb2a3aa6..00000000000
--- a/mail-client/neomutt/neomutt-20200424.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-06-29 13:16 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-06-29 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     549b7eabbb596a00fdad0ea9d4f08836afc9a5fd
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 15:39:11 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 13:15:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549b7eab

mail-client/neomutt: Version bump to 2020-05-26

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200626.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index d9b05ed7aee..5cec41c3de3 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -5,3 +5,4 @@ DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b6
 DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
 DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
 DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4
+DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e

diff --git a/mail-client/neomutt/neomutt-20200626.ebuild b/mail-client/neomutt/neomutt-20200626.ebuild
new file mode 100644
index 00000000000..169bb2a3aa6
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200626.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-06-19 20:12 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-06-19 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     624336cc8ca4533d2b307dc340e9994c63e3cd62
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 19:57:52 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 20:08:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624336cc

mail-client/neomutt: Version bump to 2020-06-19

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200619.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 22fb59a9bda..d9b05ed7aee 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,3 +4,4 @@ DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb006
 DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
 DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
 DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670
+DIST neomutt-20200619.tar.gz 3347610 BLAKE2B bf8559b8847306c602759c857db3372aba714bf6762144d32af2c1e73703dab3a74c023d10f9389802c554ea7a7ca0591cbcfdff1d8ff685a791867e1125e275 SHA512 75d8f878776c57551f7b5fbbaaeb6bb671afe79f7f02a2e44deae40d4bb8a2db4520ae1b18f8e137ad574f401b591fdee5a1e8b2d78cfb71fa428c49418360f4

diff --git a/mail-client/neomutt/neomutt-20200619.ebuild b/mail-client/neomutt/neomutt-20200619.ebuild
new file mode 100644
index 00000000000..169bb2a3aa6
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200619.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-05-11 12:53 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-05-11 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     7067884a6df3dc75c66650f3fb6368dc413e3a79
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 12:53:02 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon May 11 12:53:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7067884a

mail-client/neomutt: Delete old versions

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   4 -
 mail-client/neomutt/neomutt-20191102.ebuild | 128 ----------------------------
 mail-client/neomutt/neomutt-20191111.ebuild | 128 ----------------------------
 mail-client/neomutt/neomutt-20191129.ebuild | 128 ----------------------------
 mail-client/neomutt/neomutt-20191207.ebuild | 128 ----------------------------
 5 files changed, 516 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c52e086fcf8..22fb59a9bda 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,8 +1,4 @@
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
-DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
-DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
-DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
-DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
 DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
 DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
 DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17

diff --git a/mail-client/neomutt/neomutt-20191102.ebuild b/mail-client/neomutt/neomutt-20191102.ebuild
deleted file mode 100644
index 2d262a02ac3..00000000000
--- a/mail-client/neomutt/neomutt-20191102.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20191111.ebuild b/mail-client/neomutt/neomutt-20191111.ebuild
deleted file mode 100644
index 2d262a02ac3..00000000000
--- a/mail-client/neomutt/neomutt-20191111.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20191129.ebuild b/mail-client/neomutt/neomutt-20191129.ebuild
deleted file mode 100644
index 2d262a02ac3..00000000000
--- a/mail-client/neomutt/neomutt-20191129.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20191207.ebuild b/mail-client/neomutt/neomutt-20191207.ebuild
deleted file mode 100644
index 2d262a02ac3..00000000000
--- a/mail-client/neomutt/neomutt-20191207.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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
-
-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"
-
-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-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 )
-"
-
-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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-05-01 23:45 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-05-01 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     80df53ea5a5fd883a86f5429d66ef68f5dae1ef2
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 23:43:55 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri May  1 23:45:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80df53ea

mail-client/neomutt: Version bump to 2020-05-01

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200501.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c770df32ab8..c52e086fcf8 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -7,3 +7,4 @@ DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e5
 DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
 DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
 DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9
+DIST neomutt-20200501.tar.gz 3324180 BLAKE2B 119e033082d76d942c7ce906df7f3ebd651ed586a25ce6bd1a57ba651b6a100188e9776c7565c6f7b5e3ab55198aaec5a7801622990840f22ab6e015bc107ef0 SHA512 795dd36920edc9e23c1b8f485f3e8c1cbf6128142887d81d7a991b9ce2dd052b3ac6b57e668f06236521a5d9c3acb6c26ab18fa27e32220f45f3eff4ca908670

diff --git a/mail-client/neomutt/neomutt-20200501.ebuild b/mail-client/neomutt/neomutt-20200501.ebuild
new file mode 100644
index 00000000000..169bb2a3aa6
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200501.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-04-26 11:55 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-04-26 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a93abc67591510c44aa09ed9ad32fa02265ae6de
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 11:38:48 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 11:55:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a93abc67

mail-client/neomutt: Version bump to 2020-04-24

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200424.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c0149711dca..c770df32ab8 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -6,3 +6,4 @@ DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2
 DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
 DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
 DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
+DIST neomutt-20200424.tar.gz 3323821 BLAKE2B a062e1fbf14890824b2545d10c9ca9725e0c170f8e2614fe2742a4d1c2a46c1d36495d34a8cd502520fd5e7f5f6f7c39dfea812784768a934cb4e718659a9142 SHA512 83569b304faf851a2efff332d237b0a35dc11b204740dbf828bfa662e157850b975536f25fd2a25057f16c128e9c9f0ca883df9c1d26e45c0608b424ec8d2ef9

diff --git a/mail-client/neomutt/neomutt-20200424.ebuild b/mail-client/neomutt/neomutt-20200424.ebuild
new file mode 100644
index 00000000000..169bb2a3aa6
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200424.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-04-25 13:22 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-04-25 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     12117d73a2b8823a6cac73f36816280c914a73f7
Author:     Christian Hagau <hagau <AT> ibr <DOT> cs <DOT> tu-bs <DOT> de>
AuthorDate: Fri Apr 24 00:00:00 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 13:20:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12117d73

mail-client/neomutt: Fix documentation directory name

NeoMutt has changed the name of the documentary directory from `doc`
to `docs`, see release notes:

https://github.com/neomutt/neomutt/releases/tag/20200417

Bug: https://bugs.gentoo.org/718650
Signed-off-by: Christian Hagau <ach <AT> hagau.se>
Package-Manager: Portage-2.3.99-r2
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20200417.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20200417.ebuild b/mail-client/neomutt/neomutt-20200417.ebuild
index d195e95a243..169bb2a3aa6 100644
--- a/mail-client/neomutt/neomutt-20200417.ebuild
+++ b/mail-client/neomutt/neomutt-20200417.ebuild
@@ -105,14 +105,14 @@ src_install() {
 			-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 > doc/Makefile.fakedoc || die
+			Makefile > docs/Makefile.fakedoc || die
 		sed -n \
 			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
+			-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*


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-04-20 11:44 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-04-20 11:44 UTC (permalink / raw
  To: gentoo-commits

commit:     fc7ebd6f0faafb588b9c561f9b8a1bfc5281b0a2
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 21:13:16 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 11:44:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7ebd6f

mail-client/neomutt: Version bump to 2020-04-17

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200417.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index e4ef61247f3..c0149711dca 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -5,3 +5,4 @@ DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d
 DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
 DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
 DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
+DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17

diff --git a/mail-client/neomutt/neomutt-20200417.ebuild b/mail-client/neomutt/neomutt-20200417.ebuild
new file mode 100644
index 00000000000..d195e95a243
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200417.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-03-20 14:06 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-03-20 14:06 UTC (permalink / raw
  To: gentoo-commits

commit:     bc8e80fbc38a9fc3dba025816c459f4e26c655d5
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 14:06:22 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 14:06:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8e80fb

mail-client/neomutt: Version bump to 2020-03-20

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200320.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index a9ab87e4dbe..e4ef61247f3 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,3 +4,4 @@ DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d7
 DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
 DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
 DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
+DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2

diff --git a/mail-client/neomutt/neomutt-20200320.ebuild b/mail-client/neomutt/neomutt-20200320.ebuild
new file mode 100644
index 00000000000..d195e95a243
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200320.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-03-13 17:15 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-03-13 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     3c7a8eed53c175b016c313ab6cfe1e812c2b0457
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:15:23 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:15:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7a8eed

mail-client/neomutt: Clean up of old versions

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   2 -
 mail-client/neomutt/metadata.xml               |   2 -
 mail-client/neomutt/neomutt-20180512.ebuild    | 145 -------------------------
 mail-client/neomutt/neomutt-20180622.ebuild    | 130 ----------------------
 mail-client/neomutt/neomutt-20180716-r1.ebuild | 130 ----------------------
 5 files changed, 409 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 4f4c6affe2d..a9ab87e4dbe 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-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
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 74d44a22800..1f7c112a0b2 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -24,10 +24,8 @@
 			and traditional/inline PGP</flag>
 		<flag name="pgp-classic">Build classic_pgp backend to support PGP/MIME
 			and traditional/inline PGP</flag>
-		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
 			traditional/inline PGP</flag>
-		<flag name="smime">Enable support for smime</flag>
 		<flag name="smime_classic">Build classic_smime backend to support
 			S/MIME</flag>
 		<flag name="smime-classic">Build classic_smime backend to support

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
deleted file mode 100644
index c746dd2fc3b..00000000000
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ /dev/null
@@ -1,145 +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://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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc 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-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
deleted file mode 100644
index 4d1742196c3..00000000000
--- a/mail-client/neomutt/neomutt-20180622.ebuild
+++ /dev/null
@@ -1,130 +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} =~ 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/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-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"
-
-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-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)"
-
-		"$(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)"
-	)
-
-	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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20180716-r1.ebuild b/mail-client/neomutt/neomutt-20180716-r1.ebuild
deleted file mode 100644
index 29a5fb64d01..00000000000
--- a/mail-client/neomutt/neomutt-20180716-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-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"
-
-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-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=(
-		"$(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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-03-13 17:12 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-03-13 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     813728643f8984d8cc3c715cccc531c0f476ff6e
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:11:40 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:11:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81372864

Revert "mail-client/neomutt: Clean up old versions"

This reverts commit b2f2cb86a721ea6d3c8b525b0ebede7cafa4d204.

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   3 +
 mail-client/neomutt/metadata.xml               |   6 +
 mail-client/neomutt/neomutt-20180512.ebuild    | 145 +++++++++++++++++++++++++
 mail-client/neomutt/neomutt-20180622.ebuild    | 130 ++++++++++++++++++++++
 mail-client/neomutt/neomutt-20180716-r1.ebuild | 130 ++++++++++++++++++++++
 mail-client/neomutt/neomutt-20180716.ebuild    | 130 ++++++++++++++++++++++
 6 files changed, 544 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 5bfce2ed6d9..4f4c6affe2d 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,6 @@
+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
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
 DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index eca0e6b3489..74d44a22800 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -20,10 +20,16 @@
 			backend for header caching</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
+		<flag name="pgp_classic">Build classic_pgp backend to support 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="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
 			traditional/inline PGP</flag>
+		<flag name="smime">Enable support for smime</flag>
+		<flag name="smime_classic">Build classic_smime backend to support
+			S/MIME</flag>
 		<flag name="smime-classic">Build classic_smime backend to support
 			S/MIME</flag>
 	</use>

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
new file mode 100644
index 00000000000..c746dd2fc3b
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -0,0 +1,145 @@
+# 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://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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc 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-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
new file mode 100644
index 00000000000..4d1742196c3
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180622.ebuild
@@ -0,0 +1,130 @@
+# 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} =~ 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/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+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"
+
+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-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)"
+
+		"$(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)"
+	)
+
+	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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}

diff --git a/mail-client/neomutt/neomutt-20180716-r1.ebuild b/mail-client/neomutt/neomutt-20180716-r1.ebuild
new file mode 100644
index 00000000000..29a5fb64d01
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180716-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+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"
+
+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-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=(
+		"$(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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}

diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
new file mode 100644
index 00000000000..e29f859a066
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+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"
+
+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-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)"
+
+		"$(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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-03-13 17:07 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-03-13 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b2f2cb86a721ea6d3c8b525b0ebede7cafa4d204
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:07:27 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:07:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f2cb86

mail-client/neomutt: Clean up old versions

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                   |   3 -
 mail-client/neomutt/metadata.xml               |   6 -
 mail-client/neomutt/neomutt-20180512.ebuild    | 145 -------------------------
 mail-client/neomutt/neomutt-20180622.ebuild    | 130 ----------------------
 mail-client/neomutt/neomutt-20180716-r1.ebuild | 130 ----------------------
 mail-client/neomutt/neomutt-20180716.ebuild    | 130 ----------------------
 6 files changed, 544 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 4f4c6affe2d..5bfce2ed6d9 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,3 @@
-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
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
 DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 74d44a22800..eca0e6b3489 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -20,16 +20,10 @@
 			backend for header caching</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
-		<flag name="pgp_classic">Build classic_pgp backend to support 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="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
 			traditional/inline PGP</flag>
-		<flag name="smime">Enable support for smime</flag>
-		<flag name="smime_classic">Build classic_smime backend to support
-			S/MIME</flag>
 		<flag name="smime-classic">Build classic_smime backend to support
 			S/MIME</flag>
 	</use>

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
deleted file mode 100644
index c746dd2fc3b..00000000000
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ /dev/null
@@ -1,145 +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://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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
-	fi
-
-	dodoc 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-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
deleted file mode 100644
index 4d1742196c3..00000000000
--- a/mail-client/neomutt/neomutt-20180622.ebuild
+++ /dev/null
@@ -1,130 +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} =~ 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/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-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"
-
-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-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)"
-
-		"$(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)"
-	)
-
-	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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20180716-r1.ebuild b/mail-client/neomutt/neomutt-20180716-r1.ebuild
deleted file mode 100644
index 29a5fb64d01..00000000000
--- a/mail-client/neomutt/neomutt-20180716-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-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"
-
-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-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=(
-		"$(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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}

diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
deleted file mode 100644
index e29f859a066..00000000000
--- a/mail-client/neomutt/neomutt-20180716.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-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/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-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"
-
-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-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)"
-
-		"$(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)"
-	)
-
-	econf CCACHE=none "${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 \
-			-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 > doc/Makefile.fakedoc || die
-		sed -n \
-			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2020-03-13 17:04 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2020-03-13 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     cd541d5cf9846812d3356aa5178da5d799876bba
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:04:11 2020 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:04:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd541d5c

mail-client/neomutt: Version bump to 20200313

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20200313.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index cefad2e88f4..4f4c6affe2d 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -5,3 +5,4 @@ DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
 DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
 DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
+DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116

diff --git a/mail-client/neomutt/neomutt-20200313.ebuild b/mail-client/neomutt/neomutt-20200313.ebuild
new file mode 100644
index 00000000000..d195e95a243
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200313.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-12-09 13:06 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-12-09 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     79ebe23225676cf165d1f03de355903c5de97c66
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 13:05:37 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 13:05:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ebe232

mail-client/neomutt: Version bump to 20191207

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20191207.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index b26c07ec01e..cefad2e88f4 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,3 +4,4 @@ DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
 DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
+DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1

diff --git a/mail-client/neomutt/neomutt-20191207.ebuild b/mail-client/neomutt/neomutt-20191207.ebuild
new file mode 100644
index 00000000000..2d262a02ac3
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20191207.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-11-29 21:26 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-11-29 21:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0e4ccaaf10022a7992b4f6fe205c48dc470cead4
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 29 19:24:09 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 21:26:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4ccaaf

mail-client/neomutt: Version bump to 20191129

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20191129.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 13d26f5ff0d..b26c07ec01e 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,3 +3,4 @@ DIST neomutt-20180622.tar.gz 2769280 BLAKE2B 57e708a0502d8de795a08150dd92c4b2a8b
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7
+DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d212fc7b74245f9bb493940be1aa3971433297ea748ba30cc79aa71eb2b86f37fd3b4d02540faf749d819377de1c47 SHA512 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d

diff --git a/mail-client/neomutt/neomutt-20191129.ebuild b/mail-client/neomutt/neomutt-20191129.ebuild
new file mode 100644
index 00000000000..2d262a02ac3
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20191129.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-11-11 12:38 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-11-11 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8815bb11b6f3246be8e381675c764610048a6ed2
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 12:38:20 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 12:38:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8815bb11

mail-client/neomutt: Version bump to 20191111

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20191111.ebuild | 128 ++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 953ccb33735..13d26f5ff0d 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,3 +2,4 @@ DIST neomutt-20180512.tar.gz 2758674 BLAKE2B 47a8d1fe5d5e2725a6ee868b937eea3807a
 DIST neomutt-20180622.tar.gz 2769280 BLAKE2B 57e708a0502d8de795a08150dd92c4b2a8ba9d0594102f4d4d4b183f29caad147e233586882ca68aa23df6e69b0c55345120ca40ddc9db80e76c734409ff5a3b SHA512 8085bf2bcf25ee4a4531cc5f950f862f58e3bf6ebfb96450479132ed60b4d87e35bc54f9b5e110d93dbd8e9684c1eceb36012753fc7bf5d3fb5046d9d42b69e0
 DIST neomutt-20180716.tar.gz 2778105 BLAKE2B b367407baf2187347971a0327a0c037861f648ebef12ce7b006b756bf60e696ff7a2c986848a9f15815aa95638dd5a3a90f47e97a9c0573950be8cdcc93b13ad SHA512 ee4093217cc1409262b96ab33ed78a38f5c6a72f62fcd7b25027f9373687ce67af8a4e1793b1d7d843bee5b4a7e0c69b30b3badf88a4e1a8fadd8b21441faaae
 DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
+DIST neomutt-20191111.tar.gz 3225507 BLAKE2B ce43a000b2807a45e4e21d667fd2c5259d751ce2ea3bb2cd3a7857f0f0fca3fb462d7179454d2da1736461e2d804bf6ecf61445768a049e053947d7821c60174 SHA512 cfc1e488b4f0938a26b9c3474d96827b00d97daa0406472e0f694897c286e6eea88e99b1a0cf6da0b7ba181d26ede4ad8ee0379d086eadc562ff1c3ab0dafaa7

diff --git a/mail-client/neomutt/neomutt-20191111.ebuild b/mail-client/neomutt/neomutt-20191111.ebuild
new file mode 100644
index 00000000000..2d262a02ac3
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20191111.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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
+
+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"
+
+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-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 )
+"
+
+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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-11-06  5:29 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-11-06  5:29 UTC (permalink / raw
  To: gentoo-commits

commit:     108e19f253346fed5a5b3b6f09f2b0323b643cd5
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 05:27:13 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 05:28:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108e19f2

mail-client/neomutt: Fix USE='doc'

Bug: 699166
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20180716-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20180716-r1.ebuild b/mail-client/neomutt/neomutt-20180716-r1.ebuild
index 760003ea050..29a5fb64d01 100644
--- a/mail-client/neomutt/neomutt-20180716-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20180716-r1.ebuild
@@ -69,7 +69,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 src_configure() {
 	local myconf=(
-		"$(use_enable doc)"
+		"$(usex doc --full-doc --disable-doc)"
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-11-06  3:13 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-11-06  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     89d3317fed3bb38a7fde4e45f769166fd373bfeb
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Nov  5 22:44:40 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 03:11:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d3317f

mail-client/neomutt: fix doc build

Also sync live ebuild with latest release.

Bug: https://bugs.gentoo.org/699158
Bug: https://bugs.gentoo.org/699166
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20191102.ebuild | 3 +--
 mail-client/neomutt/neomutt-99999999.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20191102.ebuild b/mail-client/neomutt/neomutt-20191102.ebuild
index cf65746042c..2d262a02ac3 100644
--- a/mail-client/neomutt/neomutt-20191102.ebuild
+++ b/mail-client/neomutt/neomutt-20191102.ebuild
@@ -67,8 +67,7 @@ RDEPEND="${CDEPEND}
 
 src_configure() {
 	local myconf=(
-		"$(use_enable doc)"
-		"$(usex doc --full-doc)"
+		"$(usex doc --full-doc --disable-doc)"
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index ffe83377317..ed9a77dec26 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	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"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -69,8 +69,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 src_configure() {
 	local myconf=(
-		"$(use_enable doc)"
-		"$(usex doc --full-doc)"
+		"$(usex doc --full-doc --disable-doc)"
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-11-02 15:04 Thomas Deutschmann
  0 siblings, 0 replies; 129+ messages in thread
From: Thomas Deutschmann @ 2019-11-02 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     bc401f8668da343a63970e8b8a4d55458302ab3e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 15:03:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 15:04:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc401f86

mail-client/neomutt: fix bad filename

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/neomutt/Manifest                | 2 +-
 mail-client/neomutt/neomutt-20191102.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 3346ff5f0b3..953ccb33735 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,4 +1,4 @@
-DIST 20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 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
+DIST neomutt-20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8

diff --git a/mail-client/neomutt/neomutt-20191102.ebuild b/mail-client/neomutt/neomutt-20191102.ebuild
index adc571a3be8..cf65746042c 100644
--- a/mail-client/neomutt/neomutt-20191102.ebuild
+++ b/mail-client/neomutt/neomutt-20191102.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	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"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-11-02 12:03 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-11-02 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f4d79241c6f3ad661ca98ee32e95cd185a625744
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  2 12:02:34 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 12:03:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d79241

mail-client/neomutt: Version bump to 20191102

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20191102.ebuild | 129 ++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 0fdc563bc43..3346ff5f0b3 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,4 @@
+DIST 20191102.tar.gz 3224856 BLAKE2B ff645bb0521f97e7935aef3e3b286643e30e78e10c6322b93da635cdba82496c3bc8f8b4b95fb4c197439bae3ddcfb5b207803900ab434e01b63e9989a5f2458 SHA512 fa4f488110560b25a4d208cf059c44bdfb514b4904964a0928f1491afc2b0d748fa7075d8465e066683f44a5741454b9c73391ecfe20842aae34f3848b9c0bc8
 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

diff --git a/mail-client/neomutt/neomutt-20191102.ebuild b/mail-client/neomutt/neomutt-20191102.ebuild
new file mode 100644
index 00000000000..adc571a3be8
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20191102.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+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"
+
+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-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 )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(usex doc --full-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)"
+	)
+
+	econf CCACHE=none "${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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-10-11 18:15 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-10-11 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9ac0d77b2b55cc4bd359c1953ff7bd6086f1c09d
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 18:14:15 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 18:14:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac0d77b

mail-client/neomutt: Dropping old versions

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/Manifest                |   2 -
 mail-client/neomutt/neomutt-20180223.ebuild | 140 ----------------------------
 mail-client/neomutt/neomutt-20180323.ebuild | 140 ----------------------------
 3 files changed, 282 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 299ac507030..0fdc563bc43 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-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

diff --git a/mail-client/neomutt/neomutt-20180223.ebuild b/mail-client/neomutt/neomutt-20180223.ebuild
deleted file mode 100644
index f90289f77c0..00000000000
--- 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 f90289f77c0..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-10-11 12:40 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2019-10-11 12:40 UTC (permalink / raw
  To: gentoo-commits

commit:     08b473805b893781ac1c63e4012bb82031779bd5
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Oct  8 09:46:19 2019 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 12:40:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b47380

mail-client/neomutt: fix configure with ccache

If you have dev-util/ccache installed but not FEATURES="ccache", neomutt's
configure process will detect and try to use it. You can override this
by setting an env var, CCACHE, to 'none' (and only that, see line 1132
or so of neomutt's source file auto.def).

Without this change, you will get the following sort of error:

>>> Configuring source in /tmp/portage/mail-client/neomutt-20180716/work/neomutt-neomutt-20180716 ...
./configure --prefix=/usr --build=x86_64-pc-linux-gnu ....
Host System...x86_64-pc-linux-gnu
Note: defaultprefix is deprecated. Use options-defaults to set default options
Build System...x86_64-pc-linux-gnu
C compiler...ccache x86_64-pc-linux-gnu-gcc -O2 -pipe -march=znver1
C++ compiler...ccache x86_64-pc-linux-gnu-c++ -O2 -pipe -march=znver1
Build C compiler...cc
 * ACCESS DENIED:  utimes:       /var/cache/ccache

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 mail-client/neomutt/neomutt-20180716.ebuild | 4 ++--
 mail-client/neomutt/neomutt-99999999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
index ccd0f97bec9..e29f859a066 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 4d1742196c3..e97f8da78b1 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() {


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2019-08-11  8:45 Michał Górny
  0 siblings, 0 replies; 129+ messages in thread
From: Michał Górny @ 2019-08-11  8:45 UTC (permalink / raw
  To: gentoo-commits

commit:     53e7d1834a45700f789bf85ef620eb3cdbd3b868
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 08:43:09 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 08:45:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e7d183

mail-client/neomutt: Remove duplicated global flag desc

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 mail-client/neomutt/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 380ec81eb0c..da60d27c6a6 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -20,8 +20,6 @@
 			backend for header caching</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
-		<flag name="crypt">Add support for encryption -- using mcrypt or gpg
-			where applicable</flag>
 		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
 			and traditional/inline PGP</flag>
 		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-10-07  0:10 Mikle Kolyada
  0 siblings, 0 replies; 129+ messages in thread
From: Mikle Kolyada @ 2018-10-07  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     ea633147500696b7cf6a68ad22e3e3b49a9a2394
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 00:10:35 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 00:10:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea633147

mail-client/neomutt: amd64 stable wrt bug #661436

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 mail-client/neomutt/neomutt-20180716.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
index 7e69a8e0e6e..ccd0f97bec9 100644
--- a/mail-client/neomutt/neomutt-20180716.ebuild
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-10-06 23:05 Thomas Deutschmann
  0 siblings, 0 replies; 129+ messages in thread
From: Thomas Deutschmann @ 2018-10-06 23:05 UTC (permalink / raw
  To: gentoo-commits

commit:     4aefb57ad7fa54a528f43477dc8783236bf04f9c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 23:02:58 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 23:04:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aefb57a

mail-client/neomutt: x86 stable (bug #661436)

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 mail-client/neomutt/neomutt-20180716.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20180716.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
index 4d1742196c3..7e69a8e0e6e 100644
--- a/mail-client/neomutt/neomutt-20180716.ebuild
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-07-24 17:42 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-07-24 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     48cf6e50fb4110af35e16e997026e7d87e363074
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 24 17:32:34 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Jul 24 17:40:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cf6e50

mail-client/neomutt: Version bump to neomutt-20180716

Also fix slot warning for libidn

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/Manifest                                            | 1 +
 mail-client/neomutt/neomutt-20180512.ebuild                             | 2 +-
 mail-client/neomutt/neomutt-20180622.ebuild                             | 2 +-
 .../neomutt/{neomutt-20180622.ebuild => neomutt-20180716.ebuild}        | 2 +-
 mail-client/neomutt/neomutt-99999999.ebuild                             | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 9a706e2e898..299ac507030 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,3 +2,4 @@ DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb9
 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

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
index fd8061623df..c746dd2fc3b 100644
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 	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 )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )

diff --git a/mail-client/neomutt/neomutt-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
index fb8ad83183d..4d1742196c3 100644
--- a/mail-client/neomutt/neomutt-20180622.ebuild
+++ b/mail-client/neomutt/neomutt-20180622.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )

diff --git a/mail-client/neomutt/neomutt-20180622.ebuild b/mail-client/neomutt/neomutt-20180716.ebuild
similarity index 99%
copy from mail-client/neomutt/neomutt-20180622.ebuild
copy to mail-client/neomutt/neomutt-20180716.ebuild
index fb8ad83183d..4d1742196c3 100644
--- a/mail-client/neomutt/neomutt-20180622.ebuild
+++ b/mail-client/neomutt/neomutt-20180716.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index fb8ad83183d..4d1742196c3 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
 	gpgme? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-23 18:09 Mikle Kolyada
  0 siblings, 0 replies; 129+ messages in thread
From: Mikle Kolyada @ 2018-06-23 18:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1c9a0a350afd103f9ca9492877a1cec0899f5204
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 18:09:44 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 18:09:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9a0a35

mail-client/neomutt: amd64 stable wrt bug #658628

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/neomutt-20180512.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
index 45c87850f70..d0bd359058b 100644
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} =~ 9999$ ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-22 14:52 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-22 14:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3f43ca9fcace32a8dd2453f8dd8a79bd8ec57d22
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 14:51:24 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 14:51:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f43ca9f

mail-client/neomutt: Version bump neomutt-20180622

Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20180622.ebuild | 130 ++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index e29fcdc99e5..9a706e2e898 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/mail-client/neomutt/neomutt-20180622.ebuild b/mail-client/neomutt/neomutt-20180622.ebuild
new file mode 100644
index 00000000000..fb8ad83183d
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180622.ebuild
@@ -0,0 +1,130 @@
+# 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} =~ 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/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+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"
+
+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-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)"
+
+		"$(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)"
+	)
+
+	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 \
+			-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 > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-06 12:02 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-06 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     49d7bdcace556b77c47d7f4af237288046a8d94f
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 12:02:30 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 12:02:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d7bdca

mail-client/neomutt: Remove old versions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/Manifest                   |   2 -
 mail-client/neomutt/neomutt-20171208.ebuild    | 129 -----------------------
 mail-client/neomutt/neomutt-20171215-r1.ebuild | 133 -----------------------
 mail-client/neomutt/neomutt-20171215-r2.ebuild | 140 -------------------------
 mail-client/neomutt/neomutt-20171215.ebuild    | 121 ---------------------
 5 files changed, 525 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 11f9f8199de..e29fcdc99e5 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
-DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
 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

diff --git a/mail-client/neomutt/neomutt-20171208.ebuild b/mail-client/neomutt/neomutt-20171208.ebuild
deleted file mode 100644
index 406bc5c0cc7..00000000000
--- a/mail-client/neomutt/neomutt-20171208.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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-4:= )
-	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}
-	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_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable gpgme)"
-		"$(use_enable nls)"
-		"$(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 kyotocabinet)"
-		"$(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}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	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."
-}

diff --git a/mail-client/neomutt/neomutt-20171215-r1.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
deleted file mode 100644
index e5725c95563..00000000000
--- a/mail-client/neomutt/neomutt-20171215-r1.ebuild
+++ /dev/null
@@ -1,133 +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-4:= )
-	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-20171215-r2.ebuild b/mail-client/neomutt/neomutt-20171215-r2.ebuild
deleted file mode 100644
index f90289f77c0..00000000000
--- a/mail-client/neomutt/neomutt-20171215-r2.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-20171215.ebuild b/mail-client/neomutt/neomutt-20171215.ebuild
deleted file mode 100644
index 3741c7d074e..00000000000
--- a/mail-client/neomutt/neomutt-20171215.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 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-4:= )
-	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
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-	doman doc/*.{1,5}
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-06 12:01 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-06 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bc106dfb53a99bd56cf0785f2ecd79d0f93db6d9
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 12:00:58 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 12:01:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc106dfb

mail-client/neomutt: Deprecate old crypt USE flags

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/neomutt-99999999.ebuild | 37 +++++++++--------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 6d374739048..fb8ad83183d 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -19,9 +19,9 @@ HOMEPAGE="https://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"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic
+	ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types
@@ -40,7 +40,6 @@ CDEPEND="
 	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 )
@@ -74,14 +73,9 @@ src_configure() {
 		"$(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"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp_classic pgp)"
+		"$(use_enable smime_classic smime)"
 
 		# Database backends.
 		"$(use_enable berkdb bdb)"
@@ -127,19 +121,10 @@ src_install() {
 }
 
 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
+	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
 }


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-06 11:47 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-06 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     d87c0fb84fc0671cba4d1495c5ecb236099aecb3
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 11:45:07 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 11:46:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87c0fb8

mail-client/neomutt: Fix build with '-doc'

Closes-Bug: https://bugs.gentoo.org/657282
Closes-Bug: https://bugs.gentoo.org/657384
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/neomutt-20180512.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
index 9fd8d9c635b..45c87850f70 100644
--- a/mail-client/neomutt/neomutt-20180512.ebuild
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -109,12 +109,17 @@ src_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' \
+		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 > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
 			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
 		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-06 11:47 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-06 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     2680e651188945c163c83d51a139dce5ead24479
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 11:43:15 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 11:46:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2680e651

mail-client/neomutt: Fix build with '-doc'

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/neomutt-99999999.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index bc3743bad24..6d374739048 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -109,12 +109,17 @@ src_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' \
+		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 > doc/Makefile.fakedoc || die
-		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
 			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
-		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
 		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-06 11:47 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-06 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     80cba04d1c07d07a2e9e1e91d960fe50dd2b556c
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  5 12:46:43 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 11:46:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cba04d

mail-client/neomutt: Fix live ebuild version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/neomutt-99999999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 9fd8d9c635b..bc3743bad24 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils flag-o-matic
 
-if [[ ${PV} =~ 9999$ ]]; then
+if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-04 15:18 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-04 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9edf9db20560cddb4920a6989b287efcc7db01fd
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  4 15:17:19 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Jun  4 15:17:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edf9db2

mail-client/neomutt: Fix webpage

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/neomutt-99999999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index f90289f77c0..9fd8d9c635b 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
+HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -118,7 +118,7 @@ src_install() {
 		doman doc/neomutt.1 doc/neomuttrc.5
 	fi
 
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+	dodoc LICENSE* ChangeLog* README*
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-06-03 14:00 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-06-03 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     f9186095d3a821cd618fab8a493faeb5353b5bcc
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 13:59:45 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 14:00:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9186095

mail-client/neomutt: Version bump to neomutt-20180512

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20180512.ebuild | 140 ++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index baa000cbc29..11f9f8199de 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,3 +2,4 @@ DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938cec
 DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
 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

diff --git a/mail-client/neomutt/neomutt-20180512.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
new file mode 100644
index 00000000000..9fd8d9c635b
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -0,0 +1,140 @@
+# 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://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 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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-04-04 22:17 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-04-04 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4bf6c2fec88af9e8ed9e380733eccb02b66d17e3
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 22:15:49 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 22:16:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf6c2fe

mail-client/neomutt: Bump live ebuild version

On unstable systems (or once a regular version of neomutt is made
stable) the live ebuild version of '9999' will not be the latest version
and a user will not be able to easily install the live ebuild. This
change renames it to `99999999`.

Thanks to contact <AT> ryper.org for pointing this out!

Closes: https://bugs.gentoo.org/650434
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-client/neomutt/{neomutt-9999.ebuild => neomutt-99999999.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
similarity index 100%
rename from mail-client/neomutt/neomutt-9999.ebuild
rename to mail-client/neomutt/neomutt-99999999.ebuild


^ permalink raw reply	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-04-03 13:39 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-04-03 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     3444edbc3659ad58974e96d932efc6a83e5f2883
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 13:38:27 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 13:39:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3444edbc

mail-client/neomutt: Version bump neomutt-20180323

Closes: https://bugs.gentoo.org/651656
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20180323.ebuild | 140 ++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 477a606c217..baa000cbc29 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,4 @@
 DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
 DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
 DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc
+DIST neomutt-20180323.tar.gz 2650465 BLAKE2B 59f11208320e514119e60f6c85a876fed2693b9eae3127fc3fa5a35722a80dfd99b0c6b5a5074711d42b35d459e70f4dda3d29e7358e1d95d5d0d350438290d5 SHA512 997c697300768809823b8d8588c93003c6cd7fcc6cbe7ce524096033e91c618119f78c697ccd15b4c93751b3156d50e611974e8f8b332efb467c031385e9f819

diff --git a/mail-client/neomutt/neomutt-20180323.ebuild b/mail-client/neomutt/neomutt-20180323.ebuild
new file mode 100644
index 00000000000..f90289f77c0
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180323.ebuild
@@ -0,0 +1,140 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-02-23 12:34 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-02-23 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     dbc6a25d93b34765dfa06fa0ab32e1b25541be87
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 12:34:16 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 12:34:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc6a25d

mail-client/neomutt: Remove old versions

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 mail-client/neomutt/Manifest                |   3 -
 mail-client/neomutt/neomutt-20171006.ebuild | 112 ----------------------------
 mail-client/neomutt/neomutt-20171013.ebuild | 111 ---------------------------
 mail-client/neomutt/neomutt-20171027.ebuild | 111 ---------------------------
 4 files changed, 337 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index bc80149ff37..477a606c217 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,3 @@
-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
 DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
 DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
 DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc

diff --git a/mail-client/neomutt/neomutt-20171006.ebuild b/mail-client/neomutt/neomutt-20171006.ebuild
deleted file mode 100644
index ca3bddeaefa..00000000000
--- a/mail-client/neomutt/neomutt-20171006.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-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"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	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 )
-	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}
-	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_prepare() {
-	eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
-	eapply_user
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(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)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}

diff --git a/mail-client/neomutt/neomutt-20171013.ebuild b/mail-client/neomutt/neomutt-20171013.ebuild
deleted file mode 100644
index 12809218907..00000000000
--- a/mail-client/neomutt/neomutt-20171013.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-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"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	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 )
-	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}
-	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_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(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)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}

diff --git a/mail-client/neomutt/neomutt-20171027.ebuild b/mail-client/neomutt/neomutt-20171027.ebuild
deleted file mode 100644
index 12809218907..00000000000
--- a/mail-client/neomutt/neomutt-20171027.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-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"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	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 )
-	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}
-	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_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(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)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-01-24 21:53 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-01-24 21:53 UTC (permalink / raw
  To: gentoo-commits

commit:     1b651e9cbd832a9ef990761e73e6c2cc0c990fcc
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 21:51:51 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 21:52:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b651e9c

mail-client/neomutt: Fix berkdb slots

The generic DEPEND on berkdb can lead to build failures for
`berkdb:6.0`. Upstream specifies specific versions [1] and this change
translates these versions into a more specific DEPEND.

[1] https://github.com/neomutt/neomutt/blob/ae61285/auto.def#L630

Co-Authored-By: Floyd Anderson <bts+gentoo <AT> 31c0.net>
Closes: https://bugs.gentoo.org/642692
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../neomutt/{neomutt-9999.ebuild => neomutt-20171215-r2.ebuild}  | 9 ++++++++-
 mail-client/neomutt/neomutt-9999.ebuild                          | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-20171215-r2.ebuild
similarity index 97%
copy from mail-client/neomutt/neomutt-9999.ebuild
copy to mail-client/neomutt/neomutt-20171215-r2.ebuild
index e5725c95563..f90289f77c0 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-20171215-r2.ebuild
@@ -25,7 +25,14 @@ IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
 
 CDEPEND="
 	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
+	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 )

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index e5725c95563..f90289f77c0 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -25,7 +25,14 @@ IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
 
 CDEPEND="
 	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
+	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 )


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-01-24 21:40 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-01-24 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bab3d07d9e7e9a3d4abe6b71c56bc61d5547f077
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 21:39:32 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 21:39:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab3d07d

mail-client/neomutt: Fix fake man pages

This change restores and updates the old 'fake manpage' code when
neomutt is built without the `doc` USE flag.

Co-Authored-By: Floyd Anderson <bts+gentoo <AT> 31c0.net>
Closes: https://bugs.gentoo.org/645520
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...omutt-9999.ebuild => neomutt-20171215-r1.ebuild} | 21 ++++++++++-----------
 mail-client/neomutt/neomutt-9999.ebuild             | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
similarity index 86%
copy from mail-client/neomutt/neomutt-9999.ebuild
copy to mail-client/neomutt/neomutt-20171215-r1.ebuild
index 7b36a57de36..e5725c95563 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-20171215-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -99,17 +99,16 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A man-page is always handy, so fake one
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
 	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
+		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*

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 7b36a57de36..e5725c95563 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -99,17 +99,16 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A man-page is always handy, so fake one
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
 	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
+		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*


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2018-01-03 13:07 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2018-01-03 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     3b0a7b59fd909fe09d423d36154ea1644567dfc0
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 13:06:52 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 13:07:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0a7b59

mail-client/neomutt: Remove old versions

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/Manifest                |   2 -
 mail-client/neomutt/neomutt-20170714.ebuild | 114 ----------------------------
 mail-client/neomutt/neomutt-20170912.ebuild | 114 ----------------------------
 3 files changed, 230 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 097971d4984..089703f9b08 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-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

diff --git a/mail-client/neomutt/neomutt-20170714.ebuild b/mail-client/neomutt/neomutt-20170714.ebuild
deleted file mode 100644
index 2062717e96f..00000000000
--- a/mail-client/neomutt/neomutt-20170714.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-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"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	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 )
-	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}
-	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_prepare() {
-	eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
-	eapply_user
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(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)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types || die
-	dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
-
-	## A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT ChangeLog* OPS* README*
-}

diff --git a/mail-client/neomutt/neomutt-20170912.ebuild b/mail-client/neomutt/neomutt-20170912.ebuild
deleted file mode 100644
index 0087782c35a..00000000000
--- a/mail-client/neomutt/neomutt-20170912.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-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"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	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 )
-	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}
-	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_prepare() {
-	eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
-	eapply_user
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(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)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types || die
-	dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc muttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > neomutt.1 || die
-		cp doc/muttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-27 13:11 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-27 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f87fe616ab11bfb005996763714c9617dad94a14
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 12:40:19 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 13:11:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87fe616

mail-client/neomutt: Build man pages unconditionally

Man pages are built without additional dependencies.

Closes: https://bugs.gentoo.org/641132
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-20171215.ebuild | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20171215.ebuild b/mail-client/neomutt/neomutt-20171215.ebuild
index 7b36a57de36..3741c7d074e 100644
--- a/mail-client/neomutt/neomutt-20171215.ebuild
+++ b/mail-client/neomutt/neomutt-20171215.ebuild
@@ -98,21 +98,8 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
 	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+	doman doc/*.{1,5}
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-15 12:24 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-15 12:24 UTC (permalink / raw
  To: gentoo-commits

commit:     62cee3ac7408a72781c677a4c0dc63e15880b3a6
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 12:24:29 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 12:24:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62cee3ac

mail-client/neomutt: Version bump to neomutt-20171215

Starting with this release, upstream deprecated the `autotools` build
system and replaced it with one based on `autosetup`. This change
introduces a build dependency (dev-lang/tcl) and changes a few arguments
from `--with` to `--enable`.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20171215.ebuild | 134 ++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 0737e744af0..097971d4984 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -4,3 +4,4 @@ DIST neomutt-20171006.tar.gz 2706019 BLAKE2B b16f065fd1c5b829c6b73614c42e5353b96
 DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e98700c2b3c11dcce7b9cdf132a755403ed1b54216426736c1dde78c580320ebac4fbb6e3ca6f92abc1c1e6d1e4fd1b SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac
 DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894
 DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
+DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658

diff --git a/mail-client/neomutt/neomutt-20171215.ebuild b/mail-client/neomutt/neomutt-20171215.ebuild
new file mode 100644
index 00000000000..7b36a57de36
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171215.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 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-4:= )
+	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
+	if use !doc; then
+		emake -C doc neomuttrc.man
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/neomutt.man > neomutt.1 || die
+		cp doc/neomuttrc.man neomuttrc.5 || die
+		doman neomutt.1 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
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-14 13:56 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-14 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3c62d9ebc31c56c049cbcbe29ad491b9e5454df9
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 13:47:40 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 13:55:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c62d9eb

mail-client/neomutt: Update crypto USE flags

During the transition period between the old and the new crypto related
flags, the neomutt package needs to support both sets. Currently the
ebuild emits crypto '--enable' flags twice, with the second flag
overriding the first. This can lead to unwanted settings. This change
adds some logic around those flags to emit the configure option only
once.

Related: https://bugs.gentoo.org/640824

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-9999.ebuild | 46 +++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 8496d18ad8c..7b36a57de36 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -64,23 +64,29 @@ S="${WORKDIR}/${PN}-${P}"
 src_configure() {
 	local myconf=(
 		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable gpgme)"
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
-		"$(use_enable crypt pgp)"
-		"$(use_enable pgp_classic pgp)"
-		"$(use_enable smime)"
-		"$(use_enable smime_classic smime)"
+
+		# 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 kyotocabinet)"
 		"$(use_enable lmdb)"
-		"$(use_enable qdbm)"
 		"$(use_enable sasl)"
-		"$(use_enable tokyocabinet)"
 		"--with-ui=$(usex slang slang ncurses)"
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
 		"$(use_enable ssl)"
@@ -110,11 +116,19 @@ src_install() {
 }
 
 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."
+	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
 }


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-13 15:50 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-13 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     68bd2d23c82a811bf9d1161bfd8690a2b532cad7
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 15:49:11 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 15:50:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68bd2d23

mail-client/neomutt: Switch build system

Upstream changed the build system from autotools to autosetup [1]. The
new build system requires Tcl at configure time and this change adds
this dependency. The configuration option syntax for `--with` flags
without arguments has changed to `--enable` flags. This change updates
the relevant flags.

[1] https://msteveb.github.io/autosetup/

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-9999.ebuild | 37 +++++++++++++--------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 406bc5c0cc7..8496d18ad8c 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic
+inherit eutils flag-o-matic
 
 if [[ ${PV} =~ 9999$ ]]; then
 	inherit git-r3
@@ -47,6 +47,7 @@ CDEPEND="
 	)
 "
 DEPEND="${CDEPEND}
+	dev-lang/tcl
 	net-mail/mailbase
 	doc? (
 		dev-libs/libxml2
@@ -60,11 +61,6 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${PN}-${P}"
 
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
 src_configure() {
 	local myconf=(
 		"$(use_enable doc)"
@@ -76,26 +72,21 @@ src_configure() {
 		"$(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 kyotocabinet)"
-		"$(use_with lmdb)"
-		"$(use_with qdbm)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
-		"--with-$(usex slang slang curses)"
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable lmdb)"
+		"$(use_enable qdbm)"
+		"$(use_enable sasl)"
+		"$(use_enable tokyocabinet)"
+		"--with-ui=$(usex slang slang ncurses)"
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
 	)
 
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
 	econf "${myconf[@]}"
 }
 


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-09 13:29 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-09 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c1d7d7de94aea9f6202473c789c6c2a9422f71aa
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 13:28:42 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 13:28:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d7d7de

mail-client/neomutt: Version bump to neomutt-20121208

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20171208.ebuild | 129 ++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 9cc35ec6fea..0737e744af0 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,3 +3,4 @@ DIST neomutt-20170912.tar.gz 2533245 BLAKE2B fde5690d2f80b0ef55ddc753487905130b1
 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
+DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671

diff --git a/mail-client/neomutt/neomutt-20171208.ebuild b/mail-client/neomutt/neomutt-20171208.ebuild
new file mode 100644
index 00000000000..406bc5c0cc7
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171208.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools 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-4:= )
+	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}
+	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_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable gpgme)"
+		"$(use_enable nls)"
+		"$(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 kyotocabinet)"
+		"$(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}"
+	)
+
+	if use gnutls; then
+		myconf+=( "--with-gnutls" )
+	elif use ssl; then
+		myconf+=( "--with-ssl" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc neomuttrc.man
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/neomutt.man > neomutt.1 || die
+		cp doc/neomuttrc.man neomuttrc.5 || die
+		doman neomutt.1 neomuttrc.5
+	fi
+
+	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."
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-03 17:39 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-03 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     1d131b5cfdf3e61879359dbae554b8d5b55ea3e8
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 17:39:11 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 17:39:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d131b5c

mail-client/neomutt: Updated metadata.xml

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/metadata.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 9810e2b8319..380ec81eb0c 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -10,7 +10,6 @@
 			caching</flag>
 		<flag name="gdbm">Enable GDBM (GNU dbm) backend for header
 			caching</flag>
-		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="kyotocabinet">Enable Kyoto Cabinet database backend for
 			header caching</flag>
 		<flag name="lmdb">Enable LMDB (Lightning Memory-Mapped Database)
@@ -19,13 +18,16 @@
 			<pkg>net-mail/notmuch</pkg></flag>
 		<flag name="qdbm">Enable QDBM (Quicker Database Manager) database
 			backend for header caching</flag>
-		<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="crypt">Add support for encryption -- using mcrypt or gpg
+			where applicable</flag>
 		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
 			and traditional/inline PGP</flag>
+		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+			traditional/inline PGP</flag>
+		<flag name="smime">Enable support for smime</flag>
 		<flag name="smime_classic">Build classic_smime backend to support
 			S/MIME</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-03 16:31 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-03 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     07a873bc4aa93329802366bcb7d97ca10d6f034a
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 16:28:28 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 16:29:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a873bc

mail-client/neomutt: Workaround Bug 614746

Currently a conditional in the ebuild such as

    if [[ ${PV} =~ 9999$ ]]

is not recognized by `ekeyword` [1]. A workaround is to omit the
`KEYWORDS` assignment in the live ebuild branch.

[1] https://bugs.gentoo.org/614746

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 8a0f8bb25dd..406bc5c0cc7 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -5,11 +5,10 @@ EAPI=6
 
 inherit autotools eutils flag-o-matic
 
-if (( ${PV} == 9999 )); then
+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"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-03 13:41 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-03 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c1b51a267ca87d73bb37216fe1059fa4dc6dce93
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 13:41:06 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 13:41:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b51a26

mail-client/neomutt: Add warning about changed USE flags

As part of https://bugs.gentoo.org/637176 the crypto related USE flags
were renamed. This change adds a warning to the user that this has
happened. The old flags are still usable, but their use is deprecated
and will be removed at some point.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-9999.ebuild | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 3460d474743..8a0f8bb25dd 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -20,9 +20,9 @@ HOMEPAGE="https://www.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"
+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
@@ -34,6 +34,7 @@ CDEPEND="
 	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 )
@@ -68,10 +69,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
 		"$(use_enable gpgme)"
 		"$(use_enable nls)"
 		"$(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)"
@@ -114,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."
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-03 13:41 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-03 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     369b412939658cb6bf25464909c91c563ae9a3df
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 13:27:21 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 13:41:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=369b4129

mail-client/neomutt: Make ebuild more generic

This change introduces a check on the package version so that the same
ebuild can be used for live and versioned ebuilds.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-9999.ebuild | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 6832f903c17..3460d474743 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -3,19 +3,25 @@
 
 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 debug doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
-	lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls
+	notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl
 	tokyocabinet"
 
 CDEPEND="
@@ -61,7 +67,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		"$(use_enable debug)"
 		"$(use_enable doc)"
 		"$(use_enable gpgme)"
 		"$(use_enable nls)"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-12-02 14:29 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-12-02 14:29 UTC (permalink / raw
  To: gentoo-commits

commit:     466c3f1ed6f5219aa8f47c516be5cdd415f8a327
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 14:28:37 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 14:29:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466c3f1e

mail-client/neomutt: Update crypto USE flags

Rename the crypto USE flags to make their naming more consistent and
clearer to the user.

Co-Authored-By: brunoboclair <AT> fake-box.com
Closes: https://bugs.gentoo.org/637176
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/Manifest            | 10 +++++-----
 mail-client/neomutt/metadata.xml        |  6 ++++++
 mail-client/neomutt/neomutt-9999.ebuild | 23 ++++++++++++-----------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c48e9eef74e..9cc35ec6fea 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,5 @@
-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

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2cce62e661b..9810e2b8319 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 5dc34a207c8..6832f903c17 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -14,8 +14,9 @@ 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 debug doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl
+	tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types
@@ -27,7 +28,7 @@ CDEPEND="
 	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 )
@@ -60,22 +61,22 @@ 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 pgp_classic pgp)"
+		"$(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}"


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-11-20 12:42 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-11-20 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     c4f4c00acb50088dc113f19d2f51f9fd4db6ee00
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 12:39:32 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 12:41:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f4c00a

mail-client/neomutt: Description of USE flags

The database backend use flags have inconsistent descriptions. They are
all used for header caches and the descriptions should say so.

Closes: https://bugs.gentoo.org/637264
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/metadata.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2a3defe32d4..2cce62e661b 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -6,13 +6,21 @@
 		<name>Nicolas Bock</name>
 	</maintainer>
 	<use>
-		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
-		<flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
-		<flag name="smime">Enable support for smime</flag>
-		<flag name="tokyocabinet">Enable tokyocabinet database backend for header
+		<flag name="berkdb">Enable BDB (Berkley DB) backend for header
 			caching</flag>
-		<flag name="kyotocabinet">Enable kyotocabinet database backend for header
+		<flag name="gdbm">Enable GDBM (GNU dbm) backend for header
 			caching</flag>
-		<flag name="lmdb">Enable LMDB backend for header caching</flag>
+		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="kyotocabinet">Enable Kyoto Cabinet database backend for
+			header caching</flag>
+		<flag name="lmdb">Enable LMDB (Lightning Memory-Mapped Database)
+			backend for header caching</flag>
+		<flag name="notmuch">Enable support for
+			<pkg>net-mail/notmuch</pkg></flag>
+		<flag name="qdbm">Enable QDBM (Quicker Database Manager) database
+			backend for header caching</flag>
+		<flag name="smime">Enable support for smime</flag>
+		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
+			header caching</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-11-20 12:22 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-11-20 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1c48ce94e4b998234e046151d7e39171c1aa2b7d
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 12:21:09 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 12:22:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c48ce94

mail-client/neomutt: Remove obsolete USE flag

The USE flag 'symlink' is not used by the ebuild. Remove it.

Closes: https://bugs.gentoo.org/637174

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 mail-client/neomutt/neomutt-20170714.ebuild | 3 +--
 mail-client/neomutt/neomutt-20170912.ebuild | 3 +--
 mail-client/neomutt/neomutt-20171006.ebuild | 3 +--
 mail-client/neomutt/neomutt-20171013.ebuild | 3 +--
 mail-client/neomutt/neomutt-20171027.ebuild | 3 +--
 mail-client/neomutt/neomutt-9999.ebuild     | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mail-client/neomutt/neomutt-20170714.ebuild b/mail-client/neomutt/neomutt-20170714.ebuild
index db298e09129..2062717e96f 100644
--- a/mail-client/neomutt/neomutt-20170714.ebuild
+++ b/mail-client/neomutt/neomutt-20170714.ebuild
@@ -14,8 +14,7 @@ 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 +symlink
-	tokyocabinet"
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types

diff --git a/mail-client/neomutt/neomutt-20170912.ebuild b/mail-client/neomutt/neomutt-20170912.ebuild
index af1e426e2d5..0087782c35a 100644
--- a/mail-client/neomutt/neomutt-20170912.ebuild
+++ b/mail-client/neomutt/neomutt-20170912.ebuild
@@ -14,8 +14,7 @@ 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 +symlink
-	tokyocabinet"
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types

diff --git a/mail-client/neomutt/neomutt-20171006.ebuild b/mail-client/neomutt/neomutt-20171006.ebuild
index 1adc070a098..ca3bddeaefa 100644
--- a/mail-client/neomutt/neomutt-20171006.ebuild
+++ b/mail-client/neomutt/neomutt-20171006.ebuild
@@ -14,8 +14,7 @@ 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 +symlink
-	tokyocabinet"
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types

diff --git a/mail-client/neomutt/neomutt-20171013.ebuild b/mail-client/neomutt/neomutt-20171013.ebuild
index af4dc6a9e03..12809218907 100644
--- a/mail-client/neomutt/neomutt-20171013.ebuild
+++ b/mail-client/neomutt/neomutt-20171013.ebuild
@@ -14,8 +14,7 @@ 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 +symlink
-	tokyocabinet"
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types

diff --git a/mail-client/neomutt/neomutt-20171027.ebuild b/mail-client/neomutt/neomutt-20171027.ebuild
index af4dc6a9e03..12809218907 100644
--- a/mail-client/neomutt/neomutt-20171027.ebuild
+++ b/mail-client/neomutt/neomutt-20171027.ebuild
@@ -14,8 +14,7 @@ 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 +symlink
-	tokyocabinet"
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 43cb3fef759..5dc34a207c8 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -15,8 +15,7 @@ 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 +symlink
-	tokyocabinet"
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-10-27 15:32 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-10-27 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     f8468b57d9b59da2c90b9c26d5ffa4f93c1c2c34
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 15:30:14 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 15:30:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8468b57

mail-client/neomutt: Version bump to neomutt-20171027

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 mail-client/neomutt/Manifest                |   1 +
 mail-client/neomutt/neomutt-20171027.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 34234a54a74..c48e9eef74e 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -2,3 +2,4 @@ DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c
 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

diff --git a/mail-client/neomutt/neomutt-20171027.ebuild b/mail-client/neomutt/neomutt-20171027.ebuild
new file mode 100644
index 00000000000..af4dc6a9e03
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171027.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+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 +symlink
+	tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? ( >=sys-libs/db-4:= )
+	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 )
+	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}
+	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_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable crypt pgp)"
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable nls)"
+		"$(use_enable smime)"
+		"$(use_enable notmuch)"
+		"$(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)"
+		"--with-$(usex slang slang curses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	if use gnutls; then
+		myconf+=( "--with-gnutls" )
+	elif use ssl; then
+		myconf+=( "--with-ssl" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc neomuttrc.man
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/neomutt.man > neomutt.1 || die
+		cp doc/neomuttrc.man neomuttrc.5 || die
+		doman neomutt.1 neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-10-13 16:04 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-10-13 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2cca8742849568f7074741eb8c2a24b079a66436
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 16:04:30 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 16:04:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cca8742

mail-client/neomutt: Version bump to neomutt-20171013

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 mail-client/neomutt/Manifest                                     | 1 +
 .../neomutt/{neomutt-9999.ebuild => neomutt-20171013.ebuild}     | 9 +++------
 mail-client/neomutt/neomutt-9999.ebuild                          | 4 ----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 273709d7264..34234a54a74 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-20171013.ebuild
similarity index 91%
copy from mail-client/neomutt/neomutt-9999.ebuild
copy to mail-client/neomutt/neomutt-20171013.ebuild
index 590236b4e3e..af4dc6a9e03 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-20171013.ebuild
@@ -3,11 +3,10 @@
 
 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=""
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="https://www.neomutt.org/"
@@ -95,8 +94,6 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
-	#rm "${ED}"/etc/${PN}/mime.types || die
-	#dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
 
 	# A man-page is always handy, so fake one
 	if use !doc; then

diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 590236b4e3e..43cb3fef759 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -94,10 +94,6 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	#rm "${ED}"/etc/${PN}/mime.types || die
-	#dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
-
 	# A man-page is always handy, so fake one
 	if use !doc; then
 		emake -C doc neomuttrc.man


^ permalink raw reply related	[flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/
@ 2017-10-04 11:41 Nicolas Bock
  0 siblings, 0 replies; 129+ messages in thread
From: Nicolas Bock @ 2017-10-04 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     da66fd17c4d9542d4ea1961b7230d016e808238a
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  4 11:41:05 2017 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 11:41:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da66fd17

mail-client/neomutt: Fix indentation of metadata

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 mail-client/neomutt/metadata.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 0ea047dba8f..2a3defe32d4 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -5,14 +5,14 @@
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
-  <use>
-	  <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
-	  <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
-	  <flag name="smime">Enable support for smime</flag>
-	  <flag name="tokyocabinet">Enable tokyocabinet database backend for header
-		  caching</flag>
-	  <flag name="kyotocabinet">Enable kyotocabinet database backend for header
-		  caching</flag>
-	  <flag name="lmdb">Enable LMDB backend for header caching</flag>
-  </use>
+	<use>
+		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+		<flag name="smime">Enable support for smime</flag>
+		<flag name="tokyocabinet">Enable tokyocabinet database backend for header
+			caching</flag>
+		<flag name="kyotocabinet">Enable kyotocabinet database backend for header
+			caching</flag>
+		<flag name="lmdb">Enable LMDB backend for header caching</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 129+ messages in thread

end of thread, other threads:[~2024-05-25  6:27 UTC | newest]

Thread overview: 129+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-23 12:34 [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/ Nicolas Bock
  -- strict thread matches above, loose matches on Subject: below --
2024-05-25  6:27 Arthur Zamarin
2024-05-25  6:27 Arthur Zamarin
2024-05-12 23:00 Marc Schiffbauer
2024-05-12 23:00 Marc Schiffbauer
2024-02-19 13:36 Marc Schiffbauer
2023-12-21 17:47 Nicolas Bock
2023-12-21 17:47 Nicolas Bock
2023-11-14 14:40 Nicolas Bock
2023-11-14 14:24 Nicolas Bock
2023-11-14 14:20 Nicolas Bock
2023-11-14 14:19 Nicolas Bock
2023-11-14  4:32 Nicolas Bock
2023-11-03 15:05 Nicolas Bock
2023-10-29 11:33 Marc Schiffbauer
2023-10-28 17:24 Nicolas Bock
2023-05-17 19:01 Nicolas Bock
2023-05-12 17:56 Nicolas Bock
2023-05-12 17:54 Nicolas Bock
2023-05-05 13:47 Nicolas Bock
2023-05-02 20:31 Nicolas Bock
2023-04-27 16:25 Nicolas Bock
2023-04-07 10:07 Sam James
2023-03-23 13:22 Nicolas Bock
2023-03-23  3:42 Sam James
2023-03-22 17:26 Nicolas Bock
2023-03-22 17:26 Nicolas Bock
2023-01-06 20:03 Arthur Zamarin
2023-01-06 20:03 Arthur Zamarin
2022-08-30  8:27 Jakov Smolić
2022-06-16 16:30 Sam James
2022-05-23 19:37 Nicolas Bock
2022-04-29 18:32 Nicolas Bock
2022-04-26  2:27 Sam James
2022-04-15 18:29 Nicolas Bock
2022-04-08 17:04 Nicolas Bock
2022-03-28  6:53 Agostino Sarubbo
2022-03-26 19:47 Agostino Sarubbo
2022-03-26  0:12 Sam James
2022-03-08 22:03 Nicolas Bock
2021-10-29 19:19 Nicolas Bock
2021-10-22 13:42 Nicolas Bock
2021-10-15 17:41 Nicolas Bock
2021-09-28 16:38 Nicolas Bock
2021-05-26  8:09 Thomas Deutschmann
2021-05-25 19:10 Agostino Sarubbo
2021-05-25 18:58 Agostino Sarubbo
2021-05-14  0:22 Sam James
2021-04-30 12:47 Mikle Kolyada
2021-03-10 14:32 Nicolas Bock
2021-02-05 18:58 Nicolas Bock
2021-01-25 23:39 Sam James
2020-12-13  0:16 Sam James
2020-12-03 15:26 Nicolas Bock
2020-12-02  3:06 Thomas Deutschmann
2020-12-01 14:02 Nicolas Bock
2020-12-01 12:10 Sam James
2020-11-30 16:53 Nicolas Bock
2020-11-27 15:34 Nicolas Bock
2020-11-23 17:49 Nicolas Bock
2020-11-22 19:10 Nicolas Bock
2020-11-01 11:18 Georgy Yakovlev
2020-11-01 11:18 Georgy Yakovlev
2020-09-25 14:46 Nicolas Bock
2020-09-25 13:59 Nicolas Bock
2020-08-26 11:45 Nicolas Bock
2020-08-26 11:45 Nicolas Bock
2020-07-29  0:20 Sam James
2020-07-27 22:25 Sam James
2020-07-27 21:15 Sam James
2020-07-27 19:51 Nicolas Bock
2020-07-27 19:51 Nicolas Bock
2020-06-29 14:29 Thomas Deutschmann
2020-06-29 13:25 Nicolas Bock
2020-06-29 13:16 Nicolas Bock
2020-06-19 20:12 Nicolas Bock
2020-05-11 12:53 Nicolas Bock
2020-05-01 23:45 Nicolas Bock
2020-04-26 11:55 Nicolas Bock
2020-04-25 13:22 Nicolas Bock
2020-04-20 11:44 Nicolas Bock
2020-03-20 14:06 Nicolas Bock
2020-03-13 17:15 Nicolas Bock
2020-03-13 17:12 Nicolas Bock
2020-03-13 17:07 Nicolas Bock
2020-03-13 17:04 Nicolas Bock
2019-12-09 13:06 Nicolas Bock
2019-11-29 21:26 Nicolas Bock
2019-11-11 12:38 Nicolas Bock
2019-11-06  5:29 Nicolas Bock
2019-11-06  3:13 Nicolas Bock
2019-11-02 15:04 Thomas Deutschmann
2019-11-02 12:03 Nicolas Bock
2019-10-11 18:15 Nicolas Bock
2019-10-11 12:40 Nicolas Bock
2019-08-11  8:45 Michał Górny
2018-10-07  0:10 Mikle Kolyada
2018-10-06 23:05 Thomas Deutschmann
2018-07-24 17:42 Nicolas Bock
2018-06-23 18:09 Mikle Kolyada
2018-06-22 14:52 Nicolas Bock
2018-06-06 12:02 Nicolas Bock
2018-06-06 12:01 Nicolas Bock
2018-06-06 11:47 Nicolas Bock
2018-06-06 11:47 Nicolas Bock
2018-06-06 11:47 Nicolas Bock
2018-06-04 15:18 Nicolas Bock
2018-06-03 14:00 Nicolas Bock
2018-04-04 22:17 Nicolas Bock
2018-04-03 13:39 Nicolas Bock
2018-02-23 12:34 Nicolas Bock
2018-01-24 21:53 Nicolas Bock
2018-01-24 21:40 Nicolas Bock
2018-01-03 13:07 Nicolas Bock
2017-12-27 13:11 Nicolas Bock
2017-12-15 12:24 Nicolas Bock
2017-12-14 13:56 Nicolas Bock
2017-12-13 15:50 Nicolas Bock
2017-12-09 13:29 Nicolas Bock
2017-12-03 17:39 Nicolas Bock
2017-12-03 16:31 Nicolas Bock
2017-12-03 13:41 Nicolas Bock
2017-12-03 13:41 Nicolas Bock
2017-12-02 14:29 Nicolas Bock
2017-11-20 12:42 Nicolas Bock
2017-11-20 12:22 Nicolas Bock
2017-10-27 15:32 Nicolas Bock
2017-10-13 16:04 Nicolas Bock
2017-10-04 11:41 Nicolas Bock

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox