From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- mail-client/neomutt/Manifest | 19 +-- ...x-seqset-iterator-when-it-ends-in-a-comma.patch | 37 ----- mail-client/neomutt/neomutt-20210205-r1.ebuild | 166 --------------------- mail-client/neomutt/neomutt-20211015.ebuild | 162 -------------------- mail-client/neomutt/neomutt-20211022.ebuild | 162 -------------------- mail-client/neomutt/neomutt-20211029-r1.ebuild | 2 +- mail-client/neomutt/neomutt-20211029.ebuild | 2 +- mail-client/neomutt/neomutt-20220408.ebuild | 2 +- mail-client/neomutt/neomutt-20220415.ebuild | 2 +- mail-client/neomutt/neomutt-20220429.ebuild | 2 +- mail-client/neomutt/neomutt-99999999.ebuild | 2 +- 11 files changed, 12 insertions(+), 546 deletions(-) delete mode 100644 mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch delete mode 100644 mail-client/neomutt/neomutt-20210205-r1.ebuild delete mode 100644 mail-client/neomutt/neomutt-20211015.ebuild delete mode 100644 mail-client/neomutt/neomutt-20211022.ebuild (limited to 'mail-client/neomutt') diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index de6af1154e91..07a2248e1aab 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,19 +1,12 @@ -AUX 0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch 1175 BLAKE2B a01218e92fb230f7adeacec1803acf80d8e2c44494109deae9b261012c84e1b8eda160f2e663504d30f0d67a52ab39be206b18b04d35a5da3d0b8f29f0ed7f34 SHA512 6bfeb433b5d9ff16e70b7765efd537cb6cb27c5fab9396fed88f1ba3d683a90308afd1a6c7b25af44c5b3d53f54138d6bd671d8330999b402dc887a5af7ca424 -DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554 -DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03 -DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92 DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3 -EBUILD neomutt-20210205-r1.ebuild 4400 BLAKE2B 9d12fb97150d01584d94fc0ea8366e67787e346a5f0dee7240890a6e0b43d13af8f76abde6a0afb4a93d0ff8141ea2b8137cb17f1ec3c1e7b2f20c19431ca2ae SHA512 ca0a381cf7c544f94554ad0bae1c8e053c5c76a045ce86c9e46343626efbe699b483af7dd3f3182e5b8e3871802c5addf68693b6109722fea81ccfb8a85129d9 -EBUILD neomutt-20211015.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab -EBUILD neomutt-20211022.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab -EBUILD neomutt-20211029-r1.ebuild 4435 BLAKE2B 5ab23ff25ed3bc162e889d75471dcc59a2597d6105d2770d88443bb6d535d2ae984b285f2c23e194d7d4b8c77935c30c028fe147ebaac2c54e09521df2c98937 SHA512 75fd831dba3cf7dc8d9b99f503aceb3836ed88521c05ded9f068f56fe60aa6f6200edceaf1251136e6f23185153cb74ebe6940dc2d22ab2b1b0c9667964729e3 -EBUILD neomutt-20211029.ebuild 4318 BLAKE2B 076853dfda2e7447e08fc503db1b1613726f5a48f4cda625052cfb1068f45f900b2f2c9d6ab142b24fdb198f2bb72a2b474fb1b39ffcbfa0e03934ad725df4f7 SHA512 26d24dc2d5daebca9a40283fb1f902b5703586b35c6a98195bc186f7c488bd0c1b7169bd88856fccb52290f82931b97c5d015c3f2d7eeeb4fafb3c169fd49dab -EBUILD neomutt-20220408.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7 -EBUILD neomutt-20220415.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7 -EBUILD neomutt-20220429.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7 -EBUILD neomutt-99999999.ebuild 4437 BLAKE2B 20cb0c414add7304f7d6936fb795e259b01ec4197cf1c0aaa9979234d09bdf2b94fa69c39635cf630d4246009b2fb3ea1186eb58993df1f50a33e854fecf485f SHA512 29dd8b8cf88541f7a25866b926f4128afc8e8573edab7712b87fca30ea1ee2adb2c3545736c1c21f8f092f39849900cfd1d9363b925895992580ecfb8afd48e7 +EBUILD neomutt-20211029-r1.ebuild 4437 BLAKE2B 36a9217bfa9f8f38709460c0cdec4f2f6efc48d0f8ec1546c341113b2f9be12673de2f4dc39bc691266f7505a6a3077410b78bba69162f9f2e5a84a54b469f87 SHA512 6d5a9ad5d5e32d94aecb11462e4b34b3ef9c4dc7250ea6b860d7c467a8be743a843ef0f9dbf182b62ecc2f3054fc247f6fd029771835452eecb2e19d94405575 +EBUILD neomutt-20211029.ebuild 4320 BLAKE2B b1cb42df56d3622dcb365395ede53c038f4cee2816aa5e9fa8c7f2dcd6f3ec8a69e4e6f34e09c5b019de856265e03e6b73cac93cb5490f42663cd54a472862b5 SHA512 ea6a69c001059372ff0508538a352143d2874c3c2fbe855c8926da479d06fe7ab765d9e55828a3fe7ea2a5cfced2700e00ea6736f87086e644dd3cac45085b4c +EBUILD neomutt-20220408.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc +EBUILD neomutt-20220415.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc +EBUILD neomutt-20220429.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc +EBUILD neomutt-99999999.ebuild 4439 BLAKE2B a0e3de1f2af04fa23485d748c0b44de026c61403e7aaa231fdccb8af7973be9353140e7fa01c521d4efeacf6bea76c30aa893128f76e8c4370d165094364f5f6 SHA512 a88e822780c5cd00ebb53963f9a9bff1eaa8d47c8ac9ef12bf9cd945b3c91d0b97308addc1e37854e090cc4efa5bebcc0a4f66c0b1f32b3d551a2093ca4131cc MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184 diff --git a/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch b/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch deleted file mode 100644 index 06f31ffeb46b..000000000000 --- a/mail-client/neomutt/files/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy -Date: Mon, 3 May 2021 13:11:30 -0700 -Subject: [PATCH] Fix seqset iterator when it ends in a comma - -If the seqset ended with a comma, the substr_end marker would be just -before the trailing nul. In the next call, the loop to skip the -marker would iterate right past the end of string too. - -The fix is simple: place the substr_end marker and skip past it -immediately. ---- - imap/util.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/imap/util.c b/imap/util.c -index 52aff7da0..27fb86295 100644 ---- a/imap/util.c -+++ b/imap/util.c -@@ -1119,13 +1119,11 @@ int mutt_seqset_iterator_next(struct SeqsetIterator *iter, unsigned int *next) - if (iter->substr_cur == iter->eostr) - return 1; - -- while (!*(iter->substr_cur)) -- iter->substr_cur++; - iter->substr_end = strchr(iter->substr_cur, ','); - if (!iter->substr_end) - iter->substr_end = iter->eostr; - else -- *(iter->substr_end) = '\0'; -+ *(iter->substr_end++) = '\0'; - - char *range_sep = strchr(iter->substr_cur, ':'); - if (range_sep) --- -2.30.2 - diff --git a/mail-client/neomutt/neomutt-20210205-r1.ebuild b/mail-client/neomutt/neomutt-20210205-r1.ebuild deleted file mode 100644 index 5db3c1afba0c..000000000000 --- a/mail-client/neomutt/neomutt-20210205-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.2 - sys-libs/db:5.3 - sys-libs/db:4.8 - ) - =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 )" - -PATCHES=( - "${FILESDIR}/0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch" -) - -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-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild deleted file mode 100644 index 6c5d607b8a48..000000000000 --- a/mail-client/neomutt/neomutt-20211015.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.2 - sys-libs/db:5.3 - sys-libs/db:4.8 - ) - =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_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-20211022.ebuild b/mail-client/neomutt/neomutt-20211022.ebuild deleted file mode 100644 index 6c5d607b8a48..000000000000 --- a/mail-client/neomutt/neomutt-20211022.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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.2 - sys-libs/db:5.3 - sys-libs/db:4.8 - ) - =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_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-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild index b8a28e2720eb..21f921b4b59e 100644 --- a/mail-client/neomutt/neomutt-20211029-r1.ebuild +++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_test() { - local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + 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" diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild index 6c5d607b8a48..57bee1ffc254 100644 --- a/mail-client/neomutt/neomutt-20211029.ebuild +++ b/mail-client/neomutt/neomutt-20211029.ebuild @@ -116,7 +116,7 @@ src_configure() { } src_test() { - local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + 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" diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild index b3f780bca0ac..f149b539eac9 100644 --- a/mail-client/neomutt/neomutt-20220408.ebuild +++ b/mail-client/neomutt/neomutt-20220408.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_test() { - local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + 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" diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild index b3f780bca0ac..f149b539eac9 100644 --- a/mail-client/neomutt/neomutt-20220415.ebuild +++ b/mail-client/neomutt/neomutt-20220415.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_test() { - local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + 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" diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild index b3f780bca0ac..f149b539eac9 100644 --- a/mail-client/neomutt/neomutt-20220429.ebuild +++ b/mail-client/neomutt/neomutt-20220429.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_test() { - local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + 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" diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild index b3f780bca0ac..f149b539eac9 100644 --- a/mail-client/neomutt/neomutt-99999999.ebuild +++ b/mail-client/neomutt/neomutt-99999999.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_test() { - local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})" + 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" -- cgit v1.2.3