gentoo resync : 18.11.2019

24 files changed, 406 insertions, 370 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 63fb9ed65268..7d2ce6de537e 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 64e17f0083c1..f6549a1b1aa5 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,7 +1,5 @@
-DIST afew-1.1.0.tar.gz 31119 BLAKE2B f5e66f000e8b06154aef8b2732c3d9f9d26befd5b606c78e75c239290ff50041987682a3d1a13abf611118a6153cbd7eec599f266783d41b7c1fca391c4ceacd SHA512 4f3c7234b15184b03264763cd271503cc8e49d9698169744718f17d6c4af9674bb50e592b23875991f9b1671b40dbea960a0e6153fa731aee92d4d1bd5c4548f
 DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
 DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
-EBUILD afew-1.1.0.ebuild 825 BLAKE2B c2422af2db6930bfe25bd5cffb8c909dc5664a6b1d46902abe70e69c73ea6c0608d899b8549c5a40561fe0a6fc0945f0ee8dfcf02bc95b422f58e010d7979859 SHA512 ab2ec9c90871c429b7afc4ed23e13f8f635d503dc6e66b2f1d1d7c21dd75746fbead5b8bd8622d0172049cce711ea86ac1b3c35aa3bb28a0ecd15ae71878e9ec
 EBUILD afew-1.2.0.ebuild 825 BLAKE2B c2422af2db6930bfe25bd5cffb8c909dc5664a6b1d46902abe70e69c73ea6c0608d899b8549c5a40561fe0a6fc0945f0ee8dfcf02bc95b422f58e010d7979859 SHA512 ab2ec9c90871c429b7afc4ed23e13f8f635d503dc6e66b2f1d1d7c21dd75746fbead5b8bd8622d0172049cce711ea86ac1b3c35aa3bb28a0ecd15ae71878e9ec
-EBUILD afew-1.3.0.ebuild 864 BLAKE2B e3b3726f0a29a1147f2fb53f4f79bda8fb0953bc3b2c1a614d83e3b8826a424e7c52fd9ce1661918c2ca6f89a6666d92cdccc53c66d0200785af52c3002c5608 SHA512 fc44df98dfdf9971f0cf36089b49333e4f3405f5f2054ea65b3318ee00cc2b345483ee12ab78ee444f632c0b42ae90ea40b0994f404303cfbc203d2da028372f
+EBUILD afew-1.3.0.ebuild 868 BLAKE2B dc951c0038c316b24af86717973235a3115918ccf23f075d2125f799d783c98668343a1d836fca48bab11eb15d5ac532e97073e56ec9325424b155e95a3c6a77 SHA512 d12ddb330910e2619febd677109acd9b6d4103fdf5fb4f9a303ce0fac084a57d10148225677cbe2f5ac17998588ce0c63d10d6446080d45e08024c4847cbfa83
 MISC metadata.xml 883 BLAKE2B 64c438e53564d21a25684eb8b8bcf6b5a9e53a79202a27eb43a7621669c716f5af96cec95ee616c5ef3d1be91433c523badb16cb1c6363ebb9574066b2d65833 SHA512 5f799a3db42139165f32075a9f753cdc2f11072c067e5602bc37f557b6edfc8c631a8ea9c512e492587224b287f2d996e38a4e690fe294e508f7b9568b6f15e7
diff --git a/mail-filter/afew/afew-1.1.0.ebuild b/mail-filter/afew/afew-1.1.0.ebuild
deleted file mode 100644
index 7a4d43ab559b..000000000000
--- a/mail-filter/afew/afew-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	net-mail/notmuch[python,${PYTHON_USEDEP}]"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-1.3.0.ebuild b/mail-filter/afew/afew-1.3.0.ebuild
index f47bf50ec0a8..dd77ae4b9249 100644
--- a/mail-filter/afew/afew-1.3.0.ebuild
+++ b/mail-filter/afew/afew-1.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/mail-filter/bmf/Manifest b/mail-filter/bmf/Manifest
index e3bb139f5c28..f265f321c836 100644
--- a/mail-filter/bmf/Manifest
+++ b/mail-filter/bmf/Manifest
@@ -1,5 +1,4 @@
 AUX bmf-0.9.4_QA.patch 538 BLAKE2B fae81e486943274c96cf9efc1fa6782e7adb74d201a9dc81689edeaa27de6cd04ac6fe8de2f360b5b62cade50de289c265f75addd8dcd08a8b2ecb89db404674 SHA512 f5f2c54ddf3db6156dbe8b2fa05a03a8a31cd530a1f711d5cdb2229389ebfc95fa97d49ef7ede45f87178b1c966180ce915612d4d2ad7a6b0b21d77c9524fabd
 DIST bmf-0.9.4.tar.gz 36740 BLAKE2B f3bb262006e4e3e9db98f7df9b7160d8e3feeb0c3aa2b0564a65d5a302fb7b8894fd55d947828989dac488c605fcc153a9f18f840f63718cd12f374c0eb4fe2e SHA512 efbc7edd08ac9abd5a56fa8a00d0011363582e50dda309526b2114906f7d9a9795539df62d4db99457903a2277980bde02d24c97c2ec087d2af84df691cdb9f4
