gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-mail
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
35 files changed, 353 insertions, 165 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index f4c0847087f4..71c17645318d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 277acadccaa1..641a4994e1f0 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -19,10 +19,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-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
 DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad
-EBUILD courier-imap-4.17.3.ebuild 6794 BLAKE2B 5192299cd016549438abe0ffb2b7d92d50a8e596e9a1d9d4d9a3485550973d8a76aa3f9fa3c5752811ebb93e8ea50cd81e8bd50f9b8833c6fc74880babaa418e SHA512 103e22a47b18ea7a22a832505e9f540d28af0e9e5dc92205ff58a443689f96449c6597a62dc8ec35e48f4823bc522ce46a53b6f257df2533e2e777cba0ef46c4
-EBUILD courier-imap-4.18.2.ebuild 6855 BLAKE2B 7785146899c2e074ef31c28ab09800191b51d0c1178042893d60ac3b676134c8dfbf657244b91f4b498b6903ab3c620e64424c530f7a031db6c83e66de0d35f4 SHA512 2fbf7417926e900b7b5419eaf7962900056156c8cddd4449d43311840e76c117093806a1524826db41ef12cd60a37fa86600e5cfc71c5a2c682aa4122be61eee
-EBUILD courier-imap-5.0.7.ebuild 7192 BLAKE2B 87ee558602bc209bec59e5159fac9b0f2c319e8dbfe3bf2171824449c0218a189259d83a9d06cc00ee4492ecca6926381d54eaa987db25fc5f44b2977a9d5668 SHA512 71d22c0b8816546db53dafe211dac3a01103714279175de762ad9003399c9fa33a228db1a8d2f1a78b254e9d5239937ff184bc2e33aa02d3c9808a6eff78e299
+DIST courier-imap-5.0.8.tar.bz2 3296810 BLAKE2B 43b9cf61253145c4f877ed350140159014d812c197f82cb2621db4484c66ae57e0c1a237ba0f13e0edb35439f562662557ca98d3193ba8b6e35e392dac00cd03 SHA512 bc60f4540da8db02758d593694ca4b7336a7d65fd3c48ea5c373e18abfc9973db836c505f77caf844529947ad0c4ef0dc276898e437ca60f0facb2ec6650702c
+EBUILD courier-imap-4.18.2.ebuild 6860 BLAKE2B 6cba1bd5acdef4d3e34434016dacb0db42875dbc4313eef5ac37edd7aaa9e005162f9f628de9f187afd47421562390546f7f3835921361b4161892fe02bd7840 SHA512 3933a4b72818bd67b09ed6e6160066236f6673a57cf26f4fd8693f2274702e2123fe50905956f232fe3009f4f738f83457f0d53951fa9a8d5d9ed0924e58b9c0
+EBUILD courier-imap-5.0.7.ebuild 7191 BLAKE2B bc85463316bde1b8633211a66a9c217bfa7957043279d16b314744caaa0af15ef9d8cb3f56cb0874370f6092ecd52851248c7458e5450666e57a509b6fa7c01c SHA512 2d4df7f3f46dd9a4921fdcdbbec87f771b9a382b0b1d20da2224e6139ea2b0c155163cafece4f755254d982a04bd337779eb10627532b5b76b36b1d1b0e433cc
+EBUILD courier-imap-5.0.8.ebuild 7201 BLAKE2B 46c82223b33b151946b01ede4b2e2fbc0ec46b312127f7c5c639937d3b72c5e6cf8b4d5a07b5212acc51d1d1a1fbb75ee2417de5d59a6ca21a58b6b137696cf0 SHA512 20e3f77b3c7c961c4210dc53f4ce586e97361ca233fa5592ddff36b411179cb0c6ce2c8182bdc3ff505ea7963675ab731f115809b3af1a515f345292e19333c9
 MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index 3d62c9734bf0..ca930cb88c3e 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -187,7 +187,7 @@ src_install() {
 
 	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
 
-	dosym /usr/sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+	dosym ../../usr/sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
 
 	for initd in courier-{imapd,pop3d}{,-ssl} ; do
 		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index c7e330f658ff..f7ff0fdf79d6 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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"
+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 )"
diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-5.0.8.ebuild
index ffbb08e8e095..f12cb6999da6 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.8.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit autotools libtool systemd
+EAPI=7
+inherit autotools libtool readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/imap/"
@@ -11,42 +10,61 @@ 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"
+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 )
+	gnutls? ( net-libs/gnutls[tools] )
 	!gnutls? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	>=net-libs/courier-authlib-0.61
-	<=net-libs/courier-unicode-2
-	>=net-libs/courier-unicode-1.3
+	>=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 )"
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
 DEPEND="${CDEPEND}
 	dev-lang/perl
 	!mail-mta/courier
-	userland_GNU? ( sys-process/procps )"
+	userland_GNU? ( sys-process/procps )
+"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )"
+	selinux? ( sec-policy/selinux-courier )
+"
 
 # get rid of old style virtual - bug 350792
-# all blockers really needed?
 RDEPEND="${RDEPEND}
 	!mail-mta/courier
 	!net-mail/bincimap
 	!net-mail/cyrus-imapd
