summaryrefslogtreecommitdiff
path: root/net-mail
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-30 11:44:06 +0100
commitf516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree8bfecb640b7b6403d7a3d662d923eed630033da7 /net-mail
parent1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
gentoo resync : 30.05.2020
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/Manifest.gzbin15402 -> 15406 bytes
-rw-r--r--net-mail/courier-imap/Manifest2
-rw-r--r--net-mail/courier-imap/courier-imap-5.0.10.ebuild255
-rw-r--r--net-mail/dovecot/Manifest4
-rw-r--r--net-mail/dovecot/dovecot-2.3.10.1.ebuild288
-rw-r--r--net-mail/dovecot/dovecot-2.3.7.2.ebuild2
-rw-r--r--net-mail/email/Manifest2
-rw-r--r--net-mail/email/email-3.1.3-r1.ebuild21
-rw-r--r--net-mail/email/files/email-3.1.3-fno-common.patch32
-rw-r--r--net-mail/isync/Manifest4
-rw-r--r--net-mail/isync/isync-1.3.1.ebuild2
-rw-r--r--net-mail/isync/isync-9999.ebuild2
-rw-r--r--net-mail/mailutils/Manifest2
-rw-r--r--net-mail/mailutils/mailutils-3.9.ebuild2
-rw-r--r--net-mail/mboxgrep/Manifest5
-rw-r--r--net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch11
-rw-r--r--net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch20
-rw-r--r--net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild42
-rw-r--r--net-mail/mboxgrep/metadata.xml3
-rw-r--r--net-mail/mu/Manifest2
-rw-r--r--net-mail/mu/mu-1.4.1.ebuild2
-rw-r--r--net-mail/notmuch/Manifest3
-rw-r--r--net-mail/notmuch/notmuch-0.29.3-r1.ebuild2
-rw-r--r--net-mail/notmuch/notmuch-0.29.3-r2.ebuild230
-rw-r--r--net-mail/qmailadmin/Manifest2
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.16.ebuild2
-rw-r--r--net-mail/smtptools/Manifest4
-rw-r--r--net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch12
-rw-r--r--net-mail/smtptools/files/smtptools-0.2.3-fno-common.patch11
-rw-r--r--net-mail/smtptools/smtptools-0.2.3-r1.ebuild28
-rw-r--r--net-mail/vpopmail/Manifest2
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild2
32 files changed, 977 insertions, 24 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 2d6d64dc8f1d..807fe5ed9530 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
Binary files differ
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index a5f2d3d8b30c..877bd15713cb 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -20,8 +20,10 @@ AUX courier-imapd-r1.service 299 BLAKE2B 7b1fb3acc3b75cac873967f1eca099e9f65951f
AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c528f8f67271fb690deb6905e2638a7fb22ea7c2c3133edc510185684e9297c53aabc8c7ec628ec51d920857e9e11b SHA512 431a1113cbc10aa4042c621fda43eabaed79b4e0fabbc4692073c92368448324f958d3ad922b99b4290efad8a8164aff3698ac69e4e3c1f457d1616f769c11e5
AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
+DIST courier-imap-5.0.10.tar.bz2 3324560 BLAKE2B f59034184c6423ba4c8a238e1756e431bc240a5e80db5abc62af10eb776446f7c6afcba2935dfd49a7cf5dfec83087f3cdfe98785b13faa23287b0c6d24a9bd9 SHA512 7b1bd179fb7d9ed99ea4a92414e13d1313d10239bd1d7ddef76d17bb618e6dfd5d51f11d1fdb2fcd6a204a5000e3756ecb30aa2c791c6063ab3991dde65a3590
DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
+EBUILD courier-imap-5.0.10.ebuild 7241 BLAKE2B 6ce8c2e5da5c49ac653e62174937688b17663d19632920fc04c6d27675dc2878699f9f37075c2ca530a1fd4a5d5d48f74d78df8d7a4ce1a1c93d784d72aa0a4d SHA512 de16c3a52f8821f2ec9496209be0946df8149e605a3f9894ace4634253f2a2a18525e62eb5f4ad8fe5c1b62e99ffb623b28129a0331c6fe5237d45b7d658fff1
EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B b837f5e1fa3bc6bff54dfa3d2138ddc6ce951dcfcd5fbae2181a02eb1436dc25ce3f902eb05a80f29412a45dd593adc7f1618a4dd733727d0c1e793f2268654e SHA512 269e8c6810978ddfd59c768b591ae88d4ab31af6aa2e0e8a0a05913bd8afcbf754e279d090d8facbe6cc8cb4c81f5b17f76704c972e4694ca0042111732a9438
EBUILD courier-imap-5.0.8.ebuild 7234 BLAKE2B 85d1b623155d06c51cb34c07d39b056688b591b7c496c0793112c477bc1051585386ba6783a761e76cb6fe2f71383ab3e2251b43823e2d8cc98b827646eaa3b3 SHA512 79d89096d502a8491cc5add10a108000a19a282fb746e12314d11ed5a29bd3623bdf208b0cbf4ccf741db2db47d170ff19cae069ec4b224011095f7580b28e7d
MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-5.0.10.ebuild b/net-mail/courier-imap/courier-imap-5.0.10.ebuild
new file mode 100644
index 000000000000..3d9b947d0c64
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.0.10.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/imap/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+ gnutls? ( net-libs/gnutls[tools] )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ >=net-libs/courier-authlib-0.66.4
+ >=net-libs/courier-unicode-2
+ >=net-mail/mailbase-0.00-r8
+ net-dns/libidn:=
+ berkdb? ( sys-libs/db:= )
+ fam? ( virtual/fam )
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
+DEPEND="${CDEPEND}
+ dev-lang/perl
+ !mail-mta/courier
+ userland_GNU? ( sys-process/procps )
+"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+ !mail-mta/courier
+ !net-mail/bincimap
+ !net-mail/cyrus-imapd
+ !net-mail/uw-imap
+"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
+ "${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+ "${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
+)
+
+src_prepare() {
+ default
+
+ # These patches should fix problems detecting BerkeleyDB.
+ # We now can compile with db4 support.
+ if use berkdb ; then
+ eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+ eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=""
+
+ # Default to gdbm if both berkdb and gdbm are present.
+ if use gdbm ; then
+ einfo "Building with GDBM support"
+ myconf="${myconf} --with-db=gdbm"
+ elif use berkdb ; then
+ einfo "Building with BerkeleyDB support"
+ myconf="${myconf} --with-db=db"
+ fi
+
+ if use trashquota ; then
+ einfo "Building with Trash Quota Support"
+ myconf="${myconf} --with-trashquota"
+ fi
+
+ use debug && myconf="${myconf} debug=true"
+
+ econf \
+ --with-notice=unicode \
+ --disable-root-check \
+ --bindir=/usr/sbin \
+ --sysconfdir="/etc/${PN}" \
+ --libexecdir="/usr/$(get_libdir)/${PN}" \
+ --localstatedir="/var/lib/${PN}" \
+ --with-authdaemonvar="/var/lib/${PN}/authdaemon" \
+ --enable-workarounds-for-imap-client-bugs \
+ --with-mailuser=mail \
+ --with-mailgroup=mail \
+ --with-certsdir="/etc/courier-imap" \
+ $(use_with fam) \
+ $(use_with ipv6) \
+ $(use_with gnutls) \
+ ${myconf}
+}
+
+#src_compile() {
+ # spurious failures with parallel compiles, bug #????
+# emake -j1
+#}
+
+src_install() {
+ dodir "/var/lib/${PN}" /etc/pam.d
+ keepdir /var/lib/courier-imap
+
+ default
+ rm -r "${D}/etc/pam.d" || die
+
+ # Avoid name collisions in /usr/sbin wrt imapd and pop3d
+ for name in imapd pop3d ; do
+ mv "${D}/usr/sbin/"{,courier-}${name} \
+ || die "failed to rename ${name} to courier-${name}"
+ done
+
+ # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+ # 'Maildir', and to use /usr/sbin/courier-foo names.
+ for service in {imapd,pop3d}{,-ssl} ; do
+ sed -e 's/Maildir/${MAILDIR}/' \
+ -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+ || die "sed failed"
+ sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+ -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+ || die "sed failed"
+ done
+
+ # Rename the config files correctly and add a value for ${MAILDIR}
+ # to them.
+ for service in {imapd,pop3d}{,-ssl} ; do
+ mv "${D}/etc/${PN}/${service}"{.dist,} \
+ || die "failed to rename ${service}.dist to ${service}"
+ echo -e '\n# Hardwire a value for ${MAILDIR}' \
+ >> "${D}/etc/${PN}/${service}"
+ echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
+ echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
+ done
+
+ for service in imapd pop3d ; do
+ echo -e '# Put any program for ${PRERUN} here' \
+ >> "${D}/etc/${PN}/${service}"
+ echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
+ echo -e '# Put any program for ${LOGINRUN} here' \
+ >> "${D}/etc/${PN}/${service}"
+ echo -e '# this is for relay-ctrl-allow in 4*' \
+ >> "${D}/etc/${PN}/${service}"
+ echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
+ done
+
+ for x in "${D}/usr/sbin"/* ; do
+ if [[ -L "${x}" ]] ; then
+ rm "${x}" || die "failed to remove ${x}"
+ fi
+ done
+
+ mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
+ mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
+
+ rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
+
+ dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+ dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+
+ for initd in courier-{imapd,pop3d}{,-ssl} ; do
+ sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+ "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
+ > "${T}/${initd}" \
+ || die "initd libdir-sed failed"
+ doinitd "${T}/${initd}"
+ done
+
+ cp "${FILESDIR}"/courier-*-r1.service .
+
+ sed -i \
+ -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+ courier-*-r1.service \
+ || die
+
+ systemd_newunit courier-authdaemond-r1.service \
+ courier-authdaemond.service
+ systemd_newunit courier-imapd-ssl-r1.service \
+ courier-imapd-ssl.service
+ systemd_newunit courier-imapd-r1.service \
+ courier-imapd.service
+
+ exeinto "/usr/$(get_libdir)/${PN}"
+ for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+ sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+ "${FILESDIR}/${PN}-${RC_VER}-${exe}" \
+ > "${T}/${exe}" \
+ || die "exe libdir-sed failed"
+ doexe "${T}/${exe}"
+ done
+
+ # Avoid a collision with mail-mta/netqmail, bug 482098.
+ mv "${D}/usr/sbin/"{,courier-}maildirmake \
+ || die "failed to rename maildirmake to courier-maildirmake"
+ mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
+ || die "failed to rename maildirmake.1 to courier-maildirmake.1"
+
+ dodoc AUTHORS INSTALL NEWS README ChangeLog
+ readme.gentoo_create_doc
+ dodoc "${FILESDIR}/${PN}-gentoo.readme"
+ docinto imap
+ dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
+ docinto maildir
+ dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
+ docinto rfc2045
+ dodoc libs/rfc2045/*.html
+ docinto tcpd
+ dodoc libs/tcpd/README* libs/tcpd/*.html
+ exeinto /etc/cron.monthly
+ newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+pkg_postinst() {
+ # Some users have been reporting that permissions on this directory were
+ # getting scrambled, so let's ensure that they are sane.
+ fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
+
+ readme.gentoo_print_elog
+
+ elog ""
+ elog "Courier Imap now run as user mail:mail."
+ elog ""
+ elog "This require you to enable read/write access to the caches:"
+ elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+ elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 6e4fd3f24c4d..7ad774fcf292 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -5,11 +5,13 @@ DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c71
DIST dovecot-2.3-pigeonhole-0.5.10.tar.gz 1899237 BLAKE2B a308500d6a51d4a9b99ae16b75829f1f799351675a31d91e450c4ea1b095d7719af424534f4b7736559b06819a337e7be0bd44307b77a775c8a54359e41822c1 SHA512 f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b
DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
DIST dovecot-2.3-pigeonhole-0.5.9.tar.gz 1897060 BLAKE2B 73b9abd0a7ea9468f7880fdd0d0471c5825f341c7297807c404ce50a8792f821d2599840ce9eb2705a118a0ee078aafad9f4f6eb64a02fbcb3b0f89c00042ada SHA512 1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8
+DIST dovecot-2.3.10.1.tar.gz 7226958 BLAKE2B 2f9223d9184b3f8809b573ebd5637e1fd32885a377d95284bbf6d0d975b61462e351d42c515ca860a2348e39634ff440cb58dc6894008782a0e7d5a4dead4d77 SHA512 5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06
DIST dovecot-2.3.10.tar.gz 7222241 BLAKE2B 4ffc95c3a52c9287603d19fb91fbc8418d4c37bbc82f30e5026eb5888705a07fc1903b0571d4b4cb1c8ca74bf373acc931129803ca2ad91cb085e92a483a684c SHA512 73e10d7d1e616d6599eb53f2d2d1ac0f0f2e6e84019faac5cd525e833da44839a7e483635b61d432e3254a9e5f6f90915bec8940c584210341085241949dffa2
DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
DIST dovecot-2.3.9.3.tar.gz 7181682 BLAKE2B 3ef9c50ea2b9d2f8a5d953e373baaf5d880ae4c93dbe773ce267784ded207fb338959a334aa12a449f8d39eb51284318de317d8953a56a0f7f016199769be809 SHA512 e39dc825a03f009928b67d01747bb70487fbec155e6be5109037db67b78301aa761db432f7355e96d927abf30c68f0116a5f2cf518b9eebf7f5c7806ac00ae41
EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
+EBUILD dovecot-2.3.10.1.ebuild 8629 BLAKE2B 4d664f1ff75b846a2be7dcca52b7189efac3c6f95e40a0af935dd16f857c51db53aa72023e94b4ae86a5bf892475fd4259dc5085ea41a5053b702ced5b2725cd SHA512 d783676c087faaa047de828eb6a38f21a4512e81cea4a1dcb03d4e852518cb520cfa66d88540a63c3805fdc1144f4895d8a4db8269c3bbf93691bcea080dcbec
EBUILD dovecot-2.3.10.ebuild 8559 BLAKE2B 2141f843fe5dfc30a962e3c133febc9737f475a014c9b78218b6da1867b5361e06b88c116f509709c12528c1307e4b845c7b82133361618ba45ae0b5ad0e546c SHA512 271d8b26753d7c045efc7ff4e57133f165aa40bf9b3d4e4ec08fed789973158b5e7d72c646618030587d88fa9a4bf0f6ed0fe3a69f86fc69942937248b76434a
-EBUILD dovecot-2.3.7.2.ebuild 8716 BLAKE2B 012fa283631821ca7843a83256a61972ea5b24edf959fb94b493ee0f15e7a1c585149d699d1c4d84dd70a4f90eb9164ce9dc39e0f13f26ebba40a86008289bd0 SHA512 74cfc3d1208a4b3b64c3fea0c588fd34bba5763663ce6497a9df4c0db4564288f342d476d59d47fc5fd4e4de20334445ad81f2d4614ed9947e98123ca3664fad
+EBUILD dovecot-2.3.7.2.ebuild 8717 BLAKE2B 2aef6fffe859d0965f3e809739cdec16165fc4935cda3eae6ea89dce803366ac7fb0ad0dd1a95b3a4ee040a2be61cb44e58e61fb44feb47d0ef9e3496febe30e SHA512 3412f9224528f4872777d580e352e8cd679b7d1a9f88a20594e56358cd026f74343b624205e8ea0972ead3b3c9157a8061ddc7c3181c183fb6caf1d1c2f2f515
EBUILD dovecot-2.3.9.3.ebuild 8582 BLAKE2B 79555db7ab810bde05be9c228f1461f1266e9836d5fa8b52017ca531652d6ee3441987a16fb9fba91d2ce0a21112d1ca3aace395826349d52756b646d82d88f5 SHA512 c5f582ebffcc0c26d45998d2ade62710b3c6aa348cdfc22a159b8e5bb686f2b32cc6f6137cd7d93450f6eea546c8f807debd5f9676a134b662bb9bd602c396ed
MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.3.10.1.ebuild b/net-mail/dovecot/dovecot-2.3.10.1.ebuild
new file mode 100644
index 000000000000..d8f21727e299
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.10.1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# do not add a ssl USE flag. ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.10"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+ bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua:* )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ suid? ( acct-group/mail )
+ tcpd? ( sys-apps/tcp-wrappers )
+ textcat? ( app-text/libexttextcat )
+ unwind? ( sys-libs/libunwind )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ acct-group/dovecot
+ acct-group/dovenull
+ acct-user/dovecot
+ acct-user/dovenull
+ net-mail/mailbase"
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+}
+
+src_prepare() {
+ default
+ # bug 657108
+ elibtoolize
+ #eautoreconf
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --with-rundir="${EPREFIX}/run/dovecot" \
+ --with-statedir="${EPREFIX}/var/lib/dovecot" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --disable-rpath \
+ --without-libbsd \
+ --with-icu \
+ --with-ssl \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $( use_with argon2 sodium ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with lua ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with textcat ) \
+ $( use_with unwind libunwind ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="${S}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install() {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+ -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+ "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+ # Install SQL configuration
+ if use mysql || use postgres; then
+ sed -i -e \
+ 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+ "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+ 10-auth.conf"
+ fi
+
+ # Install LDAP configuration
+ if use ldap; then
+ sed -i -e \
+ 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update ldap settings in 10-auth.conf"
+ fi
+
+ if use vpopmail; then
+ sed -i -e \
+ 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update vpopmail settings in 10-auth.conf"
+ fi
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake DESTDIR="${ED}" install
+ sed -i -e \
+ 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+ || die "failed to update sieve settings in 15-lda.conf"
+ rm -rf "${ED}"/usr/share/doc/dovecot
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.conf
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+ use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+ docinto sieve/rfc
+ dodoc doc/rfc/*.txt
+ docinto sieve/devel
+ dodoc doc/devel/DESIGN
+ docinto plugins
+ dodoc doc/plugins/*.txt
+ docinto extensions
+ dodoc doc/extensions/*.txt
+ docinto locations
+ dodoc doc/locations/*.txt
+ doman doc/man/*.{1,7}
+ fi
+
+ use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ einfo "Creating SSL certificate"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+ install_cert /etc/ssl/dovecot/server
+ fi
+
+ elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index 27e33eb9b55e..dcbc6f0840d2 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index 4aa9ccf49ff6..bbd578ac0c10 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,3 +1,5 @@
+AUX email-3.1.3-fno-common.patch 560 BLAKE2B c592ea54a13089e65cb6fd6bdcb80438f8a0f7f8734149b0b8f58649a94eb17f5cb4e87f96131e2d03ad8dc057a5c4f1bab71b64d071ec0ea565622d4d5ca834 SHA512 34bee203fa588e6ba785c331208086448b39c4bb4725b04166a165980e8b5b4c1e5d0bb87a59b540a7df0f0a3b88dd0427e715c736ef443bcb40eb3a3495f6d9
DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
+EBUILD email-3.1.3-r1.ebuild 447 BLAKE2B 471538835dad9a4e1230771cdc6635984735cc7b70aa5cf1345f2ef9145e030dc31742e571b149ba5a17e07997b84ba1e0ce03ee1cd01f8ec7cd85eb67883d13 SHA512 a2a96961d82f57aa9544b0a347e75c76f7f55af1a968aea2ccf4ea8453b93a9ee466c774ac0737cff952b84df372746de9c8dc153eb79c44679d6fad3732cb32
EBUILD email-3.1.3.ebuild 556 BLAKE2B eab248d080b827b2526f6d0284310b0f66e2f3cdc24be511efb387b4b5e3a95d47d2360037115108f9810706d9c29153c0f73c2e27e68325b36578dc37810eb7 SHA512 c7c11d031d578bf3b5423cf1125ccb469515ecbb8be3b10afcd93f7741a864d535a546be6ec0c2ced2c9fd672a9985e10dd95b00140969210e576d24e74be5ce
MISC metadata.xml 259 BLAKE2B 340db8ab484f8fe7b7a74af660d7ef8f4d99d98b2feaaa02836808ef6da6176f6c15ea5525a097b8556d434a4c8d6a6c49d97a1deb1376edac3220b4d9a07208 SHA512 be960a9ee308ff2013fbd23ae68a484a273afb04a49490859d0bd5f01e21d176937386bb2704b6dba5599ae3c71f5c91c995a46dbb162b0925c41a025567ed81
diff --git a/net-mail/email/email-3.1.3-r1.ebuild b/net-mail/email/email-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..e8b2a103b89f
--- /dev/null
+++ b/net-mail/email/email-3.1.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Advanced CLI tool for sending email"
+HOMEPAGE="https://github.com/deanproxy/eMail"
+SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~x86"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.3-fno-common.patch
+)
+
+src_install() {
+ default
+ doman email.1
+ dodoc README TODO
+}
diff --git a/net-mail/email/files/email-3.1.3-fno-common.patch b/net-mail/email/files/email-3.1.3-fno-common.patch
new file mode 100644
index 000000000000..ecbc43d34137
--- /dev/null
+++ b/net-mail/email/files/email-3.1.3-fno-common.patch
@@ -0,0 +1,32 @@
+--- a/include/email.h
++++ b/include/email.h
+@@ -61,11 +61,11 @@
+
+
+ /* Globally defined vars */
+-dhash table;
+-char *conf_file;
+-dstrbuf *global_msg;
++extern dhash table;
++extern char *conf_file;
++extern dstrbuf *global_msg;
+
+-struct mailer_options {
++extern struct mailer_options {
+ bool verbose;
+ bool encoding;
+ short html;
+--- a/src/email.c
++++ b/src/email.c
+@@ -40,6 +40,11 @@
+ #include "error.h"
+ #include "mimeutils.h"
+
++dhash table;
++char *conf_file;
++dstrbuf *global_msg;
++struct mailer_options Mopts;
++
+ static void
+ defaultDestr(void *ptr)
+ {
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 2b879adb2267..7530297beeea 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,4 +1,4 @@
DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2
-EBUILD isync-1.3.1.ebuild 845 BLAKE2B 5ebdb96732a4cf424dee5bb149b939748cec6b0324bd1f0ee9b65124499357c22a5f30116973848150807c4fb5f2e74d8f0a803612927bd96f57a759968cb97b SHA512 ad2cd3affdaf1697188ce60d2d00934f0315b3f1fc4041923e18f95451bd481f95601e3810529cc9b9f5e877dc974a8bee242fed8090b16beaa054e869f22d49
-EBUILD isync-9999.ebuild 847 BLAKE2B 48d95904f5ffdaae8199b0a122adcb497129faef094cec4fce61f969def88b23b0b58860e6ea3fc11d64459ddfc3b389afa692b037977c25e3438942e59e83c9 SHA512 993d8e67255b4c2044cabb1d7a85eaaf248816e9d88d399b2f2b292fbcb85ae3697fceee191efa28caaabc2b5dcf733f795101d0c4bf272ba504ab7940c704e5
+EBUILD isync-1.3.1.ebuild 852 BLAKE2B 5ed49393e6cd36e1c1a88dc88d8a26aac2378d39e757e43b9e27751343b42531090b237dd6729a73bc905ed69f5fdbd127fcc34256f4a388d597fda9e4b54bdc SHA512 3ae888d15a1996547d6e800517f96f989bc8b8a5dd0a62e563543b77e05edf52b5c977aaba1c269c83cfab66ebeac114a53b8662ec872963b87ef86cd5d6b246
+EBUILD isync-9999.ebuild 854 BLAKE2B 12d717502cb4c647106399554d30c5c33faa5bfb29672a79357107ad1905aa40aa59f42d2bfe444f5194f052c6645621fe53399979821f9e8ef595553fd44b5a SHA512 3d4cbae637c0ec0459c81068ba849c1cd813389cb70ab5eecf324ee245540b8d8215cf8e965e8326767a3fd4fcf45404f0ce7af0be9f22b7e123ae5f480a800e
MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f
diff --git a/net-mail/isync/isync-1.3.1.ebuild b/net-mail/isync/isync-1.3.1.ebuild
index 83a9098db3da..0cdbe37f5f62 100644
--- a/net-mail/isync/isync-1.3.1.ebuild
+++ b/net-mail/isync/isync-1.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3 autotools
else
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~ppc x86"
+ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
fi
IUSE="libressl sasl ssl zlib"
diff --git a/net-mail/isync/isync-9999.ebuild b/net-mail/isync/isync-9999.ebuild
index c9d9c4a0112f..c910f9673b0a 100644
--- a/net-mail/isync/isync-9999.ebuild
+++ b/net-mail/isync/isync-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3 autotools
else
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
IUSE="libressl sasl ssl zlib"
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index ae341bc115d1..f3515193c4e6 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -12,5 +12,5 @@ AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655
DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
DIST mailutils-3.9.tar.xz 3075268 BLAKE2B 43ee5bf297951b3c894b467a46d3983dac3e115c02169da0ee2ccbc23f8b71d7439083093f4b0710f19c78f108df99dee3310f5f6adc5b7c1792a0a7be33aab6 SHA512 1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4
EBUILD mailutils-3.8.ebuild 3728 BLAKE2B d09f95b50dab9521553121380f839d30babf0c00c607051c73f8c0a6db58f04dbc17219536ac1d8d445df5185869b4fa8d315b939006b5fad8d786d599be447c SHA512 4add163fc3f0d120fcb75405858f993f36ed1e44bbb5fa3f40221e18653aea750bb0a9ac35026755a3bf160ce046d95ad98bf0f7b13ec0488461b1f0c8c7f4c6
-EBUILD mailutils-3.9.ebuild 3741 BLAKE2B 29e29b6c2d8004b5fc068d3eb8cef0535a82ec852f4ec9f9b4ac54381a640c834765184b903563e52428ce757ab9dac4be53f4e2e5015f97e351a773152631bf SHA512 8cda64711c04bd89ea8355ec5c333eceab3db2510894940b53a8967294afc2dc8cc39b258ab51eeee76c1942646262300dc8814c48f40f4984ad3caf7e680f09
+EBUILD mailutils-3.9.ebuild 3738 BLAKE2B a959d5ca05b8a24fb63901786097cd5800e2a2d7463ed37d3da7314c6870cd81b7e7792ac45b40d232512c5b6269cb7966ed2e32419f355f6f3557e9363d1bf3 SHA512 e061d70556e3ada490b43769a9f60b6d77cb9c86dc53e1853d3a32831082a665b2d979cfa1c5c899a929108ac8c316e46c05fcce993104c6395ed832f926b2a8
MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.9.ebuild b/net-mail/mailutils/mailutils-3.9.ebuild
index 533d9f7d249f..fb217b298014 100644
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ b/net-mail/mailutils/mailutils-3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
tokyocabinet"
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index a3f2ff50ede4..c5484c6f9aba 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -1,4 +1,7 @@
+AUX mboxgrep-0.7.9-_DEFAULT_SOURCE.patch 402 BLAKE2B d517138fd5b6a50846886705f0663483dbcfc7e7b347808bc3e88e8b7f1962069bf6a2be84736b328deb965aaeab3d7c33fa3dc1d3c62e92832a3ebc109449cd SHA512 121d63057e3e18520d1a9d799102116a2894c5cd5ea65d6aa6142313f7da712c998ca316639f4f896c255aae6f2fafff565176ebac6298700b57fb6f41d62664
+AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a382fd34bf94ce01753f7db6caaf1a1a1af8ca63682a329de3afc16885a4e0676eddd886227869fda4971cd383ffef783d SHA512 8208a760372f94562ed118e0a7b65a0d7c58291aba5898bd4b951acfddf001f076fea4cf3cae253fba298481e4d684645eca5772bdd71606228d0d06c2c68441
AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
EBUILD mboxgrep-0.7.9-r1.ebuild 561 BLAKE2B d3e18ee1d573f6d9187d1897c0d28c4d4a9b31217a4f0c3baa723a250482c2b371fda8c01d95c13c22feec8796d3dcedf919046f831d68efb30d4b826ef53b53 SHA512 ebbb369bcd0974941e37c657b1d3e943e10436538bd35b5058f4ee9a6b0f7653851be962675e89da9f7258664f6aacb3cbfac718615dcfc616a4d508d821c4ca
-MISC metadata.xml 245 BLAKE2B 4b93589a8a73efb60967e4ba0102a586cd02498c0deeeeecc02dca9b11feddfe6842b90d19157d74daf909d124161b73f10f12f46ec4e2989dd2648b6b703c70 SHA512 bcd6489344b1d3d87ddea6a9a7ea086bc2cb3e22c6c3697e408c7df6818cf41abd2f5365dacd91fd4f5e66638b32e4ddd51604ee273ee5adfb7eb4e60f44d867
+EBUILD mboxgrep-0.7.9-r2.ebuild 770 BLAKE2B 4c033bf6d0e4d46062aadd5552f1ba5a60565686948fbc676dcc8ad9a7e2cdc6e409f812a9404fab1c66fe2a5a70210047a3f430389173c1260a31961d19e099 SHA512 cee11e03166ebd31eb8b7ab42396ddb5c584ab212133ba56f6575cfc1db06030007cf07ebd37595ca99d83ca933943b12eae150ac88051ea28b60a5c41fdb1a6
+MISC metadata.xml 337 BLAKE2B 278e5cc4a7081de0b6f8cbbba8f25d762014c869676683b41dcd74a1fb9ec8bdf73d412652dc867117204ce9d509a6a79f496aa22e69a65f234e4323f8059a14 SHA512 ab0f3ce2bfd3a959ef8132b4ad3b578cc71e3714002ec7433ff68084926176792eca1b319062878fbe984487514324d228b3d75065ae13747e1b22f1aa898d72
diff --git a/net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch b/net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch
new file mode 100644
index 000000000000..fe7ffec2d578
--- /dev/null
+++ b/net-mail/mboxgrep/files/mboxgrep-0.7.9-_DEFAULT_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -19,7 +19,7 @@
+ $Id: misc.c,v 1.13 2003/04/06 21:01:49 dspiljar Exp $ */
+
+ #define _XOPEN_SOURCE /* Pull in strptime(3) from time.h */
+-#define _BSD_SOURCE /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
++#define _DEFAULT_SOURCE /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
+ * from string.h. */
+
+ #include <config.h>
diff --git a/net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch b/net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch
new file mode 100644
index 000000000000..09c8388998cb
--- /dev/null
+++ b/net-mail/mboxgrep/files/mboxgrep-0.7.9-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/mboxgrep.h
++++ b/src/mboxgrep.h
+@@ -129,6 +129,6 @@
+ }
+ option_t;
+
+-option_t config;
++extern option_t config;
+
+ #endif /* MBOXGREP_H */
+--- a/src/main.c
++++ b/src/main.c
+@@ -57,6 +57,7 @@
+ int count = 0;
+ void *tmpp;
+ checksum_t *cs;
++option_t config;
+
+ int
+ main (int argc, char **argv)
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
new file mode 100644
index 000000000000..5e42763bd887
--- /dev/null
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Grep for mbox files"
+SRC_URI="mirror://sourceforge/mboxgrep/${P}.tar.gz"
+HOMEPAGE="https://datatipp.se/mboxgrep/"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dmalloc"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libpcre
+ sys-libs/zlib
+ dmalloc? ( dev-libs/dmalloc )
+"
+DEPEND="
+ ${RDEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_configure() {
+ econf \
+ $(use_with dmalloc no yes)
+}
+
+src_install() {
+ emake \
+ prefix="${D}"/usr \
+ mandir="${D}"/usr/share/man \
+ infodir="${D}"/usr/share/info \
+ install
+ dodoc ChangeLog NEWS TODO README
+}
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index dff8618ac7eb..63436f59f911 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/metadata.xml
@@ -2,6 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+<use>
+<flag name='dmalloc'>Enable debugging using <pkg>dev-libs/dmalloc</pkg></flag>
+</use>
<upstream>
<remote-id type="sourceforge">mboxgrep</remote-id>
</upstream>
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 82dc4b653dfa..6f191889c808 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -11,6 +11,6 @@ EBUILD mu-1.0-r1.ebuild 1778 BLAKE2B 85c611bc38bb40c202d3b39fe2d8a2e0fc3ee1c1aa5
EBUILD mu-1.3.5-r1.ebuild 1962 BLAKE2B 68dfb86a7ca8877c1ab359f3d82857809c2267aca5c49ef7666d86692f9d23522671cfdd454edb1217c613521ef0576a7053b6d14d64de9b2adc2c21885ea7ff SHA512 0bb512962ab230941b25ad7a962430c3a1c1cf8812405c78bed5cfbb31959aeac176a863b6014ea84acfd73dd14a539d04c2cb7de267ceaa8f41a6ba815b74cb
EBUILD mu-1.3.6-r1.ebuild 2029 BLAKE2B 06f2f1e5c73faeef1e45e7b3331e1aa6354b092f8d9daa893871aed2d5f301373feb7832229fcd04552cf155863a1c62e74521df1d6d48bff19716a0330b62e6 SHA512 5b32ea81343b7735c48d31cd6eba23f3b865c39e3e181d7268ec17a8ae8f458e7d3bea45195fee30728b8031434ba529e9adfab8b2395c9ea06d57b4c7e56847
EBUILD mu-1.3.6-r2.ebuild 2040 BLAKE2B 102104b3d404a8b50ee6696baae778b7b3804117882c9c73f1c83e7dcdc813c07b656f6c048c7adf99e4dbb7e4fd46e8453a8b703f811cc0440e454d9712478a SHA512 8e81d83618b663cc894fe8be870a0bb76e0f502e42c08f59a9dd7736fd0b38fda116db2b81e53b826994a63dd3c278221ba2c676b2da270ab1944d72f0b82373
-EBUILD mu-1.4.1.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
+EBUILD mu-1.4.1.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
EBUILD mu-1.4.4.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.1.ebuild b/net-mail/mu/mu-1.4.1.ebuild
index 99919703af77..fe038e53b674 100644
--- a/net-mail/mu/mu-1.4.1.ebuild
+++ b/net-mail/mu/mu-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="emacs guile mug"
DEPEND="
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a830d466de5f..b1b70f6601ec 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,6 +2,7 @@ AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45ad
AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
-EBUILD notmuch-0.29.3-r1.ebuild 5019 BLAKE2B 8f9be696f72862207f3cc8556bd2fbe10e9848dedc7a0c383e3d52369bd1914a06439ee6f1167f76cc521bdd5dc7deccbedfb47979df3d785e09076671c694f9 SHA512 ae718ef39d4a8af974a31ae02b9c0752775a83ca3030eca377c5fda432448a2ab48025a05130aea911a7ec828ab85b1fcb5dff5ce1c419d4d88dd3b3fa2dde6d
+EBUILD notmuch-0.29.3-r1.ebuild 5026 BLAKE2B 015b1cb24b296cf51eae62d5176e72d44c2029e3a85acb69cf72d34027715490ffa704a76ab6a64cca46f089ca28b9688e7357ec309e60ee4366eadb274da883 SHA512 57948e08f46a840d3961936c5249f930ad8604ff43a1235dce954d0b55c307fe5e30234e02c738772a42ae508a689a7cd42b5b70c56a65c1b8d0d790d65fd65c
+EBUILD notmuch-0.29.3-r2.ebuild 5077 BLAKE2B 6e3cbf163abc747d78e23b92484b95ffc2dba4f9048ec36992211a3dbaa2f36b948fd572bce63effd4ad29d6a32fb2d97f90e623eba1f057139f3e18894c1890 SHA512 2eac7bbb29e51d3f3d0af93b328832d0188571b7c70f21c3b183dd7ea7a2b0c1184bc74b0fc0c2da52f4229f6f28b900da7d63074d42c86fceda8fe18e413614
EBUILD notmuch-0.29.3.ebuild 5048 BLAKE2B cc5a91ae3793d7fa40614dcb67145c48197267ef2f9621b3b1946c8585391c012f5a0eaf7e7b3a281a7e6539fcf8d530922f2c9276bbe1705dbd351d76adcd73 SHA512 ce1a7c577618387b0b8cc80eff4ed6d74bd35062169082c0c22a1e8845d111b8fa161a8b8a2b098a5917006d62681e5d1208d08338fd67b59534ed07df13a84a
MISC metadata.xml 1228 BLAKE2B 664ab0ca9f5e738137f8c30ce724330907fad02302e3350e9c90eaf2f4470e4bd207352b1bd4e81c9e31177e3d33b979ca3e81d2aaeb6c2d7cb0cd558f093e7a SHA512 f38609954d3924392d98c8a73917d3f896332997f07fac8cca2a1c35693c7080e7cb3d52fcb5478c7b4499cfc60855953a77eda18ac3fd7f9707623f524546ed
diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
index d2dc1e110e95..13810a43d49b 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
# meant to be binary backward compatible.
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
REQUIRED_USE="
nmbug? ( python )
python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
new file mode 100644
index 000000000000..7750baa97aef
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+ pax-utils readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+ test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+ nmbug? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/sphinx
+ sys-apps/texinfo
+ )
+"
+CDEPEND="
+ dev-libs/glib
+ dev-libs/gmime:3.0[crypt]
+ >=dev-libs/xapian-1.4.8:=
+ sys-libs/talloc
+ sys-libs/zlib
+ emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${CDEPEND}
+ test? (
+ >=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+ app-misc/dtach
+ sys-devel/gdb
+ crypt? ( app-crypt/gnupg dev-libs/openssl )
+ )
+ valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${CDEPEND}
+ crypt? ( app-crypt/gnupg )
+ mutt? (
+ dev-perl/File-Which
+ dev-perl/Mail-Box
+ dev-perl/MailTools
+ dev-perl/String-ShellQuote
+ dev-perl/Term-ReadLine-Gnu
+ virtual/perl-Digest-SHA
+ virtual/perl-File-Path
+ virtual/perl-Getopt-Long
+ virtual/perl-Pod-Parser
+ )
+ nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+DOC_CONTENTS="There are a few backward-incompatible changes between
+notmuch version 0.18 < x <= 0.18. Please consult the NEWS file (0.18
+section) before first use."
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch"
+)
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+ local rc=0
+ if use $1; then
+ pushd bindings/$1 || die
+ shift
+ "$@"
+ rc=$?
+ popd || die
+ fi
+ return $rc
+}
+
+pkg_setup() {
+ use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+ unpack "${P}".tar.xz
+ if use test; then
+ mkdir -p "${S}"/test/test-databases || die
+ cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+ fi
+}
+
+src_prepare() {
+ local _deps=""
+ default
+
+ # Python bindings
+ bindings python distutils-r1_src_prepare
+ bindings python mv README README-python || die
+ mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+ # Ensure that a new Makefile.config will be generated
+ rm -f Makefile.config || die
+
+ # Override dependencies for 'install' target
+ use doc && _deps="install-info"
+ sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+ if use test; then
+ append-cflags -g
+ append-cxxflags -g
+ fi
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # Non-autoconf configure
+ append-ldflags -lnsl -lsocket
+ fi
+}
+
+src_configure() {
+ python_setup # For sphinx
+ local _args=(
+ --bashcompletiondir="$(get_bashcompdir)"
+ --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+ --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+ --without-desktop
+ --without-ruby
+ --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+ $(use_with emacs)
+ $(use_with doc api-docs)
+ )
+ tc-export CC CXX
+ econf "${_args[@]}"
+}
+
+src_compile() {
+ python_setup # For sphinx
+ V=1 default
+ bindings python distutils-r1_src_compile
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt || die
+ emake notmuch-mutt.1
+ popd || die
+ fi
+
+ if use doc; then
+ pydocs() {
+ pushd docs || die
+ emake html
+ rm -r html/_sources || die
+ rm html/{objects.inv,.buildinfo} || die
+ mkdir -p ../html && mv html ../html/python || die
+ popd || die
+ }
+ LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+ fi
+}
+
+src_test() {
+ pax-mark -m notmuch
+ LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
+ pax-mark -ze notmuch
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ doman doc/_build/man/man?/*.?
+ fi
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ fi
+
+ if use nmbug; then
+ dobin devel/nmbug/nmbug
+ dobin devel/nmbug/notmuch-report
+ fi
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt || die
+ dobin notmuch-mutt
+ doman notmuch-mutt.1
+ insinto /etc/mutt
+ doins notmuch-mutt.rc
+ dodoc README-mutt
+ popd || die
+ fi
+
+ DOCS="" bindings python distutils-r1_src_install
+ use doc && bindings python dodoc -r html
+}
+
+pkg_preinst() {
+ local _rcfile="/etc/mutt/notmuch-mutt.rc"
+ if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+ elog "To enable notmuch support in mutt, add the following line"
+ elog "to your mutt config file:"
+ elog ""
+ elog " source ${_rcfile}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ if has_version '<net-mail/notmuch-0.18'; then
+ FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 39482ed21c7f..01df5a56beca 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -4,5 +4,5 @@ AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff8
DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
EBUILD qmailadmin-1.2.15-r1.ebuild 2244 BLAKE2B f9a9a4f884149126b2061040f7722acae7f3da470256746e1d6a48bb996d232c69dd24e62612198057e060a5a16d3d82faf5677257e6a1e4114c9f14b33dbbef SHA512 dd61c3ff20a341597261ce1dbe9dbf0cab6d1b2a166e4451185467d1b95c0581e2b653994b5d6b13bda68bc915fb76e26e9f66d8a6db91706b3b3a1b9bf63d2d
-EBUILD qmailadmin-1.2.16.ebuild 2669 BLAKE2B f0e32a6641a57a5b56c670d96ea8ffe65a11c0b693a605b1bc1b5d4a0eb090f60dafde5f299361f8661122fd713cb202dd867386118e63e46a58b15f01967d60 SHA512 4e9b0565bb62bc4f64c6093ab2461c1788f7a59e60364d1e1e34a9deaea8387aefb350826d1b468ad83c92718d967081eb69a6b2c4cbff8a118ce159937fbfbc
+EBUILD qmailadmin-1.2.16.ebuild 2670 BLAKE2B 2617371fd0a5cf06535d288b064abe39fda9d9edcde6fa485cf6072e8887e635cbb49cf79d311b3a92de59007f1c225bc9fe7f67b919e41d7853e5c12dd2150b SHA512 a2b87f3dcf71bcfac823038f6d36d452a8af1f7c7bbcfd46426f365f7be8eb4a048e72868ae79a7775a832fa6bd3844befdedd36336f0285c261344a96582ed1
MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index 66fd8ab93b3d..914eee6aac0b 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -20,7 +20,7 @@ IUSE="maildrop"
# and non-root can't access them.
RESTRICT="userpriv"
-DEPEND="virtual/qmail
+RDEPEND="virtual/qmail
>=net-mail/vpopmail-5.4.33
net-mail/autorespond
maildrop? ( >=mail-filter/maildrop-2.0.1 )"
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index d04c17db37f0..e1a1a1833916 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -1,5 +1,7 @@
AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2ddddc455b38aa66b69919e360c51ac76eec02359230b73ee300f8bf6a93459e391a2c4bddbc704a5149857862658057994a1e SHA512 3d5984bd432dc6ca7e52a8b7e8cb52e3a77ef7c3d42343388f55d8d71251a4c13fd008c907af735b966672ccdf80e4d4e64de9a64ea6117843556577ea2ddcd2
-AUX smtptools-0.2.3-cleanups.patch 1878 BLAKE2B 6667a9f32632e87e047d87b3ea4f1836908bcfc3f4ddcc7ecc77e9fc176be3644a69a33e10ed1963bd011f254464bb3dc9b0e44e12840266ab79733ab0ff54f0 SHA512 5bd29abde5b8b80c5a1ed688baf9cc3abe9b9516228401e9395f56f8e5af4aa725774128f1571a8e501d305a8c7258122a9bcace716d8f7704f89bf3bb2b34ec
+AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe45010e331d9b121e8454faa696285a60ca97c5dc74567eb4afd88e4444f4da318f75c02b70d4f5c9ba6b2d2664b68fcd SHA512 55db66e01d6a252e4c9c265de2c14e40a92b5eb33421d05879823a6fc1e37e1b80951bf84087739f39e32850873371461a604584e465576b6f3b269b2ff83085
+AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
+EBUILD smtptools-0.2.3-r1.ebuild 672 BLAKE2B 344305769928c9e3d0fde238870c33611057139b7daec7216c4b6ccdc4499dfb984057500df026080b119b36f128a2bd94bcdbd3a108423fdefa5751d96a969f SHA512 5b2bcf2e8ee213d9820d55ad0512672780c3b29bfc8b9d189064190091b815184f5ac6408e5c45659501e7c6032528860ca3a715e840eb7f0b24019956abc387
EBUILD smtptools-0.2.3.ebuild 649 BLAKE2B bd56d805ec28e88e94c835e531ca848a41750af3feaec27b110b015ad4277ca4f4c45139275eecb4c153133c5005bd2178e8d50133910ff46c81e06072b8d809 SHA512 a2a6a049d54b9d06bd0d96beddb1aece85fb42e70ccb14d9ef5b80813b9c72d1a5076d36b0f0692e04949b9fd56973aac1eb70cf7d6aa7299379320c71e7ec29
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch b/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
index 6873cf390255..3ea1d43712a0 100644
--- a/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
+++ b/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
@@ -1,5 +1,5 @@
---- smtptools/usmtpd.c
-+++ smtptools/usmtpd.c
+--- a/usmtpd.c
++++ b/usmtpd.c
@@ -60,8 +60,8 @@
/* run */ static const char *reminfo;
/* run */ static const char *relayclient;
@@ -41,16 +41,16 @@
if (rblcheck) do_rbl_check(&o);
---- smtptools/relaydb.c
-+++ smtptools/relaydb.c
+--- a/relaydb.c
++++ b/relaydb.c
@@ -1,4 +1,5 @@
#include "config.h"
+#include <string.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
---- smtptools/uostr.h
-+++ smtptools/uostr.h
+--- a/uostr.h
++++ b/uostr.h
@@ -1,6 +1,7 @@
#ifndef UOSTR_H
#define UOSTR_H
diff --git a/net-mail/smtptools/files/smtptools-0.2.3-fno-common.patch b/net-mail/smtptools/files/smtptools-0.2.3-fno-common.patch
new file mode 100644
index 000000000000..34435ec7ccee
--- /dev/null
+++ b/net-mail/smtptools/files/smtptools-0.2.3-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/uostr.h
++++ b/uostr.h
+@@ -14,7 +14,7 @@
+ uostr_t *uostr_alloc P__((void)); /* mallocs a uostr_t and inits with 0 */
+ void uostr_free P__((uostr_t *)); /* free(uostr_t), after free(uostr_t->data) */
+ void uostr_freedata P__((uostr_t *)); /* free(uostr_t->data) */
+-void (*uostr_xallocfn) P__((const char *)); /* called by x-functions in case of oom */
++extern void (*uostr_xallocfn) P__((const char *)); /* called by x-functions in case of oom */
+ void uostr_xallocerr P__((const char *fn)) UO_ATTRIB_NORET; /* internal function, leave alone */
+
+ /* be careful - if u->data is NULL then u->len and u->size need not to contain any information */
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..4c93c7172b36
--- /dev/null
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A collection of tools to send or receive mails with SMTP"
+HOMEPAGE="https://www.ohse.de/uwe/software/smtptools.html"
+SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+RDEPEND="!net-mail/qtools"
+PATCHES=(
+ "${FILESDIR}"/${P}-cleanups.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-autotools.patch
+ mv configure.{in,ac} || die
+ rm acconfig.h || die
+
+ default
+ eautoreconf
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 290a9a1f3c8a..e062981fade9 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -14,6 +14,6 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r6.ebuild 7515 BLAKE2B 0db08cb6abb0730389dc1d748716e49abc059838c3edf6ae190266f1b1932277dce384519c32178a209096ffa2c1e585ad99ccea419c2e15057592bca09d5693 SHA512 c63a82445f77c9a3720ab5841b061cf461eacfa1af180d6e009d53985be6e814ba1c82dc621a6cf05a82d6a3548ba4ad21af29fcfc76717899fa1e794c27bc0a
+EBUILD vpopmail-5.4.33-r6.ebuild 7516 BLAKE2B 568a2f25393c132211dc351c7704c4767b272dbcf4ed7e90823b46e2bf5899d1fad283e3dabb352c85d648b9289da0c09c317eb48dba137df490f13db6b22c7e SHA512 6c31b1653290c10d3892c984c4b7bc287d771664914c11b0b07a024c92dfc93fe5454b4d4f3e8f27ba40ff1ddfb58fc9561a4cf9609ba6916b11badbceb9c523
EBUILD vpopmail-5.4.33-r7.ebuild 7537 BLAKE2B 88c87449980b0f8596cd2cf72b75456af84ce344a7a6a074d6cb0c673ecb3012e9512eb97762f6436fd2a161e36b03b98818166b0ef6ad7f6eabcc3cf1637c7e SHA512 61ee7395ebfcd55e0a38a8e96103babc9919d2c00351fc64ffaffe5a58ea020b2ecc94b664943f4f5909247a95652eaf2ecd5ec9500a46a64d8493195a100424
MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
index a4eca3315ec1..73511f611bc7 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
REQUIRED_USE="mysql? ( !postgres )"