From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1570429-garchives=archives.gentoo.org@lists.gentoo.org> 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20FAE158089 for <garchives@archives.gentoo.org>; Tue, 14 Nov 2023 14:19:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D8222BC014; Tue, 14 Nov 2023 14:19:58 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 402382BC014 for <gentoo-commits@lists.gentoo.org>; Tue, 14 Nov 2023 14:19:58 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4DC8C335D27 for <gentoo-commits@lists.gentoo.org>; Tue, 14 Nov 2023 14:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5A45AAB for <gentoo-commits@lists.gentoo.org>; Tue, 14 Nov 2023 14:19:55 +0000 (UTC) From: "Nicolas Bock" <nicolasbock@gentoo.org> 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" <nicolasbock@gentoo.org> Message-ID: <1699971575.7548d173936c39c3c16ffd7a914cbb38845b175d.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/neomutt/neomutt-20220415.ebuild mail-client/neomutt/neomutt-20230407-r1.ebuild mail-client/neomutt/neomutt-20230407.ebuild X-VCS-Directories: mail-client/neomutt/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 7548d173936c39c3c16ffd7a914cbb38845b175d X-VCS-Branch: master Date: Tue, 14 Nov 2023 14:19:55 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34d7df3b-b96b-4a99-a149-3263ce0bd9be X-Archives-Hash: 4cc34221100eb865bfea31839ea68d86 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 -}