-	!net-mail/uw-imap"
+	!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"
@@ -85,6 +103,7 @@ src_configure() {
 	use debug && myconf="${myconf} debug=true"
 
 	econf \
+		--with-notice=unicode \
 		--disable-root-check \
 		--bindir=/usr/sbin \
 		--sysconfdir="/etc/${PN}" \
@@ -94,28 +113,22 @@ src_configure() {
 		--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}
-
-	# Change the pem file location.
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
-		libs/imap/imapd-ssl.dist || \
-		die "sed failed"
-
-	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
-		libs/imap/pop3d-ssl.dist || \
-		die "sed failed"
 }
 
-src_compile() {
-	# spurious failures with parallel compiles
-	emake -j1
-}
+#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
 
@@ -171,7 +184,7 @@ src_install() {
 
 	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
 
-	dosym /usr/sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
 
 	for initd in courier-{imapd,pop3d}{,-ssl} ; do
 		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
@@ -181,11 +194,18 @@ src_install() {
 		doinitd "${T}/${initd}"
 	done
 
-	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service \
+	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 "${FILESDIR}"/courier-imapd-ssl-r1.service \
+	systemd_newunit courier-imapd-ssl-r1.service \
 					courier-imapd-ssl.service
-	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service \
+	systemd_newunit courier-imapd-r1.service \
 					courier-imapd.service
 
 	exeinto "/usr/$(get_libdir)/${PN}"
@@ -204,6 +224,7 @@ src_install() {
 		|| 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*
@@ -213,20 +234,21 @@ src_install() {
 	dodoc libs/rfc2045/*.html
 	docinto tcpd
 	dodoc libs/tcpd/README* libs/tcpd/*.html
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
 }
 
 pkg_postinst() {
-	elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
-	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
-
-	elog "For a quick-start howto please refer to"
-	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
 	# 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}"
-}
 
-src_test() {
-	ewarn "make check is not supported by this package due to the"
-	ewarn "--enable-workarounds-for-imap-client-bugs option."
+	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/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 608fb766e947..82aa06d6a34c 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -9,5 +9,6 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
 DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
 EBUILD fetchmail-6.3.26-r4.ebuild 2641 BLAKE2B d8613523a8325dfd7428d8dbdf9a03daea325cd3964abd269874885a07a9fa8fed07ed9f413aaa02250038dba6a59cbd7cdec26a93b81220ec35fe508e0a036b SHA512 921afff61fe1bb5ae117d77a7472d0e61d093b92bbe09a08a76d964b161882fefdec6dca090267d14e60e2374bbfc82177d271518ce9dcfeeefc61e63909d12c
-EBUILD fetchmail-6.4.1.ebuild 2607 BLAKE2B 666e51bbc0e5b8974d696780ebdbd2608ef4bbb5c4733319048b7da0d479a919881ec4ef0ab396228f77dbaa69a713476ab5b4ac0967040f1d2e27c585a5b3b6 SHA512 f897bd069427577ad4888de5f61fdb64755f6649d9d8be94eab141704cb6738d6bfad07f8c20b837d538930fa2f99d63fc5fcb31b5e0b90f503aa3f722b5caf3
+EBUILD fetchmail-6.4.1-r3.ebuild 2429 BLAKE2B 5e089f5b9bdc9371e6701dfe48e140df30a38cae1ebc89c4032e030737c316f622632c31fa3d7f1f55c4461cc0a7127674191a5f3f94955e32474a3161e64490 SHA512 4d3a571f7943f2d8d3cde6a35ff71ac6ef41ed36f12d1fd18d81a9efbdb8e463d9e8be6d92459503ca7c4494af4e8f132e877a3cb809f9c72ac220f5a82aae2e
+EBUILD fetchmail-6.4.1.ebuild 2606 BLAKE2B 4597ff6bd5653d6b075498fc4a2175b3d0695ca2934734bc4565152c7f868b211116274aad9a61b7c57120e1d9a2101244aefec54bb3f9da7f721148c4889750 SHA512 6c852431b6d438067247f5368cc8e7966a986223485faeb667dd31be756a3570738a6e19685dafd0050c89caa3ac34471603f43f6b7f1df9d67f1173597b0640
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild b/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
new file mode 100644
index 000000000000..f45d07587a6a
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.1-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1 systemd toolchain-funcs autotools
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/fetchmail/fetchmail-6.4.1.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
index 1a737af6ba7f..3514d377f467 100644
--- a/net-mail/fetchmail/fetchmail-6.4.1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks libressl"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index b27752036b60..aa53d8fa841f 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,5 +1,3 @@
-DIST getmail-5.13.tar.gz 199073 BLAKE2B 94c73af47b95a0cc2d2eed64ac90b69829440c8209cb3b65e09d9f73d49f246650ec6760207a4717934cb39d1b9922cea73dee3ca64b87bc5096475d3b9e978d SHA512 398b1adf1bc4f90f98ca7154abad9d0769c4a6d0cccd6102ea992c97eff843f6a9f0a57f3a944bc17c3b664fe8d6c9d7f9da5be343be658afa36b1bb582ac347
 DIST getmail-5.14.tar.gz 199501 BLAKE2B 54bb79cd37303f423b70bae0f3072d338a8c66b25d59f8b982029d5faebb65a3f7ea979ec35d0dab61d376754dc15e206d443cd0cb128a3c438a09dfb8107f69 SHA512 0646864af56fc044525d38088164c2c026a8f29b231c25c9cfe9aa922b1e5170cf49c63874da9bd593b49be6ed822bd4da7ea4ebfbb59cfa6e1658e2b565c184
-EBUILD getmail-5.13.ebuild 630 BLAKE2B ae67476d70cf97d3e2718cafbd2760af52f34d7a35aca5efba66c82c9dbd33ffa2d1bfe241ef9645574836b464fa8911b8f0835ad1d8a9932370062a10de48e8 SHA512 9ad06e0d02434a276fa7009286a929afc75f832adee1742d1c8c1647e6246d54eeefd85325bdb41bd4b358f595fc1231e49fa2a9b824ca6dcde0e9d9a5c809c9
-EBUILD getmail-5.14.ebuild 633 BLAKE2B 6c073c45a0a66f6806405b6f4fc17328d8bce8bca0056ce400de23b9a20201bcca2dae80585952e0fbe8040df36ac9228c6f80a97d92f89fd6ce3c387f357a12 SHA512 48eca60f09cb50e775b151a782a0c052b0cd65d4605c69c3f21c44306f676e8c6b1dd019ee4b8888c1aa7b42c696711a3c456a7fe8368acf06918960a960f741
+EBUILD getmail-5.14.ebuild 630 BLAKE2B 3609240c96c944db7a97ecd14badc603b357aeb21b43d5922f266be0c9c9a21b9f6303ede00452a6038aa33c62b10b2fc26dc4d3108031fce0088924152bf86e SHA512 00065270b9cd204d6f482a74d832ea2f13a94f03711ee34b330f289b492e412c73c8309de20425b0cbaca2ad655f08570817ed790d419232ea24edc5147cc526
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/getmail/getmail-5.13.ebuild b/net-mail/getmail/getmail-5.13.ebuild
deleted file mode 100644
index a4a87888165d..000000000000
--- a/net-mail/getmail/getmail-5.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="ssl"
-
-python_prepare_all() {
-	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
-		-e "/docs\/COPYING/d" "${S}"/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-mail/getmail/getmail-5.14.ebuild b/net-mail/getmail/getmail-5.14.ebuild
index 813ca4429c80..577087573948 100644
--- a/net-mail/getmail/getmail-5.14.ebuild
+++ b/net-mail/getmail/getmail-5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE="ssl"
 
 python_prepare_all() {
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 848e5f4a200d..a6691977d1ec 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -10,6 +10,6 @@ DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb
 DIST mailman-3.2.1.tar.gz 781654 BLAKE2B ee9a9bf5505ba638417c363a885153dbaa795213a77ca9dd5abb7212ac0fe35d08c5e0e87da2d54aeb50d21c30df72a750bd25ffa0877d377a3871bded03c7de SHA512 b17fa878ffe539504ce7f28351f5bf3c7aafe29fe98957880a571e5b798ad4f9f56748fb69df699b8bf9889aebb6cef075c5d075d653fa5e9b6feb0322eab9e6
 EBUILD mailman-2.1.29-r1.ebuild 5828 BLAKE2B 8f17b0a8d7ff5ac0e8f9681ca0199313239283446edfe53eb09108fe66505f549e588b6c046fccaf74f187f41e6f71116ae6ef4cc133abe4cc07069ae8141573 SHA512 00334f2fefbdcb4214c82f4a524272ec86a8452a0570d361f80597c112e3bf5f05c7387b18c87b3a5eb6d88762477d43a39467feebe056e4f714ec423a7a5d66
 EBUILD mailman-2.1.29-r2.ebuild 6001 BLAKE2B 4601e581a3b2b754f28e750559f6dcda17d5612b2265e18aee50443dfb3c20236ed26e1bf1e78b1611433bdba9e426534bf05044cf508009ca8d50a96892c632 SHA512 313d4038138551515825450c2a9fd5363000c5e73ae2730fb2e7a789eab90825f7fd923d62815698634520c860881af2c111b3ab3509e6b66ed188862b23d827
-EBUILD mailman-3.1.1.ebuild 1175 BLAKE2B 792fafc9caf1d8bfc6b67c7042e09d605101166c9471e3d61f0342239e0d463441122b325802b794fa13871373c1ce4968c769be40d4fccac8beb8e2a0af4faa SHA512 184e4cc446e80f449909410a5522a20198a1a645821044b189c989fcee14bfb889e6a1bd535bb5f50b57848354371933b176177e2f41b93e4a9cb3bbad6be5a0
+EBUILD mailman-3.1.1.ebuild 1165 BLAKE2B 0f23ed03b36809a7ec4c42ea629127a9c68d6fa75372477fb184d811baba80695178b2712f9cbce043d38bf2f102cd6cdab3398a61079602f3100ef40098589b SHA512 156febe4b2c60b71beda0c2afda90c2ad807e488b657677dce58e3f3ffa1e56388017c7fd4e8e9e6e0ced949a6038b7e74d514bafe759b57c39f7bf6446bb3af
 EBUILD mailman-3.2.1.ebuild 1414 BLAKE2B d6743ff352481fb1aa702e9df744ce1fc247adfd836d3277b553106a526b6de0fad82172574e2f41492d7267154e6044e5920f56e1ae66c046252f00ba09109f SHA512 5479caf3c63863c9c46b79fdea27f16e5a33223912a6bed5baf2d2e6fd765e0f62046d5c12726e7243fdbdc6e51ae0c9fc6f69303bf36bdbeca7c920396df310
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-3.1.1.ebuild b/net-mail/mailman/mailman-3.1.1.ebuild
index 296fa1c5bfab..ebd8275e9c59 100644
--- a/net-mail/mailman/mailman-3.1.1.ebuild
+++ b/net-mail/mailman/mailman-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index d016b390bb94..866841358373 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -15,7 +15,7 @@ AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
 DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
-EBUILD mailutils-3.4-r3.ebuild 3650 BLAKE2B 972e90060cbf607310a6e6c9013b89457db2cd6da30832dc120f6d7e26170b5d49d2202db4f22094098d9259281f6e141a3d8a4c0a16bde16b5e0275470d2a94 SHA512 16712f9a64c8e5a5db643fdbb1d47306274912444fdd21b6dc56acf6c27a3cca7d73a0fa1cea700a6bdd82e86dd630a95e8f02848401cc16bba96b2e7b146aff
-EBUILD mailutils-3.7.ebuild 3652 BLAKE2B 144b8d194988dbad0ae23d8a2037ca10941991c92ae2ae4613cb5c505066945e2794f7aca836b8f6c0e6a523a13ddf7bda4f418b8d03d227535de5c74f857598 SHA512 4f4e8c13f62cde56b0a665f98ae476579d9d799bf5b8201d1a305508effcc5e9554718cafd2b90e0f60968372021a4e10d3a441e810f1bf6cd6b280f12470a75
-EBUILD mailutils-3.8.ebuild 3699 BLAKE2B 818d250d80f81905277a53a82d68d4cc0549c102288e10a0ced3cb5f42e0500728efd55e3ca3c2f1b80c04d5bed8884216234b5c447c273dd853d6594cf17bdc SHA512 84e90646d9158deb86b9061d669a0f36b15c9126c290dd8e48624b7979087689e38030d1150ab45b1a6c2991453285209889f9efa1a958521144564ed2a7f258
+EBUILD mailutils-3.4-r3.ebuild 3663 BLAKE2B 68f2e160c6f1a276b41ebb78b3254d315dc85233e9b38f2e56376d41d8ed35dc9d1e93e3f7da79f0aa21cdc22a539610ae6ec00747290c7be241403a33c2bdce SHA512 2fa7deddf3770768b7ea11b05502c8f1506b63ee585b50a34e5aa62bddf35b410d655b32e9d4a36fc610f012e3d57a0ad458426617865e28e495561a37b29e3b
+EBUILD mailutils-3.7.ebuild 3663 BLAKE2B b5f29c6693291d34c53dc96a8d9a295fef01ebbb3ddfb735f426429afb22629d50a7e5a256a53d7932fcd3b13213584aae2e9dc772a44019baa1260ccd76677a SHA512 fcff9aa636c2eabc7bbbf1183ea19043c78fffdb52f67eb13c05cd43cccb24b2931f2b7a80405ce62369bbdd81f9a4b7fa6ae832f32cb62a1a277dcd7c646a4f
+EBUILD mailutils-3.8.ebuild 3710 BLAKE2B 5cc541646e30943e1f0e2b9b56a5b24da3554677740ee73eceb44866ca035688eb44a5867460929e576099bf7b4ba6949add17c2449c3dbb6dfc1868342b89f8 SHA512 87a0960a81cd5bf7b6caf3cf9e5afd31d6830d3d24caa40f3e981e30d2dd6de0b931d5f7e8acddab7d9f72ea39c44e6f36e02904d1b05cbdbaab365cbb5a3964
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index 41d2ec0c56f1..447c79acb52e 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="!mail-client/nmh
 	virtual/mta
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gdbm? ( sys-libs/gdbm )
 	guile? ( dev-scheme/guile:12/22 )
 	kerberos? ( virtual/krb5 )
diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild
index 493ba4d9f40c..f565cbc30a7b 100644
--- a/net-mail/mailutils/mailutils-3.7.ebuild
+++ b/net-mail/mailutils/mailutils-3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -27,7 +27,7 @@ RDEPEND="!mail-client/nmh
 	virtual/mta
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gdbm? ( sys-libs/gdbm )
 	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
index b3f820b13cc4..a0eac2746bf2 100644
--- a/net-mail/mailutils/mailutils-3.8.ebuild
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -27,7 +27,7 @@ RDEPEND="!mail-client/nmh
 	virtual/mta
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	gdbm? ( sys-libs/gdbm )
 	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 4bdd7414b6de..0f162eb64466 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -2,7 +2,9 @@ AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f731815
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
 DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0
-EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
-EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-EBUILD mu-1.3.5.ebuild 2099 BLAKE2B 863cb8a39459777dbae5fd4601fbb88a51d1fa3bdd97f76699f798484a715677e8b8c6fbae080ae2265ca078e13d9267c023bf06073053377ed25cd941441385 SHA512 f120292c849d27aa15a67fa84fc7f485b076d86565be96f42295115cb04daa55fb69d7b71be50b81aaa7de038fad5020c3c404dea64f8a200f1cd2715ad3c31d
-MISC metadata.xml 823 BLAKE2B de3b4bd9c6633407c16cf0cc5704a3d7fa6a67886139adaa7b23e1b1eea82e3ba19bcc53beaebdacc8d7a2da71539c216f7c62210d698b10ffe33215783e23ee SHA512 bd2265c198b8342c47c5cc428811993f8187b8dee981df72531097b9d8f2c01e21bc2ec39ab1a1f291e189ef2bdb788153f0bfe5f2479e6faa1cb9e6ce0079ae
+DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
+EBUILD mu-0.9.18-r2.ebuild 1972 BLAKE2B 9a067e58cefb3ee4fdfe352c4100d455312eaf33ab3792d402f2730978c13cd1b41ddd38b459d6792a35cb629a966b7f8144bf802e7a410c095729b7290a1a4b SHA512 8c72f67087d93a57d193632f23d741ef540218c3a53d9bd28f08f385e387a4aef2695a8a045b3287fe4c131aced8c5d8289086ea48ab4b2a4ea9452b39d6d401
+EBUILD mu-1.0.ebuild 1975 BLAKE2B c8334faad346b75d5ade8eb9e346a8c79f2f5b854955fcb2cd5cbc3c9bbd441a08fb5f252273edcd6039ca481044615e3fbb06001fe482d2584f2347cfbfdfab SHA512 f8083db03299d2bacb27555ed727353fc22c2555d3c9ce5d3cf6d827a233a31d1b318678681e42b60785e5492953c1728012291f513771266085bc258edec96f
+EBUILD mu-1.3.5.ebuild 2105 BLAKE2B b60ee9cb2abfc3059b16f4d6a94ac484d4fb5124e06a087a05b075fcdfd51810c64d7db5b433282a62917fc295afbf480148f64d7e806ca084a1e39bd11ec2a2 SHA512 e5e66dc9a5287bb0e9d08c4da1caba35f63a6d24dfa2db293f6d8c46cdbf22029276a760668522e22dfd9935d749b224dfa5ac6b3da0ffd207a1cda33f10b5e6
+EBUILD mu-1.3.6.ebuild 2174 BLAKE2B 7a7020d48c3be27faafdbc549d4c3fe3b5df879e5050adaf0264eded537ca165398722f02806c50c466648ae360f2da50ae9f6aa5d2d0606ab774ad000c4638e SHA512 9cf350fe05f43655cca58bd13e3b909d1d094e261db11cda8cf929a4a886308aa3165fed1344fe4f4196fa5e19281e5ef4898f351668b47a9ac820e8f5f83d23
+MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 52409e491151..9d458cfbe1a6 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -14,7 +14,8 @@
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
 	</longdescription>
 	<use>
-		<flag name="emacs">Install the mu4e mail client.</flag>
+		<flag name="emacs">Install the mu4e mail client</flag>
+		<flag name="mug">Install the mug toy client, not for normal use</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">mu0</remote-id>
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild
index 17815abc9802..1384e4bd776e 100644
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	!net-mail/mailutils"
 RDEPEND="${DEPEND}"
 
diff --git a/net-mail/mu/mu-1.0.ebuild b/net-mail/mu/mu-1.0.ebuild
index 2ffb7d2dbe8c..67c1fb0dd25e 100644
--- a/net-mail/mu/mu-1.0.ebuild
+++ b/net-mail/mu/mu-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/gmime:2.6
 	dev-libs/xapian
 	dev-libs/glib:2
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	!net-mail/mailutils"
 RDEPEND="${DEPEND}"
 
diff --git a/net-mail/mu/mu-1.3.5.ebuild b/net-mail/mu/mu-1.3.5.ebuild
index 96b9d5115927..3e40b2e3d546 100644
--- a/net-mail/mu/mu-1.3.5.ebuild
+++ b/net-mail/mu/mu-1.3.5.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/gmime:3.0
 	>=dev-libs/xapian-1.4
 	dev-libs/glib:2
-	emacs? ( >=virtual/emacs-24.4 )
+	emacs? ( >=app-editors/emacs-24.4:* )
 	guile? ( >=dev-scheme/guile-2.0 )
 	!net-mail/mailutils"
 RDEPEND="${DEPEND}"
diff --git a/net-mail/mu/mu-1.3.6.ebuild b/net-mail/mu/mu-1.3.6.ebuild
new file mode 100644
index 000000000000..c75bf292245b
--- /dev/null
+++ b/net-mail/mu/mu-1.3.6.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs guile mug"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4
+	emacs? ( >=app-editors/emacs-24.4:* )
+	guile? ( >=dev-scheme/guile-2.0 )
+	mug? (
+		net-libs/webkit-gtk:4
+		x11-libs/gtk+:3
+	)"
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+RDEPEND="
+	${DEPEND}
+	!net-mail/mailutils"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	dobin mu/mu
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		man/mu-mkdir.1 man/mu-query.7 man/mu-remove.1 \
+		man/mu-script.1 man/mu-server.1 man/mu-verify.1 \
+		man/mu-view.1 man/mu.1
+
+	if use guile; then
+		  doinfo guile/mu-guile.info
+	fi
+
+	if use mug; then
+		  dobin toys/mug/mug
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 7d1f10173a9e..6cccb23ef05f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,7 +7,7 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.2.tar.xz 660520 BLAKE2B f87889db5fa1049b2b91a9ea8abe917e5645860a5c163c73a57197ede904aa335c0f3b37cc2a7ff2465c30e94eb25b113bebd074aa9e92c84383457600e1de82 SHA512 0e345c4ecca8410eedb14154bcb3c327353a0984f30b7fd6c526deefcfe17aa74ca8fb4b4d28e93decca8c8914f7d60ca2c9485750001b14d67d7d33d4721bb3
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
-EBUILD notmuch-0.28.4.ebuild 5118 BLAKE2B 571fb8bf2619241d8b24f1af87d18cd437cedc23c9c340856b512f6df203d2c2f2889c3319ceb01ed841612b887517582e1a28748cf1be572363efc83782c3f6 SHA512 95486adaaa02ce45e4925320f474656f538444ed09d1d8c751b58417f1b91b48c1fcc18aca1e95eb785e49911955a2065d7122b06c3378153626904c24094d38
-EBUILD notmuch-0.29.2.ebuild 5088 BLAKE2B 80999ae44c35ea41913df030e1323a16f25e7db87ff90ee5fee9963b662fdb5bcf07fc6dffa3785d55d8735bb81be5445c02709eb517d6a25e41834be1c290ca SHA512 75e8f6eb068e4811f322513892048872cfd331d3833ac80cd6ba76877b1f0594e6b1b21c0c3eb40ea252273802ead766b0c70121a0f764e22fdda3205197cb55
-EBUILD notmuch-0.29.3.ebuild 5088 BLAKE2B 80999ae44c35ea41913df030e1323a16f25e7db87ff90ee5fee9963b662fdb5bcf07fc6dffa3785d55d8735bb81be5445c02709eb517d6a25e41834be1c290ca SHA512 75e8f6eb068e4811f322513892048872cfd331d3833ac80cd6ba76877b1f0594e6b1b21c0c3eb40ea252273802ead766b0c70121a0f764e22fdda3205197cb55
+EBUILD notmuch-0.28.4.ebuild 5084 BLAKE2B cf95b8e988b47cd8eb83905b201ce07d56a1ec37abd6bdf4e571b0085cca56d7df5b5604eace1acc484229d08fb04d9351c1665110d2bdca4e36875b8651a61f SHA512 c31e331f7e8a32b06b98c00126c33d9ec1bebf70abd66925b395aa7958c3712f57d698d1c3f72f63fcc7ae7399a4dcb50a87d80aab77a5dfdbb40db7a54a6818
+EBUILD notmuch-0.29.2.ebuild 5054 BLAKE2B 7ae1eb18daaad1dde46e7661d790c1341e704f6d620e103921959330cb8334c09bc21d9f16260e52d2b71b0fc5b6b5b0a1fb8f65ce25cc2e97eb19e8be666231 SHA512 ec2e75b01da6ccf2f1180bc11619be6fc1c28c1e49c75337c4a3378bedad8cc73e55709d0e32582062da7bd8f6e95ae36d9ec8a6caa0f64201065e9826090c92
+EBUILD notmuch-0.29.3.ebuild 5054 BLAKE2B 7ae1eb18daaad1dde46e7661d790c1341e704f6d620e103921959330cb8334c09bc21d9f16260e52d2b71b0fc5b6b5b0a1fb8f65ce25cc2e97eb19e8be666231 SHA512 ec2e75b01da6ccf2f1180bc11619be6fc1c28c1e49c75337c4a3378bedad8cc73e55709d0e32582062da7bd8f6e95ae36d9ec8a6caa0f64201065e9826090c92
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 578ec430d1c5..902126ad2395 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.gz
+	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
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -104,9 +105,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {
diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
index e845830282d8..b10795cfe09a 100644
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+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
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -103,9 +104,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {
diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index e845830282d8..b10795cfe09a 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
 	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
-SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
-	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+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
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=virtual/emacs-23 )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -103,9 +104,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index c3c02029a1f0..50cf3ff070f7 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -1,5 +1,5 @@
 AUX pflogsumm-bdat.patch 691 BLAKE2B d7d9fef9d668a4f58387ada96505c9174cd1ee0137883969c817357f8c2875c226c44d3f464f7f37b6519104f7b3cdf9a22c5e7c9670732e83663847b3892b12 SHA512 a87606d6b37cfdadb4b6035a941a21d71d7e729fbbdec20df4bbfb9d671baeedef944b2946428979dcfba614929e2556b34e49a931e16903c6c238904c79b66d
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
-EBUILD pflogsumm-1.1.5-r1.ebuild 506 BLAKE2B cf4902bf5a79cbf8647e048790d69d65bc323f17ea07c1847ee2b036eb8b27e21fbe01027a1af0b64a7b0e3fc976f196a0cc09aa7d544cc4352b8050005921ee SHA512 ab35cdca59a5b63a9b2db06e3b9d57453e967a82af2290bec8486b7681b28e5a276e2cf7bbb8d1ded777355189d776ff70fe2426c9e3ae531b4e1c1fbaabdaf2
-EBUILD pflogsumm-1.1.5-r2.ebuild 565 BLAKE2B d3001db0d38c04accd780d08d02009bc73d68281c24c0d7080a90bb5f9d5c10163aaa55e8a778b8d8960954ac3f3807b128970a97d9ec469203e0b844e9dd6dc SHA512 b6bac8d1fbcababf5002a6ea893b0f8e730b09822475c22bb3b85a35a76fd3860ae7483b73dc3630f58477ca924c82ade7267a24a6da24fd73cc8060c97b0c5e
+EBUILD pflogsumm-1.1.5-r1.ebuild 511 BLAKE2B 19ee84aa53d8b9f2d2d596a1741293b84bb9d60fe5b0c650c3b1387f84f2e274fcaeb0cf1e076072a1577dc19fb996e1c34acc32f42b245f310ef5e98c5a15bc SHA512 f6444670556e7594bec12f495d368cb05611c28cac7ebf04e719581e4b99126e647be8e012115c5a2460238ddc14bb424f1b966dc178b1adec57edb52a10a2c8
+EBUILD pflogsumm-1.1.5-r2.ebuild 570 BLAKE2B d852ca5ee409e893620ddab49c573a3415515dc25980f108289b6fb2cba5fdc8588d9933c0480077180f62fd75a2c77d158d7c3c7d836351d1af71021552217b SHA512 586eae10f0722c79e2c0f694ba93bbdfc606d9fa8aa04f78c2d56e7c89c53b3bb54b8cb982195c81d4c3868bfddc05c2359217fdcc78453ce56e999d281a4692
 MISC metadata.xml 379 BLAKE2B 8e9441d2b290b2055894f11d940424ead756cc408b91b5eecd413f6ed4476de9e025fac57b71d8b92ec655787ba8c6e4ec7565f40c2ab22fc0d96051a56faefb SHA512 f39a4765eca2676d25bd98ad9f17c85e528a31ccc1b06e6327203ddfca981363a5eac870fd4f856f4d11926f689dd5b2ea45297055625e2f7089a7b9aec3f975
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
index e47ed3e97164..62a53bbc3c0c 100644
--- a/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jimsun.linxnet.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 ~arm sparc x86"
 
 RDEPEND="dev-lang/perl
 	dev-perl/Date-Calc"
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild
index 8f70f3e92a53..91a56878d770 100644
--- a/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jimsun.linxnet.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 RDEPEND="dev-lang/perl
 	dev-perl/Date-Calc"
diff --git a/net-mail/qmrtg/Manifest b/net-mail/qmrtg/Manifest
index 4aa66d68ce17..ade1fd242bc0 100644
--- a/net-mail/qmrtg/Manifest
+++ b/net-mail/qmrtg/Manifest
@@ -2,5 +2,5 @@ AUX mrtg.cfg.patch 3510 BLAKE2B 4d0d7e94b8ae7ce708056b4880b8b0eadc0ce55913d07ce8
 AUX qmrtg-2.1-TAI_STR_LEN.patch 215 BLAKE2B 9400a5219c9b156207aa573ae8e278b36cd1c73dbe4fd96f3e44a57054315c18b3a1a3db873f372fb994e1667ddebbc96ba9b601c0b91ec7bf8ef1e22dac884c SHA512 027bb8b3d7cc1a3714f482a396a5ecb17ebc401f8fa8491cc4f326c92ad64d2708165ad1462adcddd278c757daba50d4d72c9bfed99283bd308adc29e162532c
 AUX qmrtg.conf.sample.patch 544 BLAKE2B 65797ad17d5939f368bc9cb5070a2bbcef9a4197fc64cb3afeb2670082026efdceb46fa29069022ad11110ff75caeeddd41484c83c5651c56a688b4b86d3d015 SHA512 c667fb5be05b2356782f2fe96d8b3eef1a3bdc6a8b74dfe6254f5718400cd6527baf6cee1badd0e96db26d2f5d2f160e1b47cbfb41baffcb8c79d959333d5cd7
 DIST qmrtg-2.1.tar.gz 97255 BLAKE2B f01904f19418a9a008629b743a47513e29243c9e90feb9960be60c3db2b29b6a8f48f745b1e72510f18655f59493d4e3b36c239271632e586e61bd65440a51cb SHA512 22d7ed55d22af74a62f3974f3d55edbdd08aab2db256cb0866dae566ec7f58eb5ae6ffeaa77ba571cf06eb6cf55a62720534408cb80bf95cecdbe587024259fb
-EBUILD qmrtg-2.1-r1.ebuild 1090 BLAKE2B b79ec2cc92967d4fb50ed5806d681da55b50fb5ab8ae146a31c57a718200a7fca49a87c074cc97c2c787fbdd078399989466c105cc740bf40d86eeeb99f532f3 SHA512 43e8a9bdf3fcaa497089427266da2ce4a4d5e7d6c5fb3427c007289619c0b6b77c8b4cf56baae453c411abde1bc6e6102d88d624e64894b0748bb12d72dbd6f1
+EBUILD qmrtg-2.1-r2.ebuild 825 BLAKE2B 2aad425bbff9c3be2d8a1e0886c70fd0c142bc575019569d4c703dadce5c3dddfc2a2fdd5c3b117aff0fc5153ed568983f7e24f2a3fdcf800867f982b3ec47ec SHA512 266ac2763c96a11ee3264b111d769616e3ccce4da0ec0dfcb895ba871dcc897dc08d8335153b27db1d3aac32bccb82d7547f8671ab20cbc154ab18e5c38eb24f
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild b/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
index dad4124cce50..76d25064d2e2 100644
--- a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
+++ b/net-mail/qmrtg/qmrtg-2.1-r2.ebuild
@@ -1,52 +1,43 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A tool to analyze qmail activity with the goal to graph everything through MRTG"
 HOMEPAGE="http://dev.publicshout.org/qmrtg"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+SRC_URI="http://dev.publicshout.org/qmrtg/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
-
-RDEPEND="net-analyzer/mrtg"
+PATCHES=(
+	"${FILESDIR}"/mrtg.cfg.patch
+	"${FILESDIR}"/qmrtg.conf.sample.patch
+	"${FILESDIR}"/${P}-TAI_STR_LEN.patch
+)
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's|^CFLAGS =|CFLAGS ?=|g' \
 		analyzers/Makefile.in filters/Makefile.in || die
-
-	epatch "${FILESDIR}"/mrtg.cfg.patch
-	epatch "${FILESDIR}"/qmrtg.conf.sample.patch
-	epatch "${FILESDIR}"/${P}-TAI_STR_LEN.patch
 }
 
 DOCS=( INSTALL.txt )
 
 src_install () {
 	default
+
 	keepdir /var/lib/qmrtg
+
 	if use doc ; then
 		docinto txt
 		dodoc doc/*.txt
 		docinto html
-		dohtml -r html/*
+		dodoc -r html/*
 	fi
 
 	insinto /usr/share/qmrtg2
 	doins examples/*
-
-}
-
-pkg_postinst () {
-	elog
-	elog "You need to configure manually qmrtg in order to run it."
-	elog "The configuration templates in /usr/share/qmrtg2/ and"
-	elog "the INSTALL file in /usr/share/doc/qmrtg-2.1/"
-	elog "will be useful."
-	elog
 }
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 8854b72dfcf1..4f7ced34ef3b 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -6,6 +6,6 @@ DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc20
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
 EBUILD rss2email-2.71-r1.ebuild 1579 BLAKE2B 65ba774e855288a8c949c7e401311d7ce65c905f7bcc3406ed639eb13655811c050f67643635381d72fa0969397bf6cfdc82ea7f0522a3dd81d04afffd3e62b3 SHA512 5eab69777125d94098a8df7b2bb4ab65b885e37743a4ba734cc4008852180f1ca6fe8fdb87e94a0e0497583636560e9777ce29138acc097d9db2dd018a4f775d
 EBUILD rss2email-3.10.ebuild 861 BLAKE2B 9f5d398489d761afa3ad3eca70cf814b8417bf48a3c2787e0cec6a05cad409d1bb7928a9d8e518ce13d59c92b388b3be211f83a33795319dc27af97cd759d21f SHA512 e090b36d7e579feab70de7b48d1db13f153521ff4ccf04a74f1272db2697786ebef3c6387f3ec826d7e18b37653d1f44f58526e16c2e6868d726a6156ccb09a0
-EBUILD rss2email-3.10_pre20171001.ebuild 772 BLAKE2B d857de7cda75d2b8dee0754fb38766f6de250ca1dadbb9b3f89e7c40b352cd4abc16887919a0f5c82ae1511a15df2647580393ba9d649aa9024e2976c3262978 SHA512 ae9f03a4b150d80be8082d063b2d55b6e8e7d3c0cca9b0531a82191d79f596ed16fa9cb80bf7855c091ec06e3eecd33f31a3977a65355b310ceca743a904d29b
-EBUILD rss2email-3.11.ebuild 766 BLAKE2B cdc3b6267366f764faa2880b2f5e82f45a220a398f4de0065760b422c180ad697c702853c7155d1952121709ac3e4d1082860fe94f611d3a73d813305504ed49 SHA512 d4b9ad6595c2b33eb7ca08df9c3bc3be5b190ef7752b4238b4ff899a9076bdbdfe043d22781b132369c483e099758d23144834db3790399882ad47417dc7b642
+EBUILD rss2email-3.10_pre20171001.ebuild 768 BLAKE2B 3c1871adeab5b81ffd0c862e84f58a85681bb86eb208da9725edfcdf2f501d030b9e9ffc91b9f031cbe2fe164e5f54c96d43644e6a670415a8baa67796c12c09 SHA512 5da642969a30bb5f0a12d8000006bf88a0decceb5305b9319b6aa665d5e92bb3bfc07ba1fdb0dfd28b79b3a8e0cf5716ef854a59c82b970fb8117f70942f1545
+EBUILD rss2email-3.11.ebuild 762 BLAKE2B c0427f9e11d31ab7da584baf51edea43a6b81a745022f464c9b72b71f6634e5cdc374fb3e92752871f40abe2ad20afd670fb236466f8899889edce3e74b6fb2e SHA512 7c80c920ecca994edc610c2e99f37f62a84c5316722324e1a366df7e82f20cd90b64fa5e4dc20d90f33720add4e2955639892a4762add259369c00f8d4585c6a
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
index 5c87d0dcaab4..41b8679f838f 100644
--- a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
+++ b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
index 48bef2206afe..7e93a36497d8 100644
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ b/net-mail/rss2email/rss2email-3.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Support for 3.7 needs support from dependencies, first
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-mail
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)