commit: 15627b8c10ca978941176a0f5a8a3acf561c2537 Author: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org> AuthorDate: Fri May 5 13:45:17 2023 +0000 Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org> CommitDate: Fri May 5 13:47:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15627b8c
mail-client/neomutt: Cleanup Remove broken dependency on BerkeleyDB:6.0 and remove old version of neomutt. Closes: https://bugs.gentoo.org/904068 Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org> mail-client/neomutt/Manifest | 1 - mail-client/neomutt/neomutt-20220429.ebuild | 171 ------------------------- mail-client/neomutt/neomutt-20230322-r1.ebuild | 2 - mail-client/neomutt/neomutt-20230407-r1.ebuild | 2 - 4 files changed, 176 deletions(-) diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index d9208b3c339a..1887694806ff 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -1,5 +1,4 @@ DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92 -DIST neomutt-20220429.tar.gz 3774374 BLAKE2B a67ae009bc24335693bb7abc2b1de5a957a4d912755f460ae205050963dc4556896a6f94971a7d113a5af8202d8a6ecff4cfff16c157725d4792eb31f5402a64 SHA512 ce151cabe9fe0c45f379dd7a71790f600faa9283c79a486c1421b5fe3b19b7f12d71dc36ec330e1b28b26ed83bf4c47b656ca823c484105ea3f80ef9166e7f0b DIST neomutt-20230322.tar.gz 3716391 BLAKE2B c845a354a19d1f014efe9a64503b8b612fce99cc4cef5828532f7a6b035d133d4159fdcb138da1b64d3c3e1c45e0046fa65ed3a0d753df8f762d98c993060b15 SHA512 bbe88d1906db2c8633380a55f0c9a1c0e74994c653bfcd2605608f7ee15a3b761139f9996daebb8c968d83760eec5df620de8ebed72eb52e5d9765ff837a3fb3 DIST neomutt-20230407.tar.gz 3725060 BLAKE2B 4127cd17967f458db4d150a5225a6a0e6cb40d1b503910b997037aac6323c4a81141aad5d4574dbe32f92c9f039f17724209e7b308154b1c994e1bd2a7cffe08 SHA512 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3 diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild deleted file mode 100644 index 771367cdb4f5..000000000000 --- a/mail-client/neomutt/neomutt-20220429.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2022 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/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-20230322-r1.ebuild b/mail-client/neomutt/neomutt-20230322-r1.ebuild index 07e7a55be324..5568bdc1402c 100644 --- a/mail-client/neomutt/neomutt-20230322-r1.ebuild +++ b/mail-client/neomutt/neomutt-20230322-r1.ebuild @@ -31,11 +31,9 @@ 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 ) diff --git a/mail-client/neomutt/neomutt-20230407-r1.ebuild b/mail-client/neomutt/neomutt-20230407-r1.ebuild index 12c4520575e0..9769219b8f76 100644 --- a/mail-client/neomutt/neomutt-20230407-r1.ebuild +++ b/mail-client/neomutt/neomutt-20230407-r1.ebuild @@ -31,11 +31,9 @@ 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 )