-EBUILD bmf-0.9.4-r2.ebuild 1186 BLAKE2B c8df42663e416bdca376d8cbc995c5b00046ce41df95b7eda9a5106a4a7c49d474fd17fc551821342be47b9aff4965c7e893b1c025a20ec57d975c1a8011da12 SHA512 cae3de548b2f5103152724350ea208f94585fb1133484a474756059668d481870b67be1c8b2acddc84b6f534e81d97e01636a762ed9213703c5b7b9d0a604f67
-EBUILD bmf-0.9.4-r3.ebuild 1275 BLAKE2B 00cc43451d110d022c7215f762069033cf47fe609c8828b91b2787a820aa5381622b3986ce271c544053c62dfa3d40de807cf80a9ee238062aefb0515ccf53b7 SHA512 a4ad397aa7add6e4f0b5ad9b5cc6fb85c36a95926baaef91a28a57d5145358a75cd1bfab9187c6678ac8d47a9eb36c5b0a178ffe82b75916b412a9d26bcf9437
+EBUILD bmf-0.9.4-r3.ebuild 1272 BLAKE2B 391809b5bbd48923ac46f2e02623464e4539b29737919e44734d79cc7731eaa3b5e6ea1f17c452971036a3169b60a1a28c87a006df46c21282579ef9fd61ab2c SHA512 b81f6883c870e380f0e775000646c9b989dfa5503ebc42f23582e5561d21321328cf41049c93dd905045fdc8a3ee6497653e55ce5d5d180f567c0da5a24e376e
 MISC metadata.xml 240 BLAKE2B 0d82deaa28cf83cec5a58963325325347c58bee75fb8d4586579a1dfba486dec8b9d036068668a718467715f3e553cee4158ed4bc0fabecde57146469c13d200 SHA512 aab2bf02fa24d61796ab4fca6069cb7e275b2304f7acd848593078b6b3272accaba18c0d3d3c2a3f005bf033df26c2247cb82038f38f0fe6f2333ae1996ff8fc
diff --git a/mail-filter/bmf/bmf-0.9.4-r2.ebuild b/mail-filter/bmf/bmf-0.9.4-r2.ebuild
deleted file mode 100644
index 2f53d943dec7..000000000000
--- a/mail-filter/bmf/bmf-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs eutils
-
-IUSE="mysql berkdb"
-
-DESCRIPTION="A fast and small Bayesian spam filter"
-HOMEPAGE="http://bmf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bmf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="mysql? ( virtual/mysql )
-	berkdb? ( >=sys-libs/db-3.2.9 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# respect CFLAGS
-	sed -i -e '/D_LINUX/s/CFLAGS="$CCDBG/CFLAGS+=" $CCDBG/' \
-		"${S}/configure" || die
-
-	# include mysql headers
-	sed -i -e '/HAVE_MYSQL/s/HAVE_MYSQL/HAVE_MYSQL `mysql_config --include`/' \
-		"${S}/configure" || die
-
-	epatch "${FILESDIR}/${P}_QA.patch"
-}
-
-src_configure() {
-	# this is not an autotools script
-	./configure \
-		$(use_with mysql) \
-		$(use_with berkdb libdb) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README AUTHORS ChangeLog
-}
-
-pkg_postinst() {
-	elog
-	elog "Important: Remember to train bmf before you start using it."
-	elog "See the README file for further instructions on training and using bmf"
-	elog "with procmail."
-	elog
-}
diff --git a/mail-filter/bmf/bmf-0.9.4-r3.ebuild b/mail-filter/bmf/bmf-0.9.4-r3.ebuild
index 84ca042d34fe..d07b5715873f 100644
--- a/mail-filter/bmf/bmf-0.9.4-r3.ebuild
+++ b/mail-filter/bmf/bmf-0.9.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/bmf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	berkdb? ( >=sys-libs/db-3.2.9 )"
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 1e13e042c400..9a3ce8d84f27 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -3,6 +3,5 @@ AUX dspam.cron-r4 160 BLAKE2B 55a8bc86a1ea34ea8a17a8dd41cb21625682e94d02086060a5
 AUX dspam.initd 867 BLAKE2B c0dd2e67cb57b646b95b2b5cdf12aeea647166fde24036497e5e528e2bb6b66312e12c9895397f3dafb525dd12d528cb0550250e25d320ea133098be50adba88 SHA512 19d9abe29187612e358f4d7c428cf7313254e06e378f8ab5b6996871e80b6ceaf7c63763a6f6a4c3e4c0ff5d0d303a341c8995d87927f8f5b38580583af9a8f8
 AUX dspam.logrotate 180 BLAKE2B 157570caf3ce9885ded6aaf99f189985a730306e7a15cdb77dfc050134e75722ac0d82b27f69ed9478b252e458a39b3705801d9829d4759cf439a892aaf66275 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389
 DIST dspam-3.10.2.tar.gz 1035054 BLAKE2B 9200e6a3449feea3cec80572d7856597e487e553a69b52e7ecee1cd17c0792faf48fbda9e253d1fe52be40b8f0d4dcab4006b898abdcc62289550f17d7d876d3 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856
-EBUILD dspam-3.10.2-r1.ebuild 5977 BLAKE2B f988cf01a109b7a96462c4de3e7e432f53a3e69533322e9bef453b651bbdd09ebe9cf18c65b2880ab2fbb6fdc697409205213ee50ffb0794c685ca69cd336a58 SHA512 f6f45d8fdd212442d289c535e260fe79274ebb84356a0dbb7b72b207278dc0ddd89d6fb255fd8d77945600bc9209b291737246a616caf89d9f3c44f9ed791554
-EBUILD dspam-3.10.2-r2.ebuild 5935 BLAKE2B c944b14fdd51d7e3a62e325c49e5cd240b9f573016194ad81aca4f50fa92d1efa3e61539d9ee80b3c0ff6bd04443327ec60e40a4b29ef9c63b624d102ff5beca SHA512 2d19c6567c14d35ed88c4586fb35a6390af92582f67f169f94dc0c25cae7f818cd0140729d3ba6112bfb891c0cd92ed09ab6c0db5cf6c1e3f79dc557702a8ab6
+EBUILD dspam-3.10.2-r2.ebuild 5933 BLAKE2B 124d4a8e3bcc45c75df78a47a895f97717662c8026e889dbaa7b70ffba4277fc2a126e8e2f46903299567f886295823083d037726c345974d5403dff910b1b64 SHA512 b140a514d4257d9aa40206879563e27b30d8287810a41fbd1a78d656618d7e68b1bcfe429c8a666069c8cac3e5f6d979303757bedd38f40418435921702d4db7
 MISC metadata.xml 1080 BLAKE2B 99fe9506bc845c43f298230a531ea6e463dae9ffa353b7e55c1133f0ee37d10e2b0846f6edc726fd690e1ec637809e4e2fdb5a04456b80b7382fd767b39b44e3 SHA512 963fd0fc0c898ad12877e5905917d0b733cf8e52c62d254955455b60e60eacd1b909c998e3e88c030cfd9024786da80920222369939a189d8e142500a13a636f
