commit: 24db6924ca172cc88273a15abbe9114f802114d7 Author: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org> AuthorDate: Tue Nov 14 14:37:37 2023 +0000 Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org> CommitDate: Tue Nov 14 14:40:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24db6924
Revert "mail-client/neomutt: Clean out old versions" This reverts commit 7548d173936c39c3c16ffd7a914cbb38845b175d. Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org> mail-client/neomutt/Manifest | 2 + mail-client/neomutt/neomutt-20220415.ebuild | 171 ++++++++++++++++++++++++ mail-client/neomutt/neomutt-20230407-r1.ebuild | 167 ++++++++++++++++++++++++ mail-client/neomutt/neomutt-20230407.ebuild | 172 +++++++++++++++++++++++++ 4 files changed, 512 insertions(+) diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index 125c7170cc51..5fae1267db3a 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,3 +1,5 @@ +DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92 +DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d DIST neomutt-20230512.tar.gz 3791505 BLAKE2B 381e066e2485a3bb644df9a9fcbc9776e7b0832988d2b8b253e8adbabd446958a70d39b4f40913b4dd4fe74a8265474b57a74200d905b7d6107f026a10849403 SHA512 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127 DIST neomutt-20230517.tar.gz 3792146 BLAKE2B 7bd7126ef92785b880d24d92b594251513830c4e9d1c1dd608ccd520c8758dab2661d17e937e22f987b634cf7f85418abecfa84bd94db25b1d1fb83baa4a0d18 SHA512 6314c63f1a324c9d45bc06fe1ab73b86a1f11467d6cf5105f72f55029fe8bc035b4a2833e6c8958e749fe109b5f8e68b53ff7821185b7a4480468ddce5c267f3 DIST neomutt-20231023.tar.gz 3803482 BLAKE2B e8e4f3ee374cf9699d1cf5d6feca7e80d7c2c6a998770d52d4a1c63940144fd4741b7ca631776e2233b349fb23a473e4f82ac03fb690d6916e9fce6a8e95c659 SHA512 0994c4b9027f8299de26bfd816298a0abf02645b07e76ecd2267c220a884869c2226ba01618a3c71887c1b627b64ca4e14375b26f165381283899a8fa5d4950e diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild new file mode 100644 index 000000000000..de71a419eef0 --- /dev/null +++ b/mail-client/neomutt/neomutt-20220415.ebuild @@ -0,0 +1,171 @@ +# 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 new file mode 100644 index 000000000000..9769219b8f76 --- /dev/null +++ b/mail-client/neomutt/neomutt-20230407-r1.ebuild @@ -0,0 +1,167 @@ +# 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 new file mode 100644 index 000000000000..07e7a55be324 --- /dev/null +++ b/mail-client/neomutt/neomutt-20230407.ebuild @@ -0,0 +1,172 @@ +# 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 +}