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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9872D1382C5 for ; Thu, 3 Dec 2020 15:26:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4FD7E083D; Thu, 3 Dec 2020 15:26:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95F46E083D for ; Thu, 3 Dec 2020 15:26:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DECAD34109A for ; Thu, 3 Dec 2020 15:26:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 665DB45B for ; Thu, 3 Dec 2020 15:26:24 +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: <1607009173.3a02f96d25538695778dd30af5664166caec386b.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-20200626-r1.ebuild mail-client/neomutt/neomutt-20200626.ebuild mail-client/neomutt/neomutt-20200821.ebuild mail-client/neomutt/neomutt-20200925.ebuild mail-client/neomutt/neomutt-20201120.ebuild X-VCS-Directories: mail-client/neomutt/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 3a02f96d25538695778dd30af5664166caec386b X-VCS-Branch: master Date: Thu, 3 Dec 2020 15:26:24 +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: bc1e9a4d-ddf2-4f23-ae3f-5b1724c221bd X-Archives-Hash: 771f0dd227a123525e9576112d4a831c commit: 3a02f96d25538695778dd30af5664166caec386b Author: Nicolas Bock gentoo org> AuthorDate: Thu Dec 3 15:25:19 2020 +0000 Commit: Nicolas Bock gentoo 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 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 - ) - =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 - ) - =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 - ) - =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 - ) - =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 - ) - =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 -}