diff --git a/mail-filter/dspam/dspam-3.10.2-r1.ebuild b/mail-filter/dspam/dspam-3.10.2-r1.ebuild
deleted file mode 100644
index 1268a245ed41..000000000000
--- a/mail-filter/dspam/dspam-3.10.2-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="small-scale +domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-	net-mail/mailbase
-	ldap? ( net-nds/openldap )
-	mysql? ( >=virtual/mysql-5.0 )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
-	${DEPEND}
-	clamav? ( app-antivirus/clamav )
-	syslog?	( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: select exactly one
-# - user-homedirs does not work with virtual-users
-REQUIRED_USE="
-	|| ( ${DRIVERS_IUSE//+} )
-	static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-	^^ ( ${SCALES_IUSE//+} )
-	virtual-users? ( !user-homedirs )
-"
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-	# setup storage, this sets DSPAM_DRIVERS
-	dspam_setup_storage_drivers
-
-	# create dspam user and group
-	dspam_setup_user
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=${DSPAM_CONF} \
-		--with-dspam-home=${DSPAM_HOME} \
-		--with-dspam-home-group=dspam \
-		--with-dspam-mode=${DSPAM_MODE} \
-		--with-dspam-group=dspam \
-		--with-logdir=${DSPAM_LOG} \
-		--enable-external-lookup \
-		--enable-long-usernames \
-		--enable-split-configuration \
-		$(use_enable clamav) \
-		$(use_enable daemon) \
-		$(use_enable debug) \
-		$(use_enable debug bnr-debug) \
-		$(use_enable debug verbose-debug) \
-		$(use_enable domain-scale) \
-		$(use_enable large-scale) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable user-homedirs homedir) \
-		$(use_enable virtual-users) \
-		--with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-		$(use mysql || use postgres && echo "--enable-preferences-extension") \
-		$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
-}
-
-dspam_setup_user() {
-	# DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-	# under suexec in apache, so DSPAM user/group need to be regular users too
-
-	local euid egid
-	for euid in {1000..5000} ; do
-		[ -z "$(egetent passwd ${euid})" ] && break
-	done
-	for egid in {1000..5000} ; do
-		[ -z "$(egetent group ${egid})" ] && break
-	done
-	enewgroup dspam ${egid}
-	enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-	# Find out which storage drivers need to be enabled, and set some
-	# variables so that src_configure can pick them up
-
-	if use hash; then
-		DSPAM_DRIVERS+=",hash_drv"
-	fi
-
-	if use mysql; then
-		DSPAM_DRIVERS+=",mysql_drv"
-		DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-	fi
-
-	if use postgres; then
-		DSPAM_DRIVERS+=",pgsql_drv"
-	fi
-
-	if use sqlite; then
-		DSPAM_DRIVERS+=",sqlite3_drv"
-	fi
-
-	if ! use static-libs; then
-		# set the driver name twice to avoid a static build
-		DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-	fi
-
-	# remove first comma separator
-	DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-	einfo "Building with drivers: ${DSPAM_DRIVERS}"
-	#echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-	default
-
-	if use daemon; then
-		newinitd "${FILESDIR}/dspam.initd" dspam
-		newconfd "${FILESDIR}/dspam.confd" dspam
-	fi
-
-	if use mysql; then
-		insinto "/usr/share/${PN}/mysql"
-
-		local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_user_aliases.sql virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.mysql_drv/${file}
-		done
-	fi
-
-	if use postgres; then
-		insinto "/usr/share/${PN}/pgsql"
-
-		local files="pgsql_objects.sql purge-pe.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.pgsql_drv/${file}
-		done
-	fi
-
-	if use sqlite; then
-		insinto "/usr/share/${PN}/sqlite"
-		newins src/tools.sqlite_drv/purge-3.sql purge.sql
-	fi
-
-	insinto "${DSPAM_HOME}/txt"
-	doins txt/*.txt
-	for i in spam nonspam; do
-		echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-		doins "${T}/msgtag.${i}"
-	done
-
-	newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dspam.logrotate" dspam
-
-	dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-
-	# stop logrotate-3.8 from complaining
-	dodir /var/log/dspam
-	fowners dspam:dspam /var/log/dspam
-	fperms 0750 /var/log/dspam
-
-	# Install dspamc setgid
-	fowners root:dspam /usr/bin/dspamc &&
-		fperms g+s /usr/bin/dspamc ||
-		die "failed to alter dspamc owner:group or mode"
-}
-
-pkg_preinst() {
-	# dspam-3.10.0: config dir change, should be removed at some later point
-	if [ -d "${ROOT}/etc/mail/dspam" ]; then
-		ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-		if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-			# symlink, this is the setup in older ebuilds
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-
-		elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-			# directory and no symlink, do it manually since we cannot decide.
-			ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-		else
-			# nothing interesting in /etc/dspam
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-		fi
-	fi
-}
diff --git a/mail-filter/dspam/dspam-3.10.2-r2.ebuild b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
index eb4899d3022e..0144efda5694 100644
--- a/mail-filter/dspam/dspam-3.10.2-r2.ebuild
+++ b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 DRIVERS_IUSE="+hash mysql postgres sqlite"
 SCALES_IUSE="small-scale +domain-scale large-scale"
 IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 2b23fbd9dea9..5fe7b3b1bb65 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -1,6 +1,10 @@
 AUX gentoo.config.m4 168 BLAKE2B bbd9a011f6ca442aebb3f4e0177dfae6c1f8b246a493205be7b9b1b9837fd5bf0eac59cc46eebe639f9938d9d3eea99ff48962938a69198560ce76c8458a5906 SHA512 68b4c02527845ec54c694cbf6f4f7c589aa1317269d25cee6e65ea69243d29215790294180588c3436e72dd6f86163234111d3a762e926da3bfb7acf69f1c4b3
 AUX libmilter-build-system.patch 6855 BLAKE2B 987a71369b672d74835cb37a4ad5ceb58aa8b0fd451ffbcfbcba8ff89dafae58d0c9d412fec8c2a0f0621cce4b8bfce3ee618aa399feb6d7523bd22e3a210fe3 SHA512 d36adc49d5fec792139a921b5292ad0a6d71c11a31093cb1249f4e19b8255bb5a287beb3537b2ec0316d97505233cdd708bac27c0d4e1f54464918d4730be43b
+AUX libmilter-glibc-2.30.patch 686 BLAKE2B 51a3053970fea27ca54fad929148e47ca3091150c3330bbd1b3841a44bed1735e0b9941bd4042e7ccc1eb00b87a65639a4b156db664dfece0b5b146873305ce1 SHA512 5fe9d972e459f95268e56a1a7ddae9ec06c19a7bd070a2a32fc45b4cb99aaae335481f01bab5cd4e2a841e25928962749373cbffcaefb08692fda0b896a56cf1
 AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da
+AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54
 DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452
+DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 EBUILD libmilter-1.0.2.ebuild 1901 BLAKE2B b1556f75ec034bcd30926dc8562a6fee3bb09295a8832123d9319fa5cbcc1048574c0935327b14618ca3f193b907f51d12b902cb40ca8c992f0d133d48948d4e SHA512 641ff4dadc693654e3b55490dcd019dde0dfd24956891f8c7d2cdc5971899313b14260aa5c53e2fb0509a71f4303991271625c5910937dd7dbd1dcfc06d573db
+EBUILD libmilter-1.0.2_p1.ebuild 2036 BLAKE2B b22e729c6c4726ccfe6997778d36884c67a4396c37ff7ef60741d8a49426577e6ba547ddf4e8c66f84b7bba318e1c9b3e06b30a94f6aaaa201f7b835cf70b5ac SHA512 ec94ac7c597a4c7cc6e4593169981f009bc47bce0eb9e86883c9fb257e734c7ceab3dc4b7a721e1b2e47d819bc45133cb78f77ff16726e382e47d970e2d4723e
 MISC metadata.xml 300 BLAKE2B 410778ccb51b94b32d34d1c9b70f2deff712ad96143c4bd4bbf027f6910e7dfa700dfd8ee07c774043a3d4b7ad6507e5457af71a44fda6b3a81b46cd976b9185 SHA512 07af4a01f72fbe8c5ccdbfa72ea3a869e07a9907f8e878d6df03d1fc3061304280fc9e813958061f00f101571343ada901ec2fd1917760c60c631804498089e5
diff --git a/mail-filter/libmilter/files/libmilter-glibc-2.30.patch b/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
new file mode 100644
index 000000000000..5ceac845b90e
--- /dev/null
+++ b/mail-filter/libmilter/files/libmilter-glibc-2.30.patch
@@ -0,0 +1,25 @@
+--- a/libmilter/sm_gethost.c	2014-03-05 01:59:45.000000000 +0100
++++ b/libmilter/sm_gethost.c	2019-11-14 18:59:41.885353232 +0100
+@@ -51,18 +51,20 @@ sm_getipnodebyname(name, family, flags,
+ {
+ 	bool resv6 = true;
+ 	struct hostent *h;
+-
++#ifdef RES_USE_INET6
+ 	if (family == AF_INET6)
+ 	{
+ 		/* From RFC2133, section 6.1 */
+ 		resv6 = bitset(RES_USE_INET6, _res.options);
+ 		_res.options |= RES_USE_INET6;
+ 	}
++#endif
+ 	SM_SET_H_ERRNO(0);
+ 	h = gethostbyname(name);
++#ifdef RES_USE_INET6
+ 	if (family == AF_INET6 && !resv6)
+ 		_res.options &= ~RES_USE_INET6;
+-
++#endif
+ 	/* the function is supposed to return only the requested family */
+ 	if (h != NULL && h->h_addrtype != family)
+ 	{
diff --git a/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch b/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
new file mode 100644
index 000000000000..3348e921926c
--- /dev/null
+++ b/mail-filter/libmilter/files/sendmail-8.14.6-build-system.patch
@@ -0,0 +1,211 @@
+diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
+--- sendmail-8.14.3.orig/cf/cf/Makefile	2005-06-14 04:16:34.000000000 +0200
++++ sendmail-8.14.3/cf/cf/Makefile	2009-09-20 10:55:50.000000000 +0200
+@@ -80,10 +80,10 @@
+ install-cf:  install-sendmail-cf install-submit-cf
+ 
+ install-sendmail-cf: $(CF).cf
+-	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
++	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
+ 
+ install-submit-cf: $(SUBMIT).cf
+-	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
++	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
+ 
+ depend:
+
+diff -Nru sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.6/devtools/M4/UNIX/defines.m4
+--- sendmail-8.14.6.orig/devtools/M4/UNIX/defines.m4	2012-01-21 00:07:08.000000000 +0000
++++ sendmail-8.14.6/devtools/M4/UNIX/defines.m4	2012-12-27 08:13:15.792214375 +0000
+@@ -26,7 +26,7 @@
+ CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
+ # Linker for libraries
+ LD=	ifdef(`confLD', `confLD', `confCC')
+-LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
++LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
+ LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
+ 
+ # Shell
+@@ -71,7 +71,7 @@
+ LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
+ 
+ # libraries required on your system
+-LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
++LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
+ 
+ # location of sendmail binary (usually /usr/sbin or /usr/lib)
+ BINDIR=	ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
+diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
+--- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4	2006-10-06 07:44:44.000000000 +0200
++++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -30,12 +30,12 @@
+ 
+ ifdef(`bldNO_INSTALL', ,
+ `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
+-	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
+-	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
++	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
++	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
+ ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
+ 
+ strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
+-	${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
++	${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
+ 
+ bldCURRENT_PRODUCT-clean:
+ 	rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
+diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
+--- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4	2006-09-06 00:56:53.000000000 +0200
++++ sendmail-8.14.3/devtools/M4/UNIX/library.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -27,8 +27,8 @@
+ ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
+ 
+ install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
+-ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
+-	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
++ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
++	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
+ 
+ bldCURRENT_PRODUCT-clean:
+ 	rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
+--- sendmail-8.14.6.orig/devtools/M4/UNIX/manpage.m4	2012-01-21 00:07:08.000000000 +0000
++++ sendmail-8.14.6/devtools/M4/UNIX/manpage.m4	2012-12-27 08:28:52.617502447 +0000
+@@ -68,11 +68,11 @@
+ ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
+ define(`bldMAN_INSTALL_CMD',
+ `ifdef(`confDONT_INSTALL_CATMAN', `dnl',
+-`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
+-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
++`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
++	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
+ ifdef(`confINSTALL_RAWMAN',
+-`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
+-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
++`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
++	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
+ )dnl
+ bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
+ ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
+diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
+--- sendmail-8.14.3.orig/libmilter/Makefile.m4	2008-04-08 07:23:44.000000000 +0200
++++ sendmail-8.14.3/libmilter/Makefile.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -32,9 +32,9 @@
+ MFAPI=	${SRCDIR}/inc`'lude/libmilter/mfapi.h
+ MFDEF=	${SRCDIR}/inc`'lude/libmilter/mfdef.h
+ install-mfapi: ${MFAPI}
+-	if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
+-	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
+-	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
++	if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
++	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
++	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
+ divert(0)
+ 
+ bldFINISH
+diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
+--- sendmail-8.14.3.orig/mail.local/Makefile.m4	2006-06-28 23:08:02.000000000 +0200
++++ sendmail-8.14.3/mail.local/Makefile.m4	2009-09-20 10:56:24.000000000 +0200
+@@ -30,7 +30,7 @@
+ force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
+ 
+ install-mail.local: mail.local
+-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
++	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
+ divert
+ 
+ bldFINISH
+diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
+--- sendmail-8.14.3.orig/rmail/Makefile.m4	2006-06-28 23:08:04.000000000 +0200
++++ sendmail-8.14.3/rmail/Makefile.m4	2009-09-20 10:55:29.000000000 +0200
+@@ -31,7 +31,7 @@
+ force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
+ 
+ install-rmail: rmail
+-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
++	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
+ divert
+ 
+ bldFINISH
+diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
+--- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig	2008-03-27 17:13:33.000000000 +0100
++++ sendmail-8.14.3/sendmail/Makefile.m4	2009-09-20 11:07:24.000000000 +0200
+@@ -14,9 +14,9 @@
+ 
+ dnl hack: /etc/mail is not defined as "location of .cf" in the build system
+ define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
+-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
++`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
+ define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
+-`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
++`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
+ )dnl
+ 
+ # location of sendmail statistics file (usually /etc/mail/ or /var/log)
+@@ -43,21 +43,21 @@
+ statistics:
+ 	${CP} /dev/null statistics
+ 
+-${DESTDIR}/etc/mail/submit.cf:
++"${DESTDIR}/etc/mail/submit.cf":
+ 	@echo "Please read INSTALL if anything fails while installing the binary."
+ 	@echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
+ 	cd ${SRCDIR}/cf/cf && make install-submit-cf
+ 
+ MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
+ 
+-${DESTDIR}${MSPQ}:
++"${DESTDIR}${MSPQ}":
+ 	@echo "Please read INSTALL if anything fails while installing the binary."
+ 	@echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
+ 	@echo "as explained in sendmail/SECURITY."
+-	mkdir -p ${DESTDIR}${MSPQ}
+-	chown ${MSPQOWN} ${DESTDIR}${MSPQ}
+-	chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
+-	chmod 0770 ${DESTDIR}${MSPQ}
++	mkdir -p "${DESTDIR}${MSPQ}"
++	chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
++	chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
++	chmod 0770 "${DESTDIR}${MSPQ}"
+ 
+ divert(0)
+ 
+@@ -68,30 +68,30 @@
+ divert(bldTARGETS_SECTION)
+ 
+ install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
+-	${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
++	${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
+ 	for i in ${sendmailTARGET_LINKS}; do \
+ 		rm -f $$i; \
+ 		${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
+ 	done
+ 
+-define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
++define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
+ install-sm-mta: bldCURRENT_PRODUCT
+-	${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
++	${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
+ 	for i in confMTA_LINKS; do \
+ 		rm -f $$i; \
+ 		${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
+ 	done
+ 
+ install-hf:
+-	if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
+-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
++	if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
++	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
+ 
+ install-st: statistics
+-	if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
+-	${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
++	if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
++	${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
+ 
+-install-submit-st: statistics ${DESTDIR}${MSPQ}
+-	${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
++install-submit-st: statistics "${DESTDIR}${MSPQ}"
++	${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
+ 
+ divert(0)
+ bldPRODUCT_END
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
new file mode 100644
index 000000000000..b7d5242cfdd5
--- /dev/null
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+# This library is part of sendmail, but it does not share the version number with it.
+# In order to find the right libmilter version number, check SMFI_VERSION definition
+# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
+# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
+SENDMAIL_VER=8.15.2
+
+DESCRIPTION="The Sendmail Filter API (Milter)"
+HOMEPAGE="http://www.sendmail.org/"
+SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 poll"
+
+DEPEND="!mail-mta/sendmail
+	!mail-mta/sendmail"
+RDEPEND="!mail-mta/sendmail"
+
+S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
+
+# build system patch copied from sendmail ebuild
+# glibc patch from opensuse
+PATCHES=(
+	"${FILESDIR}/sendmail-8.14.6-build-system.patch"
+	"${FILESDIR}/${PN}-sharedlib.patch"
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
+	)
+
+src_prepare() {
+	default
+
+	local CC="$(tc-getCC)"
+	local ENVDEF="-DNETUNIX -DNETINET"
+	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
+	use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
+
+	sed -e "s:@@CFLAGS@@:${CFLAGS}:" \
+		-e "s:@@LDFLAGS@@:${LDFLAGS}:" \
+		-e "s:@@CC@@:${CC}:" \
+		-e "s:@@ENVDEF@@:${ENVDEF}:" \
+		"${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
+		|| die "failed to generate site.config.m4"
+}
+
+src_compile() {
+	pushd libmilter
+	emake -j1 MILTER_SOVER=${PV}
+	popd
+}
+
+src_install () {
+	local MY_LIBDIR=/usr/$(get_libdir)
+	dodir "${MY_LIBDIR}"
+	emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+		SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
+		LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
+		MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
+		MSPQOWN=root CFOWN=root CFGRP=0 \
+		MILTER_SOVER=${PV} \
+		install -C obj.*/libmilter
+
+	dodoc libmilter/README
+	dodoc libmilter/docs/*
+}
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index d6fe9a2208a5..917dbb754658 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,6 +1,6 @@
 AUX libsrs_alt-1.0-ftime.patch 313 BLAKE2B f634abd1e527a199374fc55bf84927c5e38730f79d1b13f7cb0199ce338f825902df662248fa99bb3baf4c4c07117031b52e3e986a7ad0b2816ca28cfe7601b2 SHA512 2566c9b7e9187a243f5eb6b4b67d649bc081538350f647f1afa69812892a8ff8ef889068ccb73f019cf287e9e6ae3999bc62b2003d197963606a4c30ebecd214
 DIST libsrs_alt-1.0.tar.bz2 237984 BLAKE2B e55b01f28fdf240ccf2fea8b43e930bc02a78bfb82a2b9fe573c1c09e0839f89a0bdb51844dae237ed66e4bda925b5b3b93842462987e7f300f6f5d763adf382 SHA512 1e15f8b12c2174c8ee085fc5adae4cb267f69dd5656066d33af106ad4940769552e04cfc67af4ad9650eece2519c03ef383290f36a22df7d9e03fa2186262404
 DIST libsrs_alt-1.0.tar.gz 337225 BLAKE2B 1fb10130eb44c8edfc3757b9ba6d8a77659d1ba53fa620da2f7c5fe6cb01fe3f9c1ac0aac5a49db7d9f1b8308ac4c07778e03e4aa6ad9c0204a0871dff40047f SHA512 c202b2cbd28ce0b1296a8000b9f2ae19f4fff259a2d9ea43674cab11b947d0f85a0fdbb13e5fef2a52b1ae675a8fa35b492b233f97f5e365a9c076a337010629
-EBUILD libsrs_alt-1.0-r1.ebuild 1159 BLAKE2B ade7067f839dcccc54f2ff5f3e77a8f0340913b9e0e8097a88bcb2dd490a88b7df105dd5cfb87b87642f88442907d92143fefac8b79584850ad866fa8da00e05 SHA512 4ccb73d8b8897d9ee28be4349d73d115f56c511d691e6d10f2ea3bb0561c97b06136f9c8da00939df213768eb3eadf2a8d61baaaae4cdbfebc30e4ea46f6797a
+EBUILD libsrs_alt-1.0-r1.ebuild 1154 BLAKE2B 36a9d319c8a71a386d4245d4149cd43fa638a9ceffc8dc4cd41d5b3d4a4137f2d77fb6a58f28f0adcacd1e3124e9946438f3e76250c7dfb8481967a4ab79a8ac SHA512 cc9bd721a6ab035da21cd54d2d543afcd1df880af4e6f3a5b756f1b50f7c315d54e23a6d8866f72824da7a514e0ed3e856dca17aaf278c5af57e19be198ca85d
 EBUILD libsrs_alt-1.0.ebuild 1037 BLAKE2B 7696b03d8cedcf177dc30e74fc2e679e79cc38b46538f5abb75e9682e9a8afed22098a582fab47350a2268efbf27469ec8f3def1bb0f2364a6fb250b9c5dcd82 SHA512 b28e0a756a5de946899196ed737523a27b6daf49bcdec185b2854b0e0d418c03a3d9c2e29a15f8df39dfcafb48251261abda1556fd87f687ae77a63f103b49da
 MISC metadata.xml 506 BLAKE2B 85745c6fffc19e1064f5d2bde90dbe56f5bdd674d4189630ccbe3d012e505dec487878097ed83d031e79e46478e7f0281f5edda1a94057671bcc051ca202025a SHA512 6a6096ee6f1895de958b8167e1a9632dc6901b16908d94af86932aead64fbc1690ffd300d8cc97792d46201e64cb20d6696e232e9d796e33fe4484e808e111ee
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
index 032bdefb4ab6..e29ce97b19ae 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://opsec.eu/src/srs/libsrs_alt-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 42b1616dd498..af028e45f461 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -7,5 +7,5 @@ DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e936
 EBUILD opendmarc-1.1.3.ebuild 758 BLAKE2B 19dbe9ce41807931e4e02c506275ba97472440647f07d2f368c651d2761016cd553c1bdea90d2036d218de0e00b8b6b37b3607bf24faf47ff2d7fcfdfce54ce8 SHA512 064609b575f3722909e89b763336ec8f891a3dd320b83012f966edb949ba8b35a84b3691f2cfbaccca9f53c76df73955cab37ef63c7fcbd555352c1569a3554a
 EBUILD opendmarc-1.3.2-r1.ebuild 1512 BLAKE2B 3ca0ef4573fa16a1f123d1f5e92c24587a75695dc898f2e242d7985c44796f0525940672f4274d4d83bcc1ebe2920dc1109f7d44c813659bf88e501e8e3da89f SHA512 4cb2626f8073a210356dd645c84e26bd7a2a6a8383cabdabdb0de5bb37baea0dd874171abfdf283d5371fd6799ebb95b2e60b45498969dff15020a487037d09b
 EBUILD opendmarc-1.3.2-r2.ebuild 1646 BLAKE2B 9acaeb738840d3bdde9b201d5d1a79ded7da70ef91e8d972a2ecab7b51fc61195443883a4cad1d83c826ae8013ae1d2c90ec3dfeab21b5b7de0a4b871a63e8ad SHA512 e17f098fdf6102b257a8eebdf30d7eb543c2ca608c6226f997093aabefb24ce7642f8fa96850365f54ab98a9d04bd7fc9f881887ccc7a43b5535049111ef9228
-EBUILD opendmarc-1.3.2-r3.ebuild 1701 BLAKE2B 3d34ae4f5a0db777fc32bc519edb40c992556c6d15396b909dd2bada610580526eec35abf2b40b8f5d3ed12b8b06875f6ab546c41557b7d2ebbbb73c91afdb77 SHA512 b68ad0e332c580401e6871c6f3e0fc5bf6bcb5fe136719d05148c89562de7ca01dc27dea6a5d7751342fd5c0915ae210214cba979cc9505556b6014d911bb17d
+EBUILD opendmarc-1.3.2-r3.ebuild 1700 BLAKE2B b35ba56a6a2b5d3b225b4a3279f4ea87115e482802bcf31a011056d3f509a0c089f56cfa78237110cc29fa2aa2a9e9738b982dc20416b6b7c6ca8b0270134826 SHA512 c213e8454048eb5f85c71cacd875f3908b23c73598c00fe37e35d09bffd20c98f15ab735740ec468a83e81f71c064201fde0477cd87228344bfcd40622ac9e3b
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
index 3367ed48b96c..b796ba773357 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index 845ad6911dcd..6134b87c1ed0 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,5 +1,5 @@
-AUX sqlgrey-1.7.6-init.patch 412 BLAKE2B c5d7a1bdf7478911711fc991a9c6cbc8a64ac4b7c9cd013aae14874a34a03df9fe2fa3de9c0715fd7f4b8a05d794d28d5e66e90e2a3685d3f0fa699072e934a6 SHA512 5c6e7f7eb4770cf123cdfb73717d9a50ec0e64e6129dd4c92e3abeb688f9d0b1b1958e298786d852f7341be1448c885c916e7c9086aa8fdf84af154301d0d2a9
+AUX sqlgrey-1.7.6-init.patch 408 BLAKE2B 09ac51cd9c16ebf21261eeae4a405042e57444a1b727dc62a10cb5a073a50e9a774dc19e26fdeed152c86d199a10d862cef224987a27fa165abba03b7c0b5821 SHA512 f22a872651e21bd45aeb22723c7d45f1c637e9227a51636655189e92f9ffa3cd2680d78d43ffc807fd85930110b5052eb74fdc07b5f32522255ae7218e29a2d3
 AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa5fe82f99cf2f5e46eb5900c4a0ee0731c27184a60568af14bb78baed3b0053134b121fea0f00a070 SHA512 7e41344e3820537d73a413d728d455de58c5358922a354904cba5a870f61fecbf96f84f91dadad283d406cad05010bc3fd57644f18ba319083af92a1810d9a27
 DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
-EBUILD sqlgrey-1.7.6-r2.ebuild 8524 BLAKE2B 8244348a4b72b756d75b988fb4df98adfa368a168b6615ca8d34be83cc0234283fe36ddba945fe5f5190b89aec6dfc50de3306765d1f2f26f1b0010f910e552d SHA512 16783a5bfd530ea1f9555feddafa0d0ff53af5770f57e9acb54f719c07367e53522ffb411631552c3316f1560ab9bdfe4bcf6096800b38f564cb7661bbbd0a44
+EBUILD sqlgrey-1.7.6-r2.ebuild 8427 BLAKE2B 4cb1fecc4b2817edd41f11459c86afa1e2c3c2572aef7fc50d8668778a2a5d3df3f1d0f06b5b462aad1386c405eb14cd7753c35daf2d8b891cac6e2c0e579b75 SHA512 9a9f5f42e247df21a609afae682ff631c1e60ceba2a508513f4e7d6b34bf187ee8eb6fbb9d915a88ce862ef43b69ae7487ce664fbb3b4cacb6f449e14b0c2447
 MISC metadata.xml 352 BLAKE2B 22d2cabf23b745a432e22edee82b9184fad33a5fe579cdd2b0efe584c9a34d422d16a7552dad88fe9ba93b11bd496920450d7510e627576d08ac9ed4c0df541b SHA512 4681c824087ebac9bd919143cc665481311fd503d58655323bef2d8e8f204a502daf7d0d05ba5aedfb32a67b97d2b942dc1f39eab35df92677a43d77fb1f04cb
diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
index 48d3a581c5d4..355cb4539248 100644
--- a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
+++ b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
@@ -1,5 +1,5 @@
---- ./sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
-+++ ./sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
+--- sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
++++ sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
 @@ -14,13 +14,13 @@
  	# SQLite puts files in the working directory
  	cd ~sqlgrey
diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
index a6f49463e7b7..4b26a8203a60 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
@@ -1,41 +1,42 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils systemd user
+inherit systemd user
 
-DESCRIPTION="SQLgrey is a postfix policy service implementing a grey-listing policy"
-SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
+DESCRIPTION="A postfix policy service implementing a grey-listing policy"
 HOMEPAGE="http://sqlgrey.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="mysql postgres sqlite"
+KEYWORDS="amd64 ~arm ~sparc x86"
+IUSE="mysql +postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
 RDEPEND="dev-lang/perl
 	dev-perl/DBI
-	dev-perl/Net-Server
 	dev-perl/Date-Calc
+	dev-perl/Net-Server
 	virtual/mailx
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
 	mysql? ( dev-perl/DBD-mysql )
-	!postgres? ( !mysql? ( !sqlite? ( dev-perl/DBD-Pg ) ) )"
-DEPEND="$RDEPEND
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}
 	sys-apps/sed"
-KEYWORDS="amd64 ~arm ~sparc x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-init.patch"
+)
 
 pkg_setup() {
 	enewgroup sqlgrey
 	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
 }
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-init.patch"
-}
-
 src_install () {
-	make gentoo-install ROOTDIR="${D}"
+	emake gentoo-install ROOTDIR="${D}"
 	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
 
 	# keeps SQLgrey data in /var/spool/sqlgrey
@@ -46,34 +47,29 @@ src_install () {
 }
 
 pkg_postinst() {
-	echo
-	einfo "To make use of greylisting, please update your postfix config."
-	einfo
-	einfo "Put something like this in /etc/postfix/main.cf:"
-	einfo "    smtpd_recipient_restrictions ="
-	einfo "           ..."
-	einfo "           check_policy_service inet:127.0.0.1:2501"
-	einfo
-	einfo "Remember to restart Postfix after that change. Also remember"
-	einfo "to make the daemon start durig boot:"
-	einfo "  rc-update add sqlgrey default"
-	einfo
-	echo
-	einfo "To setup SQLgrey to run out-of-the-box on your system, run:"
-	einfo "emerge --config ${PN}"
-	echo
+	elog "To make use of greylisting, please update your postfix config."
+	elog
+	elog "Put something like this in /etc/postfix/main.cf:"
+	elog "    smtpd_recipient_restrictions ="
+	elog "           ..."
+	elog "           check_policy_service inet:127.0.0.1:2501"
+	elog
+	elog "Remember to restart Postfix after that change. Also remember"
+	elog "to make the daemon start durig boot:"
+	elog "  rc-update add sqlgrey default"
+	elog
+	elog
+	elog "To setup SQLgrey to run out-of-the-box on your system, run:"
+	elog "emerge --config ${PN}"
+	elog
 	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
 	ewarn "included howto /usr/share/doc/${PF}/HOWTO.gz"
-	echo
+	ewarn
 	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
 	ewarn "the SQLgrey db"
-	echo
-	ebeep 2
-	epause 5
 }
 
 pkg_config () {
-
 	# SQLgrey configuration file
 	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
 	local SQLgrey_DB_USER_NAME="sqlgrey"
diff --git a/mail-filter/zdkimfilter/Manifest b/mail-filter/zdkimfilter/Manifest
new file mode 100644
index 000000000000..541bac569ae4
--- /dev/null
+++ b/mail-filter/zdkimfilter/Manifest
@@ -0,0 +1,3 @@
+DIST zdkimfilter-1.8.tar.gz 717481 BLAKE2B ec662a02c4a248085a42548d892084eb23c592c0511026039d18e8cc7a1a46dcf37411f8fc7395be507065ddb9cda8c5a1226e5e379852b4ef7ee84c2936b439 SHA512 e4b32c5d636db8a76ecfc2e4c8b1bda2053dc6c5baba13ed66120458f012a9d22d9ec269ae88100f1cc048b9c7d6c67a887ed1a48435a6353ab68bc13054c42c
+EBUILD zdkimfilter-1.8.ebuild 788 BLAKE2B 2a1865ec07d605b99d8f345c4fbbda23d368888413480071cda53f413badaa65ab346b0e63fa14210708f67e698b839d708e224d128ab19613e9d6bca90c7dfe SHA512 5c543aab75d484ee9441723b8b098564ee5d9ecc1be40d026c2180b9a0e0a9e4bea0368cfd5295bd2d2061c013f37ef1f2c44a9e20a7909daf530199df4e1b54
+MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
diff --git a/mail-filter/zdkimfilter/metadata.xml b/mail-filter/zdkimfilter/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/mail-filter/zdkimfilter/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/mail-filter/zdkimfilter/zdkimfilter-1.8.ebuild b/mail-filter/zdkimfilter/zdkimfilter-1.8.ebuild
new file mode 100644
index 000000000000..6205edee11c4
--- /dev/null
+++ b/mail-filter/zdkimfilter/zdkimfilter-1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="DKIM filter for Courier-MTA"
+HOMEPAGE="https://www.tana.it/sw/zdkimfilter"
+SRC_URI="https://www.tana.it/sw/zdkimfilter/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="mail-filter/opendkim
+	mail-mta/courier
+	dev-db/opendbx
+	dev-libs/nettle
+	net-dns/libidn2
+	dev-libs/libunistring"
+RDEPEND="${DEPEND}"
+
+# For working tests we need a fix for opendkim,
+# see https://bugs.gentoo.org/700174
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	diropts -o mail -g mail
+	dodir /etc/courier/filters/keys
+	dodoc release-notes-*.txt README ChangeLog
+	dodoc odbx_example.{conf,sql}
+}