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 5A93415813A for ; Thu, 09 Jan 2025 22:02:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85283E070D; Thu, 09 Jan 2025 22:02:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 2BA66E070D for ; Thu, 09 Jan 2025 22:02:44 +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 C27CF3409EC for ; Thu, 09 Jan 2025 22:02:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31D3411B5 for ; Thu, 09 Jan 2025 22:02:41 +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: <1736459155.7b459e9677109908b9dc11b7b20af49d662bfbe3.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/neomutt/Manifest mail-client/neomutt/neomutt-20231103.ebuild mail-client/neomutt/neomutt-20231221.ebuild X-VCS-Directories: mail-client/neomutt/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 7b459e9677109908b9dc11b7b20af49d662bfbe3 X-VCS-Branch: master Date: Thu, 09 Jan 2025 22:02:41 +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: 644f467d-9d2b-4759-9017-06874c57253d X-Archives-Hash: 8ca042655b6626d5ce36bbf08665b8ef commit: 7b459e9677109908b9dc11b7b20af49d662bfbe3 Author: Nicolas Bock gentoo org> AuthorDate: Thu Jan 9 18:00:53 2025 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Thu Jan 9 21:45:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b459e96 mail-client/neomutt: Clean out old versions Signed-off-by: Nicolas Bock gentoo.org> mail-client/neomutt/Manifest | 2 - mail-client/neomutt/neomutt-20231103.ebuild | 174 ---------------------------- mail-client/neomutt/neomutt-20231221.ebuild | 174 ---------------------------- 3 files changed, 350 deletions(-) diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index c8e7b6afa2a7..0a8c7b1824b6 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,5 +1,3 @@ -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-20241114.tar.gz 4072339 BLAKE2B 86ca9eefa9649bc7684415213041ae513a17a1a5a6107f7904fa4a7581557f7a9585f6d98f715adee0c93bbe43651055ffca3d7c051f3c8bcff5d633237b0d7d SHA512 3325b27fc09fdb0147abbd17ecc5059ab2460a7537b09fad846a9835c70cd7a1904488c76cb420a8db57b43905ebf81b8a2f0afa6a3c7f7a827c760d63353f00 diff --git a/mail-client/neomutt/neomutt-20231103.ebuild b/mail-client/neomutt/neomutt-20231103.ebuild deleted file mode 100644 index 56c1c04b2e1a..000000000000 --- a/mail-client/neomutt/neomutt-20231103.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 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: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 -} diff --git a/mail-client/neomutt/neomutt-20231221.ebuild b/mail-client/neomutt/neomutt-20231221.ebuild deleted file mode 100644 index 56c1c04b2e1a..000000000000 --- a/mail-client/neomutt/neomutt-20231221.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 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: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 -}