diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /mail-client/neomutt | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'mail-client/neomutt')
-rw-r--r-- | mail-client/neomutt/Manifest | 16 | ||||
-rw-r--r-- | mail-client/neomutt/metadata.xml | 4 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20200626.ebuild | 128 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20200821.ebuild | 149 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20200925.ebuild | 149 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20201120.ebuild | 149 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20201127-r1.ebuild (renamed from mail-client/neomutt/neomutt-20200626-r1.ebuild) | 5 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20201127.ebuild | 2 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-99999999.ebuild | 2 |
9 files changed, 10 insertions, 594 deletions
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index a6ee30681847..f320547ab4cd 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,14 +1,6 @@ -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 -EBUILD neomutt-20200626-r1.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f -EBUILD neomutt-20200626.ebuild 3296 BLAKE2B 596daf041ca8dc467da3c6443fe5d4ba8253edcb41bd8e1af24c04e55de9503d185adf25ab9eeb793841b2cdac2092cc51a5631057472d5a5f00bcd0539d9198 SHA512 14b9243ed976ccf7fa0d97f7ca5d9eadefcd17f8e178ec1054d5fb2cc3808367cb142785d945e1358c38de4761ab6ded6cb44711c36635cc3f0f59c71637f295 -EBUILD neomutt-20200821.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f -EBUILD neomutt-20200925.ebuild 3940 BLAKE2B 2229af1bba05eacfeb7180ff18c41a7853fd121efe923609483b67e4f354e3e215f32b0044cc4a771a166bd73243d1d56ee36281a22b1c1d030be46b205dd346 SHA512 a8eccbf6699e65b7107dcc66f57b0ab852149047342d1951cec4a39a61b3dd02ea2760dd28e37737837addc5647ceb71611cfdc4154ab36870c7a55e870f72eb -EBUILD neomutt-20201120.ebuild 3940 BLAKE2B 2229af1bba05eacfeb7180ff18c41a7853fd121efe923609483b67e4f354e3e215f32b0044cc4a771a166bd73243d1d56ee36281a22b1c1d030be46b205dd346 SHA512 a8eccbf6699e65b7107dcc66f57b0ab852149047342d1951cec4a39a61b3dd02ea2760dd28e37737837addc5647ceb71611cfdc4154ab36870c7a55e870f72eb -EBUILD neomutt-20201127.ebuild 3895 BLAKE2B ee6d13f590805c6517aa038c8a6d9ca50ab410445d13b097e581e209a6ee5874483a14bc17cba2d5cf58a9e3e461fb470ae4ffdb987984489b23b1a905af68c8 SHA512 b4ef83532185b6d4773a4c156f84de626fab96b8410040d6335091c6d2b437a13f390f1ee3437d20870801866a31638a2e6997eac197dd0cc2496587e07d300f -EBUILD neomutt-99999999.ebuild 3895 BLAKE2B ee6d13f590805c6517aa038c8a6d9ca50ab410445d13b097e581e209a6ee5874483a14bc17cba2d5cf58a9e3e461fb470ae4ffdb987984489b23b1a905af68c8 SHA512 b4ef83532185b6d4773a4c156f84de626fab96b8410040d6335091c6d2b437a13f390f1ee3437d20870801866a31638a2e6997eac197dd0cc2496587e07d300f -MISC metadata.xml 1207 BLAKE2B e0ccd3e85c801540e7bd6d589b27b0a20b22e1fff2ab8621cf3a28349c8fc501c6fa1d79d9151bb150607c813932f884bc183a98e1a807d157b7a68c0ef11f37 SHA512 321d64d899999f43dec107bb12933453290035810f0c009f4e5dc680963a92da6ce7d8f6ede96cdc85c97c628f80ce061167db5990bff97420e4b768fde4fe8b +EBUILD neomutt-20201127-r1.ebuild 3902 BLAKE2B c319c745a1e5e6e3ac6d8112a15d1e5dad8cbeb351e0248947186d85f5be4d3c8cd7dbb7736e8f9584d7570c5354b544e9096e3cc75b84ffe61b2e912b67b264 SHA512 c50796b7093e7ea8ba4197214f088034b0860af8d10930476ab30b35e53019ed3aff15a3bfa1ea2525dc408dfdaa781c0588b1fe380c24c556c22b12b179a0e8 +EBUILD neomutt-20201127.ebuild 3893 BLAKE2B 4adc997b079b216529697ae0dd46947fcb8a01b068aeff3c8eae4c9e6b48a9151228160a87e159aa96f897c8f636425930507323834862d052730040eb7b66a7 SHA512 1c6caa40884d8c1daeda009ce81098f61acde8c4cef0cfd29c87465f7b7610138c946f5f4e429fe9d81161bca909f476bea08942c4c61d190b5529b8f30c8e1f +EBUILD neomutt-99999999.ebuild 3896 BLAKE2B ab8ff53e93d1e91099beccc09fcc96729e0884cefd1020ccf810eb4a0697604db40f3266696b3f231f1e9f7cb0ce5d9ae76ee30bc521a768fadfe44f958f8057 SHA512 3be81472b254249a438fd356263fef7bd6bd153f10a47450537594f0f1ddee874e630d52fd62b3b6569dab0ee96996122066b5245860e44ad19947b5f2ee4a49 +MISC metadata.xml 1207 BLAKE2B d952b478eb3e513307c58ea2d47dc2b208e00213deaf2d8d0878bea451c5eba117f16f596e2e7ee77a81e5ea7e8e431e0410ee292b527be89470e3530b1f55d9 SHA512 bcaeaea3b9d33cf92de7851f4f843e61c833b5ad09ff7899c999787c3caa57d8b3f77a2903ffab72f6938ca87899926eaf026bbf25bc9e74b66f21720a447c41 diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml index eca0e6b3489d..f0b7a7e03387 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> diff --git a/mail-client/neomutt/neomutt-20200626.ebuild b/mail-client/neomutt/neomutt-20200626.ebuild deleted file mode 100644 index 73acfc7fb6dc..000000000000 --- 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 d45bb5419716..000000000000 --- 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 d25f26c5ada8..000000000000 --- 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 d25f26c5ada8..000000000000 --- 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 -} diff --git a/mail-client/neomutt/neomutt-20200626-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild index d45bb5419716..863e199daac7 100644 --- a/mail-client/neomutt/neomutt-20200626-r1.ebuild +++ b/mail-client/neomutt/neomutt-20201127-r1.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 ~s390 ~x86" fi TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75 @@ -43,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-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild index 0903176798d7..2fbecf8b7800 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 diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild index 0903176798d7..c2227b88db2d 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:= ) |