From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 698FD1581F0 for ; Fri, 13 Dec 2024 21:54:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0DE4E08F0; Fri, 13 Dec 2024 21:54:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1A89E08F0 for ; Fri, 13 Dec 2024 21:54:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0733B33BE00 for ; Fri, 13 Dec 2024 21:54:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F395AF5 for ; Fri, 13 Dec 2024 21:54:23 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1734126828.ff2d812d495c86d6e788e007e56a88a876bb3591.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/neomutt/metadata.xml mail-client/neomutt/neomutt-20241212.ebuild X-VCS-Directories: mail-client/neomutt/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: ff2d812d495c86d6e788e007e56a88a876bb3591 X-VCS-Branch: master Date: Fri, 13 Dec 2024 21:54:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a83e8b5b-d714-4c7f-af80-8a2a0cc6632f X-Archives-Hash: 7a9079f708e11e85f5d65797b3cb2c6e commit: ff2d812d495c86d6e788e007e56a88a876bb3591 Author: Nicolas Bock gentoo org> AuthorDate: Fri Dec 13 21:53:27 2024 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Fri Dec 13 21:53:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2d812d mail-client/neomutt: Remove obsolete USE flags Removes obsolete 'asan' and 'ubsan' USE flags. Signed-off-by: Nicolas Bock gentoo.org> mail-client/neomutt/metadata.xml | 2 - mail-client/neomutt/neomutt-20241212.ebuild | 176 ++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 2 deletions(-) diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml index 6adb8f922fb6..583a2caccf5e 100644 --- a/mail-client/neomutt/metadata.xml +++ b/mail-client/neomutt/metadata.xml @@ -10,8 +10,6 @@ Marc Schiffbauer - Enable Address sanitizer for debugging - Enable undefined behavior sanitizer for debugging Enable autocrypt.org support Enable BDB (Berkley DB) backend for header caching diff --git a/mail-client/neomutt/neomutt-20241212.ebuild b/mail-client/neomutt/neomutt-20241212.ebuild new file mode 100644 index 000000000000..f0e77fe65e6e --- /dev/null +++ b/mail-client/neomutt/neomutt-20241212.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 + ) + =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 +}