diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
commit | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch) | |
tree | 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /mail-client | |
parent | d934827bf44b7cfcf6711964418148fa60877668 (diff) |
gentoo resync : 28.11.2020
Diffstat (limited to 'mail-client')
-rw-r--r-- | mail-client/Manifest.gz | bin | 4388 -> 4389 bytes | |||
-rw-r--r-- | mail-client/mutt/Manifest | 12 | ||||
-rw-r--r-- | mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch | 30 | ||||
-rw-r--r-- | mail-client/mutt/mutt-1.14.4-r1.ebuild | 273 | ||||
-rw-r--r-- | mail-client/mutt/mutt-1.14.5.ebuild | 265 | ||||
-rw-r--r-- | mail-client/mutt/mutt-1.14.7.ebuild | 265 | ||||
-rw-r--r-- | mail-client/mutt/mutt-2.0.2.ebuild | 2 | ||||
-rw-r--r-- | mail-client/neomutt/Manifest | 4 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20201120.ebuild | 2 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20201127.ebuild | 148 | ||||
-rw-r--r-- | mail-client/roundcube/Manifest | 2 | ||||
-rw-r--r-- | mail-client/roundcube/roundcube-1.4.9.ebuild | 73 |
12 files changed, 229 insertions, 847 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz Binary files differindex 7561dbf81f4b..38451c5189ae 100644 --- a/mail-client/Manifest.gz +++ b/mail-client/Manifest.gz diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 68ca3911f370..727e2d1c935a 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,16 +1,6 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 -AUX mutt-1.14.4-no-imap-preauth-with-tunnel.patch 1001 BLAKE2B 20d5210ca085d26270be5588fa8058068715e91461832bbf09e21213cc6e84d7b118437a7e11a1e1202af7c3b76edc0f33d5fef2e3b61cd47cd2ddc03a578723 SHA512 07c243290f266b1446f83448796c1871234f38f05f0586cd1360bc6d80088a693451d7f85123da04004489d12d99191196c9bbf5291e90875955f05eb87fff02 -DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa -DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9 -DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1 SHA512 dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29 -DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc -DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631 -DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82 SHA512 ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458 DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13 -EBUILD mutt-1.14.4-r1.ebuild 8343 BLAKE2B 2d08378bb35052cce7c1ecd160dcdc8ccfbb2b58a7e0e5501a6c6309b85721163a41fd62b72334d205fd688898467053147fddbb60af12b48dfbd0170f314f4c SHA512 4829d3b8b530f805ed890f3989476e87f734d540c8cc11fdbf667c6e08be68b354ac5d61eb546f4fe8ed0eefbd5626b6b10640d07d2fa843186e64d3e27ded3d -EBUILD mutt-1.14.5.ebuild 8054 BLAKE2B 25f08d77e4dfdf3059ecaaccd1392900658b7bbd6117ede70265a1e1d2efceb0a937d376b6996afcbecd4f7c6b85d1e57047d32d62cda6183c13ded8cb8c45ea SHA512 35a2b80a7825deddcfdd4aa8fe6e08124fd5c07a629276d24c0a392e343f6b3c87c8a3539f53c35ff404ac21f31fdefa42d2ef3bb4af14fd8bf47c0f0f9cf1ab -EBUILD mutt-1.14.7.ebuild 8054 BLAKE2B 25f08d77e4dfdf3059ecaaccd1392900658b7bbd6117ede70265a1e1d2efceb0a937d376b6996afcbecd4f7c6b85d1e57047d32d62cda6183c13ded8cb8c45ea SHA512 35a2b80a7825deddcfdd4aa8fe6e08124fd5c07a629276d24c0a392e343f6b3c87c8a3539f53c35ff404ac21f31fdefa42d2ef3bb4af14fd8bf47c0f0f9cf1ab -EBUILD mutt-2.0.2.ebuild 8043 BLAKE2B 4ab32bacb4228f8bf65cad781492d1761b33a48e9fbd93aba451ad0e83f244a9c18b72ed20db36887a2bcc10262be85dc8da85a7e7017e127cfb4f39ecaa42c1 SHA512 a118b0c7f58b634e01276e12d45c06c2b0c402ddec899354c5d8d6fa2e1feb8730cc2cbe175e8b0b7109f78ff6434a2bf07e557858a128dd80e6f32a043e4bac +EBUILD mutt-2.0.2.ebuild 8040 BLAKE2B 09feff54740471654e9d689f4ccec5e003c25d080d699dc54c5eb17fdaa1a736345dbab7793fcf3fa19dbd355e4a3444d8673128dcd3c9c50eb32e1b41e47f2f SHA512 74a4d88cfbd5520f1cecd3d960fbb3ea48d8eea5af65823be075132b1b856ee61d50bcffb613d71b729cd8708722d80feb7edabcc7ded230264f70fdb46c748d MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350 diff --git a/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch b/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch deleted file mode 100644 index d4d2104db08c..000000000000 --- a/mail-client/mutt/files/mutt-1.14.4-no-imap-preauth-with-tunnel.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dc909119b3433a84290f0095c0f43a23b98b3748 Mon Sep 17 00:00:00 2001 -From: Kevin McCarthy <kevin@8t8.us> -Date: Sat, 20 Jun 2020 06:35:35 -0700 -Subject: [PATCH] Don't check IMAP PREAUTH encryption if $tunnel is in use. - -$tunnel is used to create an external encrypted connection. The -default of $ssl_starttls is yes, meaning those kinds of connections -will be broken by the CVE-2020-14093 fix. ---- - imap/imap.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/imap/imap.c b/imap/imap.c -index 3ca10df4..78d75b07 100644 ---- a/imap/imap.c -+++ b/imap/imap.c -@@ -532,8 +532,8 @@ int imap_open_connection (IMAP_DATA* idata) - { - #if defined(USE_SSL) - /* An unencrypted PREAUTH response is most likely a MITM attack. -- * Require a confirmation. */ -- if (!idata->conn->ssf) -+ * Require a confirmation unless using $tunnel. */ -+ if (!idata->conn->ssf && !Tunnel) - { - if (option(OPTSSLFORCETLS) || - (query_quadoption (OPT_SSLSTARTTLS, --- -GitLab - diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild deleted file mode 100644 index 5ca782116a8d..000000000000 --- a/mail-client/mutt/mutt-1.14.4-r1.ebuild +++ /dev/null @@ -1,273 +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 autotools - -PATCHREV="r0" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/" -MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" -SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz - https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" -# hcache: allow multiple, bug #607360 -REQUIRED_USE=" - hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - smime-classic? ( ssl !gnutls ) - smtp? ( ssl sasl ) - sasl? ( || ( imap pop smtp ) ) - kerberos? ( || ( imap pop smtp ) ) - autocrypt? ( gpgme )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# yes, we overdepend on the backend impls here, hopefully one day we can -# have REQUIRED_USE do what it is made for again. bug #607360 -CDEPEND=" - app-misc/mime-types - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) - ) - ) - - nls? ( virtual/libintl ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn2 ) - gpgme? ( >=app-crypt/gpgme-0.9.0:= ) - autocrypt? ( >=dev-db/sqlite-3 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2:0= ) -" -DEPEND="${CDEPEND} - 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 ) - smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) - pgp-classic? ( app-crypt/gnupg ) -" - -src_prepare() { - local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} - - # really unfortunate security fix of the day ... - eapply "${FILESDIR}"/${P}-no-imap-preauth-with-tunnel.patch - - if use !vanilla ; then - # apply patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - einfo "Patches for ${PATCHSET} patchset ${patchset}" - EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ - || die "patchset ${patchset} failed" - done - # add some explanation as to why not to go upstream - sed -i \ - -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ - main.c || die "Failed to add bug instructions" - fi - - local upatches= - # allow user patches - eapply_user && upatches=" with user patches" - - # patch version string for bug reports - local patchset= - use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" -} - -src_configure() { - local myconf=( - # signing and encryption - $(use_enable autocrypt) $(use_with autocrypt sqlite3) - $(use_enable pgp-classic pgp) - $(use_enable smime-classic smime) - $(use_enable gpgme) - - # features - $(use_enable debug) - $(use_enable doc) - $(use_enable nls) - - # protocols - $(use_enable imap) - $(use_enable pop) - $(use_enable smtp) - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - $(use_with sasl) - $(use_with idn idn2) --without-idn # avoid automagic libidn dep - $(use_with kerberos gss) - "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" - "$(use_with !slang curses "${EPREFIX}"/usr)" - - "--enable-compressed" - "--enable-external-dotlock" - "--enable-iconv" - "--enable-nfs-fix" - "--enable-sidebar" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" - "--without-bundled-regex" # use the implementation from libc - "--with-exec-shell=${EPREFIX}/bin/sh" - ) - - if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then - # arrows in index view do not show when using wchar_t - # or misalign due to wrong computations - myconf+=( "--without-wc-funcs" ) - fi - - # note: REQUIRED_USE should have selected only one of these, but for - # bug #607360 we're forced to allow multiple. For that reason, this - # list is ordered to preference, and only the first is taken. - local hcaches=( - "lmdb" - "qdbm" - "tokyocabinet" - "gdbm" - "berkdb:bdb" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - myconf+=( "--with-homespool=Maildir" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - insinto /etc/${PN} - if use mbox; then - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - doins "${FILESDIR}"/Muttrc - fi - - # include attachment settings, it's mandatory and shouldn't harm - # when not being referenced (index_format using %X) - { - echo - echo "# mandatory attachments settings, not setting these is a BUG!" - echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" - grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist - } >> "${ED}"/etc/${PN}/Muttrc - - # add setting to actually enable gpgme usage - if use gpgme || use autocrypt ; then - { - echo - echo "# this setting enables the gpgme backend (via USE=gpgme)" - # https is broken due to a certificate mismatch :( - echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" - echo "set crypt_use_gpgme = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # similar for autocrypt - if use autocrypt ; then - { - echo - echo "# enables autocrypt (via USE=autocrypt)" - echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" - echo "set autocrypt = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym ../mime.types /etc/${PN}/mime.types - - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " https://wiki.gentoo.org/wiki/Mutt" - echo - else - elog "The multiple fcc patch was dropped in favour of an implementation" - elog "from upstream. If you use the feature, review the new" - elog " \$fcc_delimiter" - elog "variable." - fi -} diff --git a/mail-client/mutt/mutt-1.14.5.ebuild b/mail-client/mutt/mutt-1.14.5.ebuild deleted file mode 100644 index 773c3c909520..000000000000 --- a/mail-client/mutt/mutt-1.14.5.ebuild +++ /dev/null @@ -1,265 +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 autotools - -PATCHREV="r0" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/" -MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" -SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz - https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" -# hcache: allow multiple, bug #607360 -REQUIRED_USE=" - hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - smime-classic? ( ssl !gnutls ) - smtp? ( ssl sasl ) - sasl? ( || ( imap pop smtp ) ) - kerberos? ( || ( imap pop smtp ) ) - autocrypt? ( gpgme )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# yes, we overdepend on the backend impls here, hopefully one day we can -# have REQUIRED_USE do what it is made for again. bug #607360 -CDEPEND=" - app-misc/mime-types - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) - ) - ) - - nls? ( virtual/libintl ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn2 ) - gpgme? ( >=app-crypt/gpgme-0.9.0:= ) - autocrypt? ( >=dev-db/sqlite-3 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2:0= ) -" -DEPEND="${CDEPEND} - 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 ) - smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) - pgp-classic? ( app-crypt/gnupg ) -" - -src_prepare() { - local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} - - if use !vanilla ; then - # apply patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - einfo "Patches for ${PATCHSET} patchset ${patchset}" - EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ - || die "patchset ${patchset} failed" - done - # add some explanation as to why not to go upstream - sed -i \ - -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ - main.c || die "Failed to add bug instructions" - fi - - local upatches= - # allow user patches - eapply_user && upatches=" with user patches" - - # patch version string for bug reports - local patchset= - use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" -} - -src_configure() { - local myconf=( - # signing and encryption - $(use_enable autocrypt) $(use_with autocrypt sqlite3) - $(use_enable pgp-classic pgp) - $(use_enable smime-classic smime) - $(use_enable gpgme) - - # features - $(use_enable debug) - $(use_enable doc) - $(use_enable nls) - - # protocols - $(use_enable imap) - $(use_enable pop) - $(use_enable smtp) - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - $(use_with sasl) - $(use_with idn idn2) --without-idn # avoid automagic libidn dep - $(use_with kerberos gss) - "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" - "$(use_with !slang curses "${EPREFIX}"/usr)" - - "--enable-compressed" - "--enable-external-dotlock" - "--enable-iconv" - "--enable-nfs-fix" - "--enable-sidebar" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" - "--without-bundled-regex" # use the implementation from libc - "--with-exec-shell=${EPREFIX}/bin/sh" - ) - - if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then - # arrows in index view do not show when using wchar_t - # or misalign due to wrong computations - myconf+=( "--without-wc-funcs" ) - fi - - # note: REQUIRED_USE should have selected only one of these, but for - # bug #607360 we're forced to allow multiple. For that reason, this - # list is ordered to preference, and only the first is taken. - local hcaches=( - "lmdb" - "qdbm" - "tokyocabinet" - "gdbm" - "berkdb:bdb" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - myconf+=( "--with-homespool=Maildir" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - insinto /etc/${PN} - if use mbox; then - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - doins "${FILESDIR}"/Muttrc - fi - - # include attachment settings, it's mandatory and shouldn't harm - # when not being referenced (index_format using %X) - { - echo - echo "# mandatory attachments settings, not setting these is a BUG!" - echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" - grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist - } >> "${ED}"/etc/${PN}/Muttrc - - # add setting to actually enable gpgme usage - if use gpgme || use autocrypt ; then - { - echo - echo "# this setting enables the gpgme backend (via USE=gpgme)" - # https is broken due to a certificate mismatch :( - echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" - echo "set crypt_use_gpgme = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # similar for autocrypt - if use autocrypt ; then - { - echo - echo "# enables autocrypt (via USE=autocrypt)" - echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" - echo "set autocrypt = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym ../mime.types /etc/${PN}/mime.types - - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " https://wiki.gentoo.org/wiki/Mutt" - echo - fi -} diff --git a/mail-client/mutt/mutt-1.14.7.ebuild b/mail-client/mutt/mutt-1.14.7.ebuild deleted file mode 100644 index 773c3c909520..000000000000 --- a/mail-client/mutt/mutt-1.14.7.ebuild +++ /dev/null @@ -1,265 +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 autotools - -PATCHREV="r0" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/" -MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" -SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz - https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" -IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" -# hcache: allow multiple, bug #607360 -REQUIRED_USE=" - hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - smime-classic? ( ssl !gnutls ) - smtp? ( ssl sasl ) - sasl? ( || ( imap pop smtp ) ) - kerberos? ( || ( imap pop smtp ) ) - autocrypt? ( gpgme )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# yes, we overdepend on the backend impls here, hopefully one day we can -# have REQUIRED_USE do what it is made for again. bug #607360 -CDEPEND=" - app-misc/mime-types - virtual/libiconv - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) - ) - ) - - nls? ( virtual/libintl ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn2 ) - gpgme? ( >=app-crypt/gpgme-0.9.0:= ) - autocrypt? ( >=dev-db/sqlite-3 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2:0= ) -" -DEPEND="${CDEPEND} - 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 ) - smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) - pgp-classic? ( app-crypt/gnupg ) -" - -src_prepare() { - local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} - - if use !vanilla ; then - # apply patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - einfo "Patches for ${PATCHSET} patchset ${patchset}" - EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ - || die "patchset ${patchset} failed" - done - # add some explanation as to why not to go upstream - sed -i \ - -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ - main.c || die "Failed to add bug instructions" - fi - - local upatches= - # allow user patches - eapply_user && upatches=" with user patches" - - # patch version string for bug reports - local patchset= - use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" - - # many patches touch the buildsystem, we always need this - AT_M4DIR="m4" eautoreconf - - # the configure script contains some "cleverness" whether or not to setgid - # the dotlock program, resulting in bugs like #278332 - sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" -} - -src_configure() { - local myconf=( - # signing and encryption - $(use_enable autocrypt) $(use_with autocrypt sqlite3) - $(use_enable pgp-classic pgp) - $(use_enable smime-classic smime) - $(use_enable gpgme) - - # features - $(use_enable debug) - $(use_enable doc) - $(use_enable nls) - - # protocols - $(use_enable imap) - $(use_enable pop) - $(use_enable smtp) - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - $(use_with sasl) - $(use_with idn idn2) --without-idn # avoid automagic libidn dep - $(use_with kerberos gss) - "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" - "$(use_with !slang curses "${EPREFIX}"/usr)" - - "--enable-compressed" - "--enable-external-dotlock" - "--enable-iconv" - "--enable-nfs-fix" - "--enable-sidebar" - "--sysconfdir=${EPREFIX}/etc/${PN}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" - "--without-bundled-regex" # use the implementation from libc - "--with-exec-shell=${EPREFIX}/bin/sh" - ) - - if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then - # arrows in index view do not show when using wchar_t - # or misalign due to wrong computations - myconf+=( "--without-wc-funcs" ) - fi - - # note: REQUIRED_USE should have selected only one of these, but for - # bug #607360 we're forced to allow multiple. For that reason, this - # list is ordered to preference, and only the first is taken. - local hcaches=( - "lmdb" - "qdbm" - "tokyocabinet" - "gdbm" - "berkdb:bdb" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - myconf+=( "--with-homespool=Maildir" ) - fi - - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - insinto /etc/${PN} - if use mbox; then - newins "${FILESDIR}"/Muttrc.mbox Muttrc - else - doins "${FILESDIR}"/Muttrc - fi - - # include attachment settings, it's mandatory and shouldn't harm - # when not being referenced (index_format using %X) - { - echo - echo "# mandatory attachments settings, not setting these is a BUG!" - echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2" - grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist - } >> "${ED}"/etc/${PN}/Muttrc - - # add setting to actually enable gpgme usage - if use gpgme || use autocrypt ; then - { - echo - echo "# this setting enables the gpgme backend (via USE=gpgme)" - # https is broken due to a certificate mismatch :( - echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme" - echo "set crypt_use_gpgme = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # similar for autocrypt - if use autocrypt ; then - { - echo - echo "# enables autocrypt (via USE=autocrypt)" - echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" - echo "set autocrypt = yes" - } >> "${ED}"/etc/${PN}/Muttrc - fi - - # A newer file is provided by app-misc/mime-types. So we link it. - rm "${ED}"/etc/${PN}/mime.types - dosym ../mime.types /etc/${PN}/mime.types - - # nuke manpages that should be provided by an MTA, bug #177605 - rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ - || ewarn "failed to remove files, please file a bug" - - if use !prefix ; then - fowners root:mail /usr/bin/mutt_dotlock - fperms g+s /usr/bin/mutt_dotlock - fi - - dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you are new to mutt you may want to take a look at" - elog "the Gentoo QuickStart Guide to Mutt E-Mail:" - elog " https://wiki.gentoo.org/wiki/Mutt" - echo - fi -} diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild index 89402e61c99d..5747c19c4da7 100644 --- a/mail-client/mutt/mutt-2.0.2.ebuild +++ b/mail-client/mutt/mutt-2.0.2.ebuild @@ -27,7 +27,7 @@ REQUIRED_USE=" autocrypt? ( gpgme )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # yes, we overdepend on the backend impls here, hopefully one day we can # have REQUIRED_USE do what it is made for again. bug #607360 CDEPEND=" diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index 6f45893fc2ae..a6ee30681847 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -2,11 +2,13 @@ DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f8 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 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f +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 diff --git a/mail-client/neomutt/neomutt-20201120.ebuild b/mail-client/neomutt/neomutt-20201120.ebuild index d45bb5419716..d25f26c5ada8 100644 --- a/mail-client/neomutt/neomutt-20201120.ebuild +++ b/mail-client/neomutt/neomutt-20201120.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} =~ 99999999$ ]]; then 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 ~x86" fi TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75 diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild new file mode 100644 index 000000000000..0903176798d7 --- /dev/null +++ b/mail-client/neomutt/neomutt-20201127.ebuild @@ -0,0 +1,148 @@ +# 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" +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/roundcube/Manifest b/mail-client/roundcube/Manifest index 5635ddc0cd88..6caae6e9e090 100644 --- a/mail-client/roundcube/Manifest +++ b/mail-client/roundcube/Manifest @@ -1,4 +1,6 @@ AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362 +DIST roundcubemail-1.4.9-complete.tar.gz 7043437 BLAKE2B a1b7c6e160d29f61e2ca9c25f725b55411cb52c0f0d00fc4b3dc2ab1eb0edf190176ec932a297d6052b34047673e5dfb8cb13ad3a7b8b755e9d8e9265fb85aa9 SHA512 c6395757544b85693e808234f3dc6baac618ba115fb2c9eefc309ee18e74b2fdfbc0af00ac2b3b980fdd2abc56eefde47b535cdf688cfd2a5ce975786aca6572 EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862 +EBUILD roundcube-1.4.9.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b MISC metadata.xml 888 BLAKE2B 08166287c0fc134f79884a6bd5cf96d67ab12a74422393d0ef8b4c89b588911e03d587f99bc62bff132494d021fc03b79fbe25a3a7e19ac9ae3107495f2d45c5 SHA512 c5522fd989d08c1de91aac7783e7fb8cbdf94669ca645357b58b3565ed604a52bf563d6417f28b6e2833ad51ee65ec4dfb76412ba88e1b280e346ad8d35b4f86 diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-1.4.9.ebuild new file mode 100644 index 000000000000..6d3b3ede4e45 --- /dev/null +++ b/mail-client/roundcube/roundcube-1.4.9.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit webapp + +MY_PN=${PN}mail +MY_PV=${PV/_/-} +MY_P=${MY_PN}-${MY_PV} + +DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface" +HOMEPAGE="https://roundcube.net" +SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz" + +# roundcube is GPL-licensed, the rest of the licenses here are +# for bundled PEAR components, googiespell and utf8.class.php +LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + +IUSE="change-password enigma ldap mysql postgres sqlite ssl spell" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +# this function only sets DEPEND so we need to include that in RDEPEND +need_httpd_cgi + +RDEPEND=" + ${DEPEND} + >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] + virtual/httpd-php + change-password? ( + dev-lang/php[sockets] + ) + enigma? ( + app-crypt/gnupg + ) + mysql? ( + || ( + dev-lang/php[mysql] + dev-lang/php[mysqli] + ) + ) + spell? ( dev-lang/php[curl,spell] ) +" + +S="${WORKDIR}/${MY_P}" + +src_install() { + webapp_src_preinst + + dodoc CHANGELOG INSTALL README.md UPGRADING + + insinto "${MY_HTDOCSDIR}" + doins -r [[:lower:]]* SQL + doins .htaccess + + webapp_serverowned "${MY_HTDOCSDIR}"/logs + webapp_serverowned "${MY_HTDOCSDIR}"/temp + + webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php + webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt" + + webapp_src_install +} + +pkg_postinst() { + webapp_pkg_postinst + + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "You can review the post-upgrade instructions at:" + elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt" + fi +} |