gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-mail
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
55 files changed, 170 insertions, 1703 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index a005de5d16e0..9265df13000c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/archivemail/Manifest b/net-mail/archivemail/Manifest
deleted file mode 100644
index 9938a72a3b04..000000000000
--- a/net-mail/archivemail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST archivemail-0.9.0.tar.gz 63482 BLAKE2B 46f497efde7ec906694c8ca1327853ef39d497ceecbac4346450aea4fb58a457633c05f1f14e058822949a13fdea4d97e25b5d74ef66aac422c10308388cbe96 SHA512 7c36108919be22f8cf71aea91435084495ceef54c251ede0aca9d981bb9c01119925d334c1d84eb2c53657170ac6bf0897fccd1f9df05c59fc46e1177194dfb2
-EBUILD archivemail-0.9.0-r1.ebuild 911 BLAKE2B fa3d4a3fd103ed0f78f209b94be47c5ff73bc62f8c3ff1ea2213591051523cc78ee54e8b017a2581ff2e197fe623a21ae57f4455ef414bc3f461ad5848a79b19 SHA512 d220df4d1115003fdfe93d99541eff93aa6fe8960d29f42394038dee64d0427bb872031c8ba55b9cf41b0f7484ac0e5c7645893507771d1417bcd7b9e4a31270
-MISC metadata.xml 248 BLAKE2B 96a9c5373a7fb856355e2f582c0e74785b8d297ab4024e1564d1420d72f34c04a16160fe3a29dffd6398c80cb0fff8159b5edcf29b3b5831a59c44d443eb084c SHA512 62290f257f7ca00db9c3c82a062af5c940d965744665c34ebac2e42a650df2e5b9d397a4e75b9f2368f114114623f3243e2abc6f5863fcff300c325a9ec16c9e
diff --git a/net-mail/archivemail/archivemail-0.9.0-r1.ebuild b/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
deleted file mode 100644
index ab850606ed47..000000000000
--- a/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool written archiving old email in mailboxes"
-HOMEPAGE="http://archivemail.sourceforge.net/"
-SRC_URI="mirror://sourceforge/archivemail/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-python_prepare_all() {
-	# Fix tests for python-2.7
-	sed -i -e 's:\(fp_archive = \)FixedGzipFile:\1gzip.GzipFile:' \
-		test_archivemail || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${S}"/test_archivemail || die "test_archivemail failed"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data=/usr/share
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc examples/* FAQ
-
-	mv "${D}/usr/share/share/man" "${D}/usr/share/" || die
-	rm -rf "${D}/usr/share/share" || die
-}
diff --git a/net-mail/archivemail/metadata.xml b/net-mail/archivemail/metadata.xml
deleted file mode 100644
index c1b730cb088f..000000000000
--- a/net-mail/archivemail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">archivemail</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 6d1e79763af0..1831d0839310 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -2,6 +2,6 @@ AUX autorespond-2.0.5-no-include-bounce.patch 1185 BLAKE2B 275a35692afc5101dca27
 DIST autorespond-2.0.4.tar.gz 7884 BLAKE2B 35b682ecb4de27c4db97f6594e49d05305ff5017e8e6c56bb44d51712a24a21ab70cd242a0a0c1fd5da4c8ed7f2d5efc548b5f2d59ab16ace929a90509a930ef SHA512 0bde01482a1bf16f5c4e478fad8a36ef6a34dd3a753edfdea0787381380c50ab5a95b94e0464dd874cb1a666f9dfb196de55506503bbb589dd5974867298fc62
 DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844ab47e196822d1bceb0543878085de7595b37323ae5134d6d98ff0864a1865fce4498f0f4b9464398b0cc2062d1e7 SHA512 c27565962677654251062538a76ebc0f5402cb8b0027352060e6aa51871be27c0e32c6898be7cee72d2a80680b79d1ce7bf23249abfb486a851d73005ef7e7bb
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
-EBUILD autorespond-2.0.4.ebuild 644 BLAKE2B d84f70c31bf19fa295e2c45f7ba13cbfb9da4177f4499eac338c50365c7e8610dff9c7397ab174e5f1d83c3603293515b53092d652fbe06dcf4214ec76069e7f SHA512 794f8255a5889cff6e5fa87ef1728a0c3096bf32fd04e913263686eace3a1a0054aecc4923b83d23acf8e836c9e5f486ba4653b2adee310786d817a3baa53ddd
-EBUILD autorespond-2.0.5.ebuild 780 BLAKE2B 47ca54805e91cfbcef874e0f41468cddfb1c7a7853bec356e83b98afddb8e9d89faff6c59a4eb9aea6071b531513958358add436164483118b0e7ff9d8e3d1fc SHA512 3b72a3c8c5f94cb7fe5b7d574228cdc9f2dfa4a7d5f7911111cdd8edc2a167cefd511a6fbfbc1b7b3c49778d33cffaecefcdbf7f75bc3baf9b7307da2fb43825
+EBUILD autorespond-2.0.4.ebuild 649 BLAKE2B 896051d0cd18d6fdf7142b4243070381281218c2945fa189a1062401713801441ff89c03b0f1e20b958fb4a3c4f0350f26bd63a7a85e86dec8c55bec9d08de6a SHA512 c87f8e7e23271682dcf399ebd97abe73c7e51cd764d3e79dc2b146109127c887eba14dc5630703623a3cac56364bcdfa3a6c7c2beb7707e9bf8c9ef7cfed568c
+EBUILD autorespond-2.0.5.ebuild 781 BLAKE2B 65782589d2d1daa5a111f9c24df6880b90270e3a7c2fc03730f028956667fbfb74daa6ee4f7e920f53253c4aabce41830b32bc3d11f181e5a0a491753697f955 SHA512 a9d3079fcb362b4b5d0e39baf23f193e2abc021d6c83e5dbca791aec269cc0ee8cf07faabcfaf2c97808d8a8e2047f36ae4beb265c55e191b0170b1977d2492c
 MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index e31c689b04dd..b1853c18e1ee 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Autoresponder add on package for qmailadmin"
-HOMEPAGE="http://inter7.com/software/"
+HOMEPAGE="https://www.inter7.com/software/"
 SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
 	mirror://gentoo/${PN}_${PV}-1.diff.gz"
 
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index ef3e2880e152..043fe13b37fd 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Autoresponder add on package for qmailadmin"
-HOMEPAGE="http://www.inter7.com/software/"
+HOMEPAGE="https://www.inter7.com/software/"
 SRC_URI="http://qmail.ixip.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 7ad774fcf292..4f173998405c 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,15 +3,13 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed
 DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
 DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
 DIST dovecot-2.3-pigeonhole-0.5.10.tar.gz 1899237 BLAKE2B a308500d6a51d4a9b99ae16b75829f1f799351675a31d91e450c4ea1b095d7719af424534f4b7736559b06819a337e7be0bd44307b77a775c8a54359e41822c1 SHA512 f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b
+DIST dovecot-2.3-pigeonhole-0.5.11.tar.gz 1912411 BLAKE2B ed35cbae5ea2c1da24a1a255c1fc943b9a8c35280840ea42c1b5f83ea327872bb83ae8901696abfe3b0d27dfd6c11d3fb1661614fad54eeab9d700b5f0b7b13a SHA512 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d
 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.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb
 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.11.3.ebuild 8632 BLAKE2B a7a0663a23eff59b6532bbb9b3af4e24aef39448784e90e6f92739aff6c47143de45f3416f7aa5e061e3489ee5141c9d6385bfac1df02890e121db4b81ce55d9 SHA512 d94485bd763eb04045419f15cd93efadb3b149fe90938256a66947d8b4f486c4f4f54d21f08998291d2e7e3ab9b1fb8cb2a1ca6fd6a1010e40dc3d0c4f301140
 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.ebuild b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
index 55d798652c57..1141fb82f34c 100644
--- a/net-mail/dovecot/dovecot-2.3.10.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.11.3.ebuild
@@ -10,7 +10,7 @@ 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"
+sieve_version="0.5.11"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@@ -28,11 +28,11 @@ 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"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+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}"
 
@@ -56,6 +56,7 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	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
@@ -116,6 +117,7 @@ src_configure() {
 		$( 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 ) \
diff --git a/net-mail/dovecot/dovecot-2.3.9.3.ebuild b/net-mail/dovecot/dovecot-2.3.9.3.ebuild
deleted file mode 100644
index a41f1f0e0e96..000000000000
--- a/net-mail/dovecot/dovecot-2.3.9.3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# 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.9"
-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"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${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 )
-	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 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/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index c9f2e29045d4..69aa2ae2cd92 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,10 +4,6 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-DIST fetchmail-6.4.1.tar.xz 1257488 BLAKE2B 101a7c2da7374eb180a4afd576bd436e074241b2071107676330e1773a33035a20f406e3dd1e0f1a280887b4556f68fc6c87be1eabf9b7e3003dff4cc740eebb SHA512 940b8df52f963f71537962ebe2b2cb88298fd2b54ca79932e5c974abe850f0b59cdc4919d606ee4f210e82d1e0a6f090ea87f1d3bdea18b531d4fbb36f7f9ea0
-DIST fetchmail-6.4.6.tar.xz 1262256 BLAKE2B c5abb5b8b80f2cd61fd3c6c38956c753bb74597c585974d5529c8c7665ef13483b4292c1247df43f8702f8bd3b055b8f77bdfc2ae620bea170e8bd457fec9a49 SHA512 0101c79039c754b55e94181fb6c51f07782e581123e25ac72a99c2abe8f3ac4af3e97b12bab50813fb9300179b921c80d0bc60f528ad73c914ad266e29fb6513
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
-EBUILD fetchmail-6.4.1.ebuild 2604 BLAKE2B 87cd29799760d4ebf46e5da0539b7bdc6d9f8d46b7cf74708e3e4c58d5bd495758b7bfe480d86ff7c83728e33ae7599946c62383decd8f30169197d87205647b SHA512 2c1e27730dbdf9245aed882f31e663975735acb3befabc1d5fadd9ea7889d50498e7adad114cf68d4d8b9ca3251a816a13d2d23d7dd187645d0c5ef3985fd6b5
-EBUILD fetchmail-6.4.6.ebuild 2512 BLAKE2B cf7c5298c4cfafe328b92e94cb3563a1d6ccce7850152fd61e8d5a19505bb4d7c809a5830ade28c6fe3b0aeddd62dba625fc258c5ba478577fbc45da5d683c3b SHA512 f0d42322c6a97bad84b73212db5e2308cbd04f6d511cf27e1f93517f0d32c7e462a74b341548414bc6bdb7562e29270f9018ba021179b4ae829ee09f32901dcb
-EBUILD fetchmail-6.4.8.ebuild 2512 BLAKE2B cf7c5298c4cfafe328b92e94cb3563a1d6ccce7850152fd61e8d5a19505bb4d7c809a5830ade28c6fe3b0aeddd62dba625fc258c5ba478577fbc45da5d683c3b SHA512 f0d42322c6a97bad84b73212db5e2308cbd04f6d511cf27e1f93517f0d32c7e462a74b341548414bc6bdb7562e29270f9018ba021179b4ae829ee09f32901dcb
+EBUILD fetchmail-6.4.8.ebuild 2504 BLAKE2B a2b5a37b819b65db9bfdca8f32fbc834719a7d55f628ef8e8135e1a1835ef88105e248ba3b4507f79fc344aec50daf0b5797ad79ac859704d686e30828996ea6 SHA512 7f49692ea00fca151e02226c7f2d2488a6fc4bfefae48f0cf3e7db574c00282d6ca2f3aa7499d485d8c9d34b09caaa4d990f6502598c8d13fbc78f4df7a95c59
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.1.ebuild b/net-mail/fetchmail/fetchmail-6.4.1.ebuild
deleted file mode 100644
index 26040d1b23e1..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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 user systemd toolchain-funcs autotools
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://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 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="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() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-
-	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() {
-	# fetchmail's homedir (holds fetchmail's .fetchids)
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 700 /var/lib/${PN}
-
-	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.6.ebuild b/net-mail/fetchmail/fetchmail-6.4.6.ebuild
deleted file mode 100644
index 657ffb71fe6e..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1 systemd toolchain-funcs autotools
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://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 ~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.1.1:= )
-		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}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-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.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 657ffb71fe6e..fe2a41ee0afc 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -14,7 +14,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 ~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 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
deleted file mode 100644
index aa53d8fa841f..000000000000
--- a/net-mail/getmail/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST getmail-5.14.tar.gz 199501 BLAKE2B 54bb79cd37303f423b70bae0f3072d338a8c66b25d59f8b982029d5faebb65a3f7ea979ec35d0dab61d376754dc15e206d443cd0cb128a3c438a09dfb8107f69 SHA512 0646864af56fc044525d38088164c2c026a8f29b231c25c9cfe9aa922b1e5170cf49c63874da9bd593b49be6ed822bd4da7ea4ebfbb59cfa6e1658e2b565c184
-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.14.ebuild b/net-mail/getmail/getmail-5.14.ebuild
deleted file mode 100644
index 577087573948..000000000000
--- a/net-mail/getmail/getmail-5.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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="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/metadata.xml b/net-mail/getmail/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-mail/getmail/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 7530297beeea..ee9f4f9123ed 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 852 BLAKE2B 5ed49393e6cd36e1c1a88dc88d8a26aac2378d39e757e43b9e27751343b42531090b237dd6729a73bc905ed69f5fdbd127fcc34256f4a388d597fda9e4b54bdc SHA512 3ae888d15a1996547d6e800517f96f989bc8b8a5dd0a62e563543b77e05edf52b5c977aaba1c269c83cfab66ebeac114a53b8662ec872963b87ef86cd5d6b246
+EBUILD isync-1.3.1.ebuild 859 BLAKE2B bb36f26b449eacdf714b047e8ab0facbf6487fa1abbe1e2e054ef2775486e9a0fc2af67f701281ecd44c15096daff32760e2360ceefe29cab363ee4924a06f20 SHA512 673c7da19bbab310ba3bb451d274ced14b40f68527828d2fa0fbe551edbd87cb3384f9d6441bb8c81723d7caf779d93f4f34caf7cf6bf4f973147ec992bc3701
 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 0cdbe37f5f62..80b7966c1473 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 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 IUSE="libressl sasl ssl zlib"
diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest
index f8197313c0bc..964bdce46535 100644
--- a/net-mail/list-remote-forwards/Manifest
+++ b/net-mail/list-remote-forwards/Manifest
@@ -1,4 +1,4 @@
 AUX list-remote-forwards-0.0.1-ghc84.patch 978 BLAKE2B 295f2ca369794739da3ff45bf6a5ca57b102942c93b8dd8c4e99d9a70906a469c761aa0fdbe50311d6e56d5bb0725610dd473c49152f4cdd3462cd2da2a8418d SHA512 4f9addb938b14590d98e4e17e6764987ebe4192d7492de1ce2c917881ec20ecd15898988c223dac695ed8f71d7b2fe74f8b798a52960f215fd4c9c9a02c9a72e
 DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317
-EBUILD list-remote-forwards-0.0.1-r2.ebuild 1101 BLAKE2B 6e632191a0332dd74eb6d0edd5c922577ecd70b3d6c91031cb9ec4b96a1ba548560534cd243bd785f3d7d8c3f2f92701a2435d0134849391a72b52bc7e170b22 SHA512 2997d82a3c25e21ef173231fa4e52afee4acf6c175e76fedf695b564ab614370b770057d7e84f3dd4ee5632b350a03914e9a7d9c6a52e77a519717fc387b7f65
+EBUILD list-remote-forwards-0.0.1-r2.ebuild 1102 BLAKE2B e99643563681691dda52782684eae8af1f31e06afa1b9ed9052b1b8982aeb1d8d1c3cbf2a0c3b114dd653f48be8c7feaabbc7c10362178f0020bb68f31c9a029 SHA512 084cffafb7560c4ec445b7c3f3517751c5464ee2f0f4d86cf77e400651f41dbe77d5a21f5693ba9879ad2b6a465d907b0482211e2e6f29a2556f68f77c2baab5
 MISC metadata.xml 4175 BLAKE2B 183538e85d540850e8176fb6c2a6a24dd0dfddeac8bf9b9ee684b11ef8ddb54c58e5a0292f67e72c15264880fcd68d253b48c3ca70bf0b8110b9cc8d58438186 SHA512 a6cb86568d00776106d194639bfbabec5e753e8bcc5c4b1c2f50f25f1202865ea45a946e55de5bc41a79ad7a18c8d9442ec7e964065a1b00fa0c5937177ee9e4
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
index 783e292e6dec..a0fccd96a41e 100644
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.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
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="List all remote forwards for mail accounts stored in a database"
-HOMEPAGE="http://hackage.haskell.org/package/list-remote-forwards"
+HOMEPAGE="https://hackage.haskell.org/package/list-remote-forwards"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
index b7380bf802ee..f53c41cbc9f6 100644
--- a/net-mail/mailbox-count/Manifest
+++ b/net-mail/mailbox-count/Manifest
@@ -1,3 +1,3 @@
 DIST mailbox-count-0.0.5.tar.gz 21476 BLAKE2B 3ad79233ae1dbb202bc46c60e8a7d13d5d6820f74e090056f37eacb7b37c2f18498f599603d1ee32a7ac43b5f9931f26aba1780ff5160333c66129889ac6812b SHA512 3c63bd9021f64ba745572907eae8bc25e9ddc7d443d5ab84626dd90f95af71267cbffb9d371f0e308988fbdf14f3a126d93a727d55bf9ee3e02037e687267d26
-EBUILD mailbox-count-0.0.5.ebuild 984 BLAKE2B eafb2dccc798c8a94e8dec3fc6b47e6ec8b42efaf2054c306b966695214f09682a7ae27d674b15657c65b8cd8367e6201a1b5a8936ac4c7a97242f3750f2eebe SHA512 4e9b39e561fc96b6feaa5b92f9378bb86b66568a1f1c23b9eaf3c92a51f73fd88e616fc31b709a3e4ee991a446838773ccea5bf0704be616c88c98ae441e171c
+EBUILD mailbox-count-0.0.5.ebuild 985 BLAKE2B 7ea08dc98897050f08b4066384ef0c9488caafe53c008ac1cde03ff19af3828410d8da96477b4a6a008df7bde208904cd54ddf3d5a1df9d0d1343a6494bddc7b SHA512 b0ed10746ead2a817c910444cfdfe4db7bab9ba4b7e1ff6dea115e2a0fa769c94e8e5a74c6f2972104ee379ea5352537ffb275428dc28ad74ffb5c69a81caadf
 MISC metadata.xml 3288 BLAKE2B 15a60ecab50dad246513c9060e9cf73b4a00c4a6264085357c04461e83a262497780c831823fd54a94d2c2a2b10cd836c51632e24683bbc5d0541d657e383a4e SHA512 95bbd72ec2a640fc2f4d9b67ce8388edbf3b7e01e181bc874fd62d11fabc5858506c35e613bb9215e6732ae4c968ad87df3b93b917cded023691452d0368e8d9
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
index 00d1fe4550c6..5173370716a2 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
@@ -7,7 +7,7 @@ CABAL_FEATURES="test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Count mailboxes in a SQL database"
-HOMEPAGE="http://hackage.haskell.org/package/mailbox-count"
+HOMEPAGE="https://hackage.haskell.org/package/mailbox-count"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index dcd42e5893d3..e29c5216057d 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,18 +1,14 @@
 AUX 50_mailman.conf-r2 482 BLAKE2B 670ff96cdfed658558a1062259bb95441bb5ca2f54f710532f2ec075efbfb0c216fad255fcac158cb6ef2d987bedccc0feaa518fd2190692922b9ddb2e0d4840 SHA512 c279f8709ea7932469c0d8ff0b645df228562678081df5fc3d946d62f7bbbc33f4723e71fd4560eebfc751052a6a271d4aadf6affadefeca107f41d3193563d3
 AUX README.gentoo-r3 6691 BLAKE2B aa740e1936f756f8eeecfb88629adc36c33d43ab283a298752865913efc1d068ceb45884d9c33fa45fc4e34e6016b6981f42769172fb7f2bac8dd842faa8e26c SHA512 12490bb17b4da308f0855fa9f5e36c2c01c806822021d3ac92dc15cc7901a417dbeb1e1f78c9df2603128076bd11d9ded0a946f4cedd3b056a1694afbdab28d3
 AUX mailman-2.1.14_rc1-directory-check.patch 786 BLAKE2B 24cde989fac774ecaea27075ee58c583bf7812cb0b9b4b12a84bba99e144dd060df2f557d952827a5243c1daccd80fdac7353f931e3fc36d903e26aec595e5fe SHA512 510a67915163732ae05ed9f8920f93eb99538a706d85e4fb2c071e01a6d88be8cd32aa5ea0127d36a1dc4f7a735c179bb1169e7358025ee7d3c85b0c8cda44d7
-AUX mailman-2.1.29-fix-libdir.diff 665 BLAKE2B 58b93c05c699d531dd2ae0275302d578819005dc49ff9d4bc216ca73fc1ce8e4ef9c81ea5e8834843b89cf17f5bbcd58b0b9b271f7da8215866df58c3783c03d SHA512 a75c34523d96fc1cad4bc47dc4603967d1b654ee8710dca77bcf7cc2588fd0299492add8cbc4bae85c445534cc992ba6372a01405707d7c08d445287822f3a48
 AUX mailman-2.1.9-icons.patch 555 BLAKE2B c000931d44321f0eb9fabdf1a49cfcd05b2c68a3809f302f9275eade918135bc231860cf9c2ab798827b9f1e5baf59a74cbaabc3787e95f3001426425ebf6de2 SHA512 caec3eb1abdb29e92ebd6a589f93870ffc91bbcc7bd2e0115e38f48ae0a31e564037a4a828395229ee238d215e72e19a31d53c8bca6c39a48b5c08a327e663a6
 AUX mailman.rc 488 BLAKE2B 76f35e4e1a5257b6aa058b0cea29cf53640322d436a195140cd71b7bc749d4205fc4555b611b1713663604c08ca929b3aa57d60355d8e9e5e9b7056b9dc1c5f1 SHA512 bb97f6fec48cf474be66c1aa73adc874ceaeee894acc3fad76f4b3f5e6f82dcd4238a6915de941fe87f815668dfb6c5ffe90926c5aaaddedf7dc06dfa4c1a126
 AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3ea55ef27d11daea102a1ecae30ddda095c1bbf1b175def17b9ad2db5a3e0b8e694ab02ed94a557e87 SHA512 c4a5532666afbebc5aa69463ec9b9eaa2dcb03fdd8fd62307920a4572d0c795c1d93478236240746018be617c0eec0fcfcc1c711e8810140fb8ffbc0a9b71009
-DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
 DIST mailman-2.1.33.tgz 9412979 BLAKE2B 1018ee5b2993658117ac5a1d76e1742c5e27cef69ba2892e8f56897f6c00394b1b479b3fa00855f78211844bd531a5ac1e5ac8c9d16763dd49303ab3690edc0c SHA512 1e7bb58a9d38e5171f682563abb0b23fcb0a7423e0e7fa883326815ada37ffa8074845ea70fad4ea29fa098a6e7203e259caf57532e09a0f7c05120f89dd83a9
 DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
 DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
 DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
-EBUILD mailman-2.1.29-r3.ebuild 5863 BLAKE2B ce55af2241c9ace4519e33da2fcfcdea4bd5fe04f17a4e075519e73f7153ebe1f385a4663a7042f720a28e96068bcfcbe28aedcd3d88e28a670a942dedf5a2ee SHA512 b221b40ad1dbece603eb7efd175cc52a66a5e298ae4b2e78dcef387f13a82b9597a0e0cf23bb4b052d5f63e911a307c0984a5e96098328743e3fb68a3971ba6a
-EBUILD mailman-2.1.29-r4.ebuild 6036 BLAKE2B 5c600f87ab4772e05800077ef0a320ad0f725ede719e93b8a0cf444f9bf80a7bd5f22b5331976584eb5e33c163d9db00ce9aa5c58a4ce99a2388b1786bf7e3a1 SHA512 06184706205800d5b48e888d2e98f86e9bc736288421625f13b90ebdf7cfc4c7ecbe35c0796576404c822ccf321ab248d5f0da040a5723fcd123ebfbdfef1b4c
-EBUILD mailman-2.1.33.ebuild 5866 BLAKE2B e3ede50fae262f888356a97c358b9c7f22441a94f32365af2660014edfcf240ad22cd13ccb1e74ceb65179b402fd7ba6cdd5be0d534a8a779215bc2b256c779c SHA512 257e8f5a5c34fc6c14847f82974648fded3c7ee3d52ff0124f35fc3ed76bd8f94e9e31883aca8a87d66b72b30d157997160864ed62f20d0c57bce09c500f09c6
+EBUILD mailman-2.1.33.ebuild 5863 BLAKE2B ce55af2241c9ace4519e33da2fcfcdea4bd5fe04f17a4e075519e73f7153ebe1f385a4663a7042f720a28e96068bcfcbe28aedcd3d88e28a670a942dedf5a2ee SHA512 b221b40ad1dbece603eb7efd175cc52a66a5e298ae4b2e78dcef387f13a82b9597a0e0cf23bb4b052d5f63e911a307c0984a5e96098328743e3fb68a3971ba6a
 EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
 EBUILD mailman-3.3.1.ebuild 1474 BLAKE2B ff1f4e9c30bb04449413f387c37d0e3dabf62895ce8bdba42208ca2f85d0071e4320df2cae180ca1f62d880a6a3f67f5fa846de4534704369cedfa5b5adc89fe SHA512 afe16caa2ec32a4ded2acc05063393884c0409071a82505bc2efaff15941c8cbd03bb43a81a572a2cc7fc15ddd92cc1a86ac9bbdb2101a449dd1830c694871b7
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/files/mailman-2.1.29-fix-libdir.diff b/net-mail/mailman/files/mailman-2.1.29-fix-libdir.diff
deleted file mode 100644
index f095938ff42a..000000000000
--- a/net-mail/mailman/files/mailman-2.1.29-fix-libdir.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/paths.py.in	2018-06-17 23:47:34 +0000
-+++ misc/paths.py.in	2019-08-16 15:18:03 +0000
-@@ -67,6 +67,16 @@
-                        'dist-packages')
- sys.path.append(distdir)
- 
-+# Some distros may have the python library in a directory other than lib/
-+# such as Lib/ or lib64/.  Hopefully they will have hacked
-+# site.getsitepackages() to return the right thing.
-+try:
-+    import site
-+    sys.path.extend(site.getsitepackages())
-+    del site
-+except (ImportError, AttributeError):
-+    pass
-+
- 
- # In a normal interactive Python environment, the japanese.pth and korean.pth
- # files would be imported automatically.  But because we inhibit the importing
-
diff --git a/net-mail/mailman/mailman-2.1.29-r3.ebuild b/net-mail/mailman/mailman-2.1.29-r3.ebuild
deleted file mode 100644
index f4b289046d8c..000000000000
--- a/net-mail/mailman/mailman-2.1.29-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install() {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mailman/mailman-2.1.29-r4.ebuild b/net-mail/mailman/mailman-2.1.29-r4.ebuild
deleted file mode 100644
index 82228bd9d94c..000000000000
--- a/net-mail/mailman/mailman-2.1.29-r4.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-	# Needed for new no-symlink profiles,
-	# see https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1819
-	epatch "${FILESDIR}/mailman-2.1.29-fix-libdir.diff"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install() {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mailman/mailman-2.1.33.ebuild b/net-mail/mailman/mailman-2.1.33.ebuild
index fda789269651..f4b289046d8c 100644
--- a/net-mail/mailman/mailman-2.1.33.ebuild
+++ b/net-mail/mailman/mailman-2.1.33.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.list.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/mailshears/Manifest b/net-mail/mailshears/Manifest
index 7d1603dec433..867bd79062e3 100644
--- a/net-mail/mailshears/Manifest
+++ b/net-mail/mailshears/Manifest
@@ -1,3 +1,3 @@
-DIST mailshears-0.0.3.gem 68608 BLAKE2B 9130661793dff215bf2e4d98574a5a001f48a60dd2fc66475edaf1e381eda4cbcac7687158b2103958bce4954ebe23b8a1398029be779f7c716e33ca95c500b5 SHA512 4adeaf78c610111e6b32f5d5fd090476cec228a89462d6f70f0360d4492e08c49f672051b2520a98b07958b865b28593c31f595e4283c334eb97eab1d7c3e5aa
-EBUILD mailshears-0.0.3-r2.ebuild 661 BLAKE2B 3b80fd9612aaa9f3bbd21cf183f09fc89d557ae8dd06c6db1d4ede2646af8504bd71ece2f13f7adcea8cc3d5f9f4ba3691a9cc7d3f896cc860f284e10385f9eb SHA512 88f545b9bf52531d74dedc2e5c7d9475bbdfeac0d81c7ef51abfab91dc4db32a75a9a50662d38f488ff4b7fcce38431f478562c61692160c7c14bf144c4bf4bd
+DIST mailshears-0.0.4.gem 68608 BLAKE2B 8adca0b902145f9ed97f9154db927f0ba9aa4696c37485c6ee9c3001f728f6f0554d0d8330b6173d7b636712f123107aa71cd818dba91aa8abf956df016775e1 SHA512 6c808ae2d1f2393c19fcad2a0c9c437a7a79354f779dfbbe8ec1662c39a534b1318ee30355593db9027d8b9eb418b4f99f4b87d06441668a3c15c0987ea8cf57
+EBUILD mailshears-0.0.4.ebuild 660 BLAKE2B 0a31a9c3465ff520bf8caa7f2df6eafe57a3e94ca1f7307a5e8f476ab5945428e36b1f6eba57f06033bcdcc5e45f5a1d26065b755de70a14de3f3d500d36f6da SHA512 77a523d371734dcb4c6428aeaf2cf7cc81b0d9c65a1681fd8e271af7089182b558a64b802551037b723fba58ef28919de739b4dc4f575a8077b51e2e4a636029
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-mail/mailshears/mailshears-0.0.3-r2.ebuild b/net-mail/mailshears/mailshears-0.0.4.ebuild
index 3528190a0c78..7132ffd3fffb 100644
--- a/net-mail/mailshears/mailshears-0.0.3-r2.ebuild
+++ b/net-mail/mailshears/mailshears-0.0.4.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/pg-0.17 <dev-ruby/pg-1"
+ruby_add_rdepend ">=dev-ruby/pg-1.2 <dev-ruby/pg-2"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index a2476aaecd35..77823c3edcbf 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 3737 BLAKE2B a5f5eb5386b3bee93517e027459d18dfb0e7691c146d10f488c84206c2efbbe668cb144f1abe8cb54ebe544e69a9edc5792b2531110b1dafa316811eb67bb586 SHA512 b7b25c23ac26983a10f1c36095df3d3370e2f6fd6394ebf94fd7040fbe43d34a7266290034f4e767adae7e58676b0b22b5c0fe72a6b0841114694ddfcb054caf
+EBUILD mailutils-3.9.ebuild 3739 BLAKE2B 13fb7f18735f13d30efae2f7c2648cb5c4086a22b6040b1fb8bc241db05f2564b13cde55e89e1fab7f860cb5a1fe0c8031cd9f13a59797d0a733f77135983387 SHA512 ae48e56b879c5fa53332632d9afab159faa7d34db252d7e4b6ae7c7188b1e4eec0b0b6b4b8287b9ab226e72e5947ef17fe71e3ce783592660786a599f728551a
 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 55a00419e26e..6b8bd7c87c47 100644
--- a/net-mail/mailutils/mailutils-3.9.ebuild
+++ b/net-mail/mailutils/mailutils-3.9.ebuild
@@ -28,7 +28,7 @@ RDEPEND="!mail-client/nmh
 	berkdb? ( sys-libs/db:= )
 	bidi? ( dev-libs/fribidi )
 	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	guile? ( dev-scheme/guile:12/2.2-1 )
 	kerberos? ( virtual/krb5 )
 	kyotocabinet? ( dev-db/kyotocabinet )
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index db649a4cbb80..e87bbed84912 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,18 +1,10 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
-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
-DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87
 DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043
 DIST mu-1.4.10.tar.gz 2309459 BLAKE2B 38aa09e1efd788f1ed0d490dfba04bf4f3fccf1eb40d22d2d205934ab6d71ec8739d1baa019ba4c9a0593a0d9487533a46048f71be042178bd33bde6130cbb80 SHA512 59c06e1a0bc893c7dcf5e758dad15be80667be8bb914e97f16158709ebfd50ca29b3a27934bc2df29cc378ce17a3778c5c44738703aa77f5bde21050abb6eb0c
+DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce89d642ecbaee988752bc20a7f525809a6d911cbc46dadbbeb5db126f7d01465e3dc18ffb099ad1159d3839 SHA512 7e376a58fed80ed1110ad342e3578a427779d4fd715990ce5b87d50b6c2488774b47f9b151dca80bb8723eee8db99699f97df975d199dae0d75576f5c2ebc35a
 DIST mu-1.4.4.tar.gz 2311600 BLAKE2B 1953dc9e63fe013af2821a58fde0222d3d7b61266807bb95345aff7c6e3f988fa6589bcca79612bd64296f50e2b4feda62cc3f4aa4d731f3f4cebe4e3a21cceb SHA512 db317706956304df9e0c6d53ce9b2bf444f5fc66903deb8ac13c8d771ada016d009e3b10d8bf76cfeda1d712fa3e23bed70362334231cccfc072bc181c6660e5
-EBUILD mu-0.9.18-r3.ebuild 1775 BLAKE2B 87146e9495664d360ccb98a7693e24a7498200cd80c2e565d55f139a3039f7ed48dc448f2c4eb1f14242b6054ba3e696e9b76fb5b7d60d1a86c3bf576ac6e2d4 SHA512 87321aacc6dd25ce0442fe5ef161433bbb039c58b4c4424f94d893377a5f5ff7b4358ffef67162a94544452c2d49e3da6bcdd3799ac1d8ef86fc8263654c71ad
-EBUILD mu-1.0-r1.ebuild 1778 BLAKE2B 85c611bc38bb40c202d3b39fe2d8a2e0fc3ee1c1aa5a45c892d19a0c5986d7cd973f8699f5090c1754220db43c7a9dd0587862112b70cd192a75d16fdc487a8a SHA512 aa0fee0bdd2d8596cd1da4dcc11f70c0e5f73a03007777f36a0367964f8a1aae8cc7200fff1de374f8d7c3f9f8121a173ecda6f6b7f932a3a2ba5bba2c63f7a0
-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 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
-EBUILD mu-1.4.10.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
+EBUILD mu-1.4.10.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
+EBUILD mu-1.4.12.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
 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/files/70mu-gentoo.el b/net-mail/mu/files/70mu-gentoo.el
deleted file mode 100644
index ce445f1c559e..000000000000
--- a/net-mail/mu/files/70mu-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
-(require 'mu4e)
-
diff --git a/net-mail/mu/mu-0.9.18-r3.ebuild b/net-mail/mu/mu-0.9.18-r3.ebuild
deleted file mode 100644
index 17950a60e941..000000000000
--- a/net-mail/mu/mu-0.9.18-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/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"
-
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	econf --disable-guile \
-		--disable-gtk \
-		--disable-webkit \
-		$(use_enable emacs mu4e)
-}
-
-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
-	# TODO: Add guile man page when guile-2 is available.
-	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-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-}
-
-src_test() {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-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 "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.0-r1.ebuild b/net-mail/mu/mu-1.0-r1.ebuild
deleted file mode 100644
index 19409d4bcc32..000000000000
--- a/net-mail/mu/mu-1.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	econf --disable-guile \
-		--disable-gtk \
-		--disable-webkit \
-		$(use_enable emacs mu4e)
-}
-
-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
-	# TODO: Add guile man page when guile-2 is available.
-	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-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-}
-
-src_test() {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-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 "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.3.5-r1.ebuild b/net-mail/mu/mu-1.3.5-r1.ebuild
deleted file mode 100644
index e81f2718d2b9..000000000000
--- a/net-mail/mu/mu-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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="https://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"
-
-DEPEND="
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4
-	dev-libs/glib:2
-	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.0 )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Note: Author recommends that packages do not build the webkit toy
-	# Todo: Add gtk USE-flag
-
-	econf --disable-gtk \
-		--disable-webkit \
-		$(use_enable emacs mu4e) \
-		$(use_enable guile)
-}
-
-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
-}
-
-src_test() {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-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 "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.3.6-r1.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild
deleted file mode 100644
index bf17204edf7b..000000000000
--- a/net-mail/mu/mu-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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="https://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
-	)"
-RDEPEND="${DEPEND}"
-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 "https://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.4.10.ebuild b/net-mail/mu/mu-1.4.10.ebuild
index 99919703af77..fe038e53b674 100644
--- a/net-mail/mu/mu-1.4.10.ebuild
+++ b/net-mail/mu/mu-1.4.10.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/mu/mu-1.3.6-r2.ebuild b/net-mail/mu/mu-1.4.12.ebuild
index c5ec06576a4c..99919703af77 100644
--- a/net-mail/mu/mu-1.3.6-r2.ebuild
+++ b/net-mail/mu/mu-1.4.12.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	dev-libs/gmime:3.0
 	>=dev-libs/xapian-1.4
 	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.0 )
+	guile? ( >=dev-scheme/guile-2.2 )
 	mug? (
 		net-libs/webkit-gtk:4
 		x11-libs/gtk+:3
@@ -47,18 +47,14 @@ src_configure() {
 
 src_install() {
 	dobin mu/mu
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README 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
+	doman man/mu-*.*
 
 	if use guile; then
 		  doinfo guile/mu-guile.info
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index b1b70f6601ec..809879cb974f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,7 +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 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
+DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
+EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
+EBUILD notmuch-0.30-r1.ebuild 4345 BLAKE2B fdbb795db2d7e23bb3d299a023501e3b727229903b92d5ce6ff99d26a27f11bb25db5246044a90e62b2cab24a07afbdb7855092ca0bb425a14c99bd4193db505 SHA512 8de4b89d348f83edf1803e2d5781ba632bc20e9b3db28ef5aff6f756e8fc58c1bbe954a1f0de8ae23a1901104d40b265a9124d9e9d29894f150581971b2a7b1e
+MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e
diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml
index e5089957cdab..799fdb5f19ac 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -19,7 +19,7 @@
 		<flag name="nmbug">Install experimental tag sharing /
 			pseudo-bug-tracking script for Notmuch
 			(see http://notmuchmail.org/nmbug/)</flag>
-		<flag name="valgrind">Depend on dev-util/vagrind for test suite</flag>
+		<flag name="valgrind">Depend on dev-util/valgrind for test suite</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large
diff --git a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
index 7750baa97aef..9d7b13f40a90 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3-r2.ebuild
@@ -19,7 +19,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 ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~ppc64 x86"
 REQUIRED_USE="
 	nmbug? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
deleted file mode 100644
index 35caf2d27477..000000000000
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{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="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 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 )"
-
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-24.1:* )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	test? (
-		app-misc/dtach
-		>=app-editors/emacs-24.1:*[libxml2]
-		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
-	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
-	)
-	"
-
-DOCS=( AUTHORS NEWS README )
-NEED_EMACS="24.1"
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
-
-bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
-		popd || die
-	fi
-
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
-	fi
-}
-
-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() {
-	default
-
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
-
-	if use test; then
-		append-cflags -g
-		append-cxxflags -g
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
-	fi
-}
-
-src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
-		--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 "${myeconfargs[@]}"
-}
-
-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() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
-		elog ""
-		elog "  source /etc/mutt/notmuch-mutt.rc"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild b/net-mail/notmuch/notmuch-0.30-r1.ebuild
index 13810a43d49b..87312c1e943d 100644
--- a/net-mail/notmuch/notmuch-0.29.3-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.30-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
-	distutils-r1 toolchain-funcs
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
@@ -15,48 +16,53 @@ 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
+# 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"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
 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 )"
 
-CDEPEND="
-	!!<app-shells/bash-completion-1.9
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/gmime-3.0.3:3.0[crypt]
-	>=dev-libs/xapian-1.4.8:=
-	dev-python/sphinx
-	sys-apps/texinfo
-	>=sys-libs/zlib-1.2.5.2
-	sys-libs/talloc
-	emacs? ( >=app-editors/emacs-24.1:* )
-	python? ( ${PYTHON_DEPS} )
-	"
-DEPEND="${CDEPEND}
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.14:=
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cffi
 	)
+"
+DEPEND="${COMMON_DEPEND}
 	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
 		app-misc/dtach
-		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl )
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
 	)
 	valgrind? ( dev-util/valgrind )
-	"
-RDEPEND="${CDEPEND}
+"
+RDEPEND="${COMMON_DEPEND}
 	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git )
 	mutt? (
 		dev-perl/File-Which
 		dev-perl/Mail-Box
@@ -68,38 +74,27 @@ RDEPEND="${CDEPEND}
 		virtual/perl-Getopt-Long
 		virtual/perl-Pod-Parser
 	)
-	"
+	nmbug? ( dev-vcs/git )
+"
 
 DOCS=( AUTHORS NEWS README )
-NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=(
-	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
-)
 
 bindings() {
-	local ret=0
-
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		"$@"
-		ret=$?
+	local rc=0
+	if use python; then
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
 		popd || die
-	fi
 
-	return $ret
-}
-
-pkg_pretend() {
-	if has_version '<net-mail/notmuch-0.18'; then
-		ewarn
-		ewarn "There are few not backward compatible changes between"
-		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
-		ewarn "(0.18 section) for details before first use!"
-		ewarn
+		# Old deprecated bindings, #736204
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
 	fi
+	return ${rc}
 }
 
 pkg_setup() {
@@ -115,16 +110,16 @@ src_unpack() {
 }
 
 src_prepare() {
+	local _deps=""
 	default
 
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
+	# Python bindings
+	bindings distutils-r1_src_prepare
 	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-	# assure that new Makefile.config will be generated
-	rm -f Makefile.config || die
-
-	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+	# 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
@@ -132,14 +127,14 @@ src_prepare() {
 	fi
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
 	fi
 }
 
 src_configure() {
-	python_setup  # for sphinx
-
-	local myeconfargs=(
+	python_setup # For sphinx
+	local _args=(
 		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
@@ -150,37 +145,24 @@ src_configure() {
 		$(use_with doc api-docs)
 	)
 	tc-export CC CXX
-	econf "${myeconfargs[@]}"
+	econf "${_args[@]}"
 }
 
 src_compile() {
-	python_setup  # for sphinx
-
+	python_setup # For sphinx
 	V=1 default
-	bindings python distutils-r1_src_compile
+	bindings 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
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
 	pax-mark -ze notmuch
 }
 
@@ -210,16 +192,16 @@ src_install() {
 		popd || die
 	fi
 
-	DOCS="" bindings python distutils-r1_src_install
-	use doc && bindings python dodoc -r html
+	DOCS="" bindings distutils-r1_src_install
 }
 
 pkg_preinst() {
-	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
-		elog "To enable notmuch support in mutt, add the following line into"
-		elog "your mutt config file, please:"
+	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 /etc/mutt/notmuch-mutt.rc"
+		elog "  source ${_rcfile}"
 	fi
 }
 
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index 6f2851d39371..fa6e618f12d8 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -4,6 +4,5 @@ AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6
 AUX redundant-argument-to-sprintf.patch 1744 BLAKE2B d251a7e894dd4ebe09d61984a55ad2e7a0771310a88042da952c6e7d13b98952648e2da995e32cac92818e26d2df2e0d83f08a16fed093cfb07fe81187f5aaf6 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04
 AUX unescaped-left-brace.patch 1277 BLAKE2B 3dc055f3321b958cbe35e0e51336c64e41b4e71e4221ea025c6b4c86eff8af710652ab2f97bde52944ec17ba047039319356b338b10af6594dc50167811535df SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033
 DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
-EBUILD postfix-logwatch-1.40.03-r3.ebuild 1115 BLAKE2B 916b770926207ceed4a1359e645b2a5b98220d54e6039d6d7e0c95bab88b12f199093f0ef4ec3cb105b900ce09f56b78f9f6ec5693e57938f7e13f12a051ec66 SHA512 75bd802585e67646f40f7d1b2c2cb93e544e46aa1f6d2402783a902d82229e264975ee2ac499beb262be7d6ab28f4df911e51f629acf5ab2b44f18ae3702dac1
-EBUILD postfix-logwatch-1.40.03-r4.ebuild 1162 BLAKE2B 3bddc66b54fee3c83fd1e7140812785ce0f18364014f02f3b23684e204b490e3a333aca361c13e8e7e5b2ad9de514bc893e6b2d06fb4e923ef8ff37a4eb28686 SHA512 f9c98a6ca5e118c72db15b9bc69e4e107eee841ee76df118911bd3935be03ad6e4c002f6354ded0fe9c014e0ffdca907f0059e380ad0592621c73372a22cb2c2
+EBUILD postfix-logwatch-1.40.03-r4.ebuild 1160 BLAKE2B 9c269a1abd9c561a8f514ac99e991d57344286705b91cbfa53b464a4267e024442ab324b4973c5962e27bec8da601feb6bf550969bae4fb030d05651642a0e6e SHA512 5c9d736880a06bd66c2ea75827d75610b826392e95573c7b75a654cd613afada7aadcc6bcfa8d0cfe365ade3c5ae7e9944c6c7bb304c4bce657a897220336cfe
 MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
deleted file mode 100644
index 49ed6220090f..000000000000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/unescaped-left-brace.patch"
-	"${FILESDIR}/redundant-argument-to-sprintf.patch"
-	"${FILESDIR}/multi-digit-enhanced-status.patch"
-	"${FILESDIR}/all-server-ports-busy-lines.patch"
-)
-
-src_prepare() {
-	default
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README ${PN}.conf-topn
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
index e4fe1d212ae6..9bf2ef83569d 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 5b431b4310ef..8c1a88551573 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,4 +1,6 @@
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
-EBUILD rss2email-3.11-r1.ebuild 671 BLAKE2B 178aef70f7aa9a808c74420ad8fd27b95b05dbf39319442cd2e60ec13267b8ed68d98f44bdc416815e05c11fc10afdc7fd52c2028b266060ff87ea939f1562b8 SHA512 1f49dd95184dafb948b68fea7b9cb4ed8d3666743169fb5fbc52e2e661cc523b9dd33b7ecc6ddbdf2aae07fc5f812d85833e8fe59cdc246b949d4144addc828f
-EBUILD rss2email-3.11.ebuild 760 BLAKE2B 8eb9255668f8f949cd9f8439d40f2577d11ba6b9d6ac0f476adc445fa2a3fadc0c8f34a9ab21b6112271134c744028aad1b553737252e20cf9e9c0a2708c58f9 SHA512 83212470393f2a2368c22c35bb6acf7283cfec1f6fb81834afafec649fb89db11d3b1db0496b420bc0e1d6eb89a4feae0cde960f9144b1ead6dcec18026fdd2c
+DIST rss2email-3.12.1.tar.gz 73942 BLAKE2B be522ec88b4bbc7831713681dbd157b27c0c410bd6a960d80c72169ed2931346b83fc74f7ded663b13ea92f0dd1f5720647208f425bb4de32081579f6c5e3c51 SHA512 8b62a149172cf13c9b03841191f3b214cd1bc2c071f75150a76dacee3edf8a21e0a083a46eba8fabea695cb5077eb84aa4262a709e4aae1e15facee4bbecd1d6
+EBUILD rss2email-3.11-r1.ebuild 666 BLAKE2B a38fc2dc7182cb7c9e5b97f971d4cb88d89a8fd5adb0687c4229a5a7dda4588e398886de21d115594411817c3d92bf6ebddaa55180d24dea0f905abd433918fd SHA512 8fe6db64a3cd3ddb2169690277ec317cf3ed8ab60237bbb671760b408f1fabcb83d831f986c22ed8bcbae972029c10caa1f5d2aed4b9c48cdc587a47a3544dc0
+EBUILD rss2email-3.11.ebuild 755 BLAKE2B 817ea1f2e4a551d709951a269114cd1be122af38f35de07e0e1a1d94581430b4c236fc5be58f085fd13ff9850b5aa5ffc08d83321dd75eb372d729c987070e48 SHA512 2a69931b3803c53dd16060ea04534ca57b37a4da07d6c59071fb4ce48caf4ffd4f9438c1ea1a6f4a3d66e34d28980a87af15a109cda135bff936972c14694307
+EBUILD rss2email-3.12.1.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.11-r1.ebuild b/net-mail/rss2email/rss2email-3.11-r1.ebuild
index 4a4a59392144..deb3783c221d 100644
--- a/net-mail/rss2email/rss2email-3.11-r1.ebuild
+++ b/net-mail/rss2email/rss2email-3.11-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=dev-python/feedparser-5.0.1[${PYTHON_USEDEP}]
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
 	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
index b83884e5de4a..48a91c06a6cc 100644
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ b/net-mail/rss2email/rss2email-3.11.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=dev-python/feedparser-5.0.1[${PYTHON_USEDEP}]
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
 	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/rss2email/rss2email-3.12.1.ebuild b/net-mail/rss2email/rss2email-3.12.1.ebuild
new file mode 100644
index 000000000000..0d679cf6d547
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index e062981fade9..923c18b2d68e 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -8,6 +8,7 @@ AUX vpopmail-5.4.33-strncat.patch 6266 BLAKE2B 98656fb8d963df082ec48fbf7918423c8
 AUX vpopmail-5.4.33-unistd.patch 266 BLAKE2B 19dd429573f0b45b93cd35d522787029ba445c2f363a7a270ab1c547e4f0c2a7be89c287642a3e5e8d69ea59a82271aff271670d19d3850146e92a3389aa3dc8 SHA512 1cc6e6a067cabc004224c022af8c3ee90125a3b3daa9c346ca8a57962be30681a6181605624fc09a8992a7e3d3e7b3d8d6c0ce95095399c1a5dec798e9d6f6cd
 AUX vpopmail-5.4.33-use-proper-printf-format-strings.patch 9207 BLAKE2B 78d51e71fc29ede44e76109d43a0e4dc81458cb74c0873d33efdae33d7a99321e31839eff420654868f38b7e82677c345e276375fac3d9cf13ce54310e8235a3 SHA512 453887050002fb075046637b1ace82caeefd7c2a0f587403d24da0b9d0602a580d2d6595c2ea8af42f49fedd7c2168f9de46dd24f5aee0befab2ba0c7bb4e1c5
 AUX vpopmail-5.4.33-vdelivermail-add-static.patch 1017 BLAKE2B 279bd5c2b894268910a89d1df206289fce475df9b655febc27eca6f1ecf1ecd6bc55e250d0eeb5e86e89a5df0543a08af34b379888ecb4590b91ba62b521b9f2 SHA512 bcf80e30d5010decad135a84527985a29d61d054a0396af662f33bc4a63c3dc1dd0585e884376f25babf0ca263d2496991b16d1c215962a64597f4cd1cd50ca0
+AUX vpopmail-5.4.33-vpgsql-onchange.patch 804 BLAKE2B a3c5cac7cf5aa19c3d853abc7377361432f95ee4ca4c78a316c06ec368d7c5fa0c14d3095bf8b268b32d17222d6adb3a5e22284d04d8b7e8b421629f04240c94 SHA512 9edaf5faf8d7979b1b1ec3b67f6345ecb70a6a8faef6083063ed2861debe61cf2e0ed201acf3e034b8c1c00d5440bcd52b6f5935c8e59a5d21aabd9df329f2d4
 AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B ebf8c80ed2668d0bc96930493bd46788abf58d45defd5cb3ebcff0b67c0c31d7473b7dbf07c958366e18dc7ca56434a6e45b9bf7c9d920da993b8d51927df95a SHA512 6587d2a4ac7b6943b07db2334750db83aaf2e974053732696ad17846da29250a82ac91598f25f0cf1caafc731fdb89ec016e7ba6ff6f70ab269af3c0a15e80b5
 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9
 AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107edfca033126fb420420a9b1eb8866a53552df110e8dca8cced2d653181eb2a6dfc3c07e33a958d7f86ad4035285 SHA512 df7a99357d4673f9d5c4619d67e418a769b2ab72c95d0a7477f186bf15fc4d0f6bec93a64970660439c25573dc0cd2994f5f4aca335723eeaec6761a7838f332
@@ -15,5 +16,5 @@ AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8
 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 7516 BLAKE2B 568a2f25393c132211dc351c7704c4767b272dbcf4ed7e90823b46e2bf5899d1fad283e3dabb352c85d648b9289da0c09c317eb48dba137df490f13db6b22c7e SHA512 6c31b1653290c10d3892c984c4b7bc287d771664914c11b0b07a024c92dfc93fe5454b4d4f3e8f27ba40ff1ddfb58fc9561a4cf9609ba6916b11badbceb9c523
-EBUILD vpopmail-5.4.33-r7.ebuild 7537 BLAKE2B 88c87449980b0f8596cd2cf72b75456af84ce344a7a6a074d6cb0c673ecb3012e9512eb97762f6436fd2a161e36b03b98818166b0ef6ad7f6eabcc3cf1637c7e SHA512 61ee7395ebfcd55e0a38a8e96103babc9919d2c00351fc64ffaffe5a58ea020b2ecc94b664943f4f5909247a95652eaf2ecd5ec9500a46a64d8493195a100424
+EBUILD vpopmail-5.4.33-r7.ebuild 7587 BLAKE2B e7ed4efe7efc7c12dfed3b16dd6dc93c6cb77aa4f771fb4ca8e2526c689240f5740a4eb689665ecd8ce5cf85b81fbd6c3be070bdfb933dfa0fff260697e17849 SHA512 dc8019fd250e05985762b26d87d1af4b333a331929a6706f9648d4a347cde48c3d4c274c621c8bc8125b7924a2515c50d01928e6cc04fa3294140ed213301c83
 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch b/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch
new file mode 100644
index 000000000000..4fcd3a51a0bc
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch
@@ -0,0 +1,26 @@
+From c317829c750438fbb16867cbadb196328f3ba567 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 31 Jul 2020 22:09:50 +0200
+Subject: [PATCH] fix build when using PostgreSQL and --enable-onchange-script
+
+This obviously has never worked.
+---
+ vpgsql.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vpgsql.c b/vpgsql.c
+index b5dd40b..7d8e5c0 100644
+--- a/vpgsql.c
++++ b/vpgsql.c
+@@ -1456,7 +1456,7 @@ int valias_delete_domain( char *domain)
+ #ifdef ONCHANGE_SCRIPT
+   if( allow_onchange ) {
+      /* tell other programs that data has changed */
+-     snprintf ( onchange_buf, MAX_BUFF, "%s@%s - %s", alias, domain, alias_line);
++     snprintf ( onchange_buf, MAX_BUFF, "%s", domain );
+      call_onchange ( "valias_delete_domain" );
+      }
+ #endif
+-- 
+2.26.2
+
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index face2fb6b996..ce3584c722a0 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
 	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
 	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+	"${FILESDIR}"/${PN}-5.4.33-vpgsql-onchange.patch
 )
 DOCS=(
 	ChangeLog
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-mail
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)