gentoo resync : 10.11.2019

29 files changed, 269 insertions, 324 deletions

diff --git a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
index 91f9a297693a..35131939ad9f 100644
--- a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
@@ -1,12 +1,10 @@
-# 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 versionator multilib
-
-MY_PV=$(get_version_component_range 1-3 )
-MY_PVR=$(replace_version_separator 3 '-' )
+MY_PV=$(ver_cut 1-3)
+MY_PVR=$(ver_rs 3 '-')
 
 DESCRIPTION="Free Anti-Virus and Anti-Spam Filter"
 HOMEPAGE="http://www.mailscanner.info/"
@@ -50,11 +48,14 @@ RDEPEND="${DEPEND}
 	spamassassin? ( mail-filter/spamassassin )"
 
 S="${WORKDIR}/${PN}-${MY_PVR}"
-BASE="/usr"
 
 src_unpack() {
-	unpack ${A}
+	default
 	unpack ./${PN}-install-${MY_PV}/perl-tar/${PN}-${MY_PVR}.tar.gz
+}
+
+src_prepare() {
+	default
 
 	# setup MTA
 	if use postfix ; then
@@ -88,7 +89,7 @@ src_unpack() {
 	VIRUS_SCANNERS=""
 	use clamav && VIRUS_SCANNERS="clamav ${VIRUS_SCANNERS}"
 
-	if [ "$VIRUS_SCANNERS" == "" ]; then
+	if [[ "${VIRUS_SCANNERS}" == "" ]]; then
 		VIRUS_SCANNERS="none"
 		VIRUS_SCANNING="no"
 	else
@@ -98,57 +99,57 @@ src_unpack() {
 	sed -i \
 		-e "s/^\(Virus Scanning[ \t]*=\).*/\1 ${VIRUS_SCANNING}/" \
 		-e "s/^\(Virus Scanners[ \t]*=\).*/\1 ${VIRUS_SCANNERS}/" \
-		"${S}/etc/MailScanner.conf"
+		etc/MailScanner.conf || die
 
 	# setup spamassassin
 	if use spamassassin ; then
 		sed -i \
 			-e "s/^\(Use SpamAssassin[ \t]*=\).*$/\1 yes/" \
-			"${S}/etc/MailScanner.conf"
+			etc/MailScanner.conf || die
 	else
 		sed -i \
 			-e "s/^\(Use SpamAssassin[ \t]*=\).*$/\1 no/" \
-			"${S}/etc/MailScanner.conf"
+			etc/MailScanner.conf || die
 	fi
 
 	# update bin files
 	sed -i \
 		-e "s#msbindir=/opt/MailScanner/bin#msbindir=/usr/sbin#g" \
 		-e "s#config=/opt/MailScanner/etc/MailScanner.conf#config=/etc/MailScanner/MailScanner.conf#g" \
-		"${S}/bin/check_mailscanner"
+		bin/check_mailscanner || die
 	for each in update_virus_scanners update_phishing_sites update_bad_phishing_sites ; do
 		sed -i \
-		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
-		"${S}"/bin/${each}
+			-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
+			bin/${each} || die
 	done
 	sed -i \
 		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/MailScanner#g" \
-		"${S}"/bin/update_spamassassin
+		bin/update_spamassassin || die
 	sed -i \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}"/bin/MailScanner
+		bin/MailScanner || die
 
 	# update cron files
 	sed -i \
 		-e "s#/opt/MailScanner/bin/check_mailscanner#/usr/sbin/check_MailScanner#g" \
-		"${S}"/bin/cron/check_MailScanner.cron
+		bin/cron/check_MailScanner.cron || die
 	for cronfile in update_virus_scanners.cron update_{,bad_}phishing_sites.cron; do
-	sed -i \
-		-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/mailscanner#g" \
-		-e "s#/opt/MailScanner/bin#/usr/sbin#g" \
-		"${S}"/bin/cron/${cronfile}
+		sed -i \
+			-e "s#/etc/sysconfig/MailScanner#/etc/conf.d/mailscanner#g" \
+			-e "s#/opt/MailScanner/bin#/usr/sbin#g" \
+			bin/cron/${cronfile} || die
 	done
 
 	# Determine some things that may need to be changed in conf file
 	# (need to arrive at sensible replacement for yoursite)
 	YOURSITE=`dnsdomainname | sed -e "s/\./-/g"`
-	BASEBIN="${BASE}/sbin"
+	BASEBIN="/usr/sbin"
 
 	# ClamAV requires some specific changes to MailScanner.conf
 	# when mailscanner is running as root (i.e. sendmail)
 	if use clamav ; then
-		if [ "$MTA" == "sendmail" ] ; then
+		if [[ "${MTA}" == "sendmail" ]] ; then
 			WORKGRP="clamav"
 			WORKPERM="0640"
 		else
@@ -178,60 +179,61 @@ src_unpack() {
 		-e "s#^\(Sendmail2[ \t]*=\).*#\1 ${SENDMAIL2}#" \
 		-e "s#^\(Incoming Work Group[ \t]*=\).*#\1 ${WORKGRP}#" \
 		-e "s#^\(Incoming Work Permissions[ \t]*=\).*#\1 ${WORKPERM}#" \
-		"${S}/etc/MailScanner.conf"
+		etc/MailScanner.conf || die
 
 	# update spam.assassin.prefs.conf
-	sed -i -e "s#YOURDOMAIN-COM#${YOURSITE}#" "${S}/etc/spam.assassin.prefs.conf"
+	sed -i -e "s#YOURDOMAIN-COM#${YOURSITE}#" \
+		etc/spam.assassin.prefs.conf || die
 
 	# net-mail/clamav net-mail/f-prot package compatibility
 	sed -i \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#" \
 		-e 's#^\(clamav\t.*/usr\)/local$#\1#' \
 		-e 's#^\(f-prot.*\)/usr/local/f-prot$#\1/opt/f-prot#' \
-		"${S}/etc/virus.scanners.conf"
+		etc/virus.scanners.conf || die
 
 	# update lib files
 	sed -i \
 		-e "s#/opt/MailScanner/bin#$BASEBIN#g" \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}/lib/MailScanner/ConfigDefs.pl"
+		lib/MailScanner/ConfigDefs.pl || die
 	sed -i \
 		-e "s#/opt/MailScanner/bin#$BASEBIN#g" \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}/bin/MailScanner"
+		bin/MailScanner || die
 	sed -i \
 		-e "s#/opt/MailScanner/bin#$BASEBIN#g" \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}/bin/update_virus_scanners"
+		bin/update_virus_scanners || die
 	sed -i \
 		-e "s#/opt/MailScanner/bin#$BASEBIN#g" \
 		-e "s#/opt/MailScanner/etc#/etc/MailScanner#g" \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#g" \
-		"${S}/bin/mailscanner_create_locks"
+		bin/mailscanner_create_locks || die
 	sed -i \
 		-e "s#/etc/MailScanner#/etc/MailScanner#g" \
-		"${S}/lib/MailScanner/CustomConfig.pm"
+		lib/MailScanner/CustomConfig.pm || die
 
 	# finally, change MailScanner.conf into MailScanner.conf.sample
-	cp "${S}/etc/MailScanner.conf" "${S}/etc/MailScanner.conf.${MY_PV}"
-	mv "${S}/etc/MailScanner.conf" "${S}/etc/MailScanner.conf.sample"
-
+	cp "${S}/etc/MailScanner.conf" \
+		"${S}/etc/MailScanner.conf.${MY_PV}" || die
+	mv "${S}/etc/MailScanner.conf" \
+		"${S}/etc/MailScanner.conf.sample" || die
 }
 
 src_install() {
-	exeinto ${BASE}/sbin
-	doexe bin/MailScanner
-	newexe bin/check_mailscanner check_MailScanner
-	doexe bin/d2mbox bin/df2mbox
-	doexe bin/update_virus_scanners
-	doexe bin/upgrade_MailScanner_conf
-	doexe bin/mailscanner_create_locks
-	doexe bin/Quick.Peek
-	doexe bin/update_bad_phishing_sites bin/update_phishing_sites
-	newexe bin/Sophos.install.linux Sophos.install
+	dosbin bin/MailScanner
+	newsbin bin/check_mailscanner check_MailScanner
+	dosbin bin/d2mbox bin/df2mbox
+	dosbin bin/update_virus_scanners
+	dosbin bin/upgrade_MailScanner_conf
+	dosbin bin/mailscanner_create_locks
+	dosbin bin/Quick.Peek
+	dosbin bin/update_bad_phishing_sites bin/update_phishing_sites
+	newsbin bin/Sophos.install.linux Sophos.install
 
 	insinto /etc/MailScanner/conf.d
 	doins etc/conf.d/*
@@ -250,20 +252,20 @@ src_install() {
 	insinto /etc/MailScanner
 	doins -r etc/reports
 
-	insinto ${BASE}/$(get_libdir)/MailScanner
+	insinto /usr/$(get_libdir)/MailScanner
 	doins lib/*.prf
 
-	exeinto ${BASE}/$(get_libdir)/MailScanner
+	exeinto /usr/$(get_libdir)/MailScanner
 	doexe lib/*-wrapper
 	doexe lib/*-autoupdate
 	doexe lib/*-autoupdate.old
 	doexe lib/*.pm
 
-	exeinto ${BASE}/$(get_libdir)/MailScanner/MailScanner
+	exeinto /usr/$(get_libdir)/MailScanner/MailScanner
 	doexe lib/MailScanner/*.pm
 	doexe lib/MailScanner/*.pl
 
-	exeinto ${BASE}/$(get_libdir)/MailScanner/MailScanner/CustomFunctions
+	exeinto /usr/$(get_libdir)/MailScanner/MailScanner/CustomFunctions
 	doexe lib/MailScanner/CustomFunctions/MyExample.pm
 
 	newinitd "${FILESDIR}"/initd.mailscanner MailScanner
@@ -271,52 +273,55 @@ src_install() {
 
 	#Set up cron jobs
 	exeinto /etc/cron.hourly
-	newexe "${S}/bin/cron/check_MailScanner.cron" check_MailScanner
+	newexe bin/cron/check_MailScanner.cron check_MailScanner
 	for cronfile in update_{virus_scanners,{bad_,}phishing_sites}; do
-		newexe "${S}/bin/cron/${cronfile}.cron" ${cronfile}
+		newexe bin/cron/${cronfile}.cron ${cronfile}
 	done
 
 	exeinto /etc/cron.daily
-	newexe "${S}/bin/cron/clean.quarantine.cron" clean.quarantine
+	newexe bin/cron/clean.quarantine.cron clean.quarantine
 
-	dodoc README
-	insinto /usr/share/doc/${PF}
-	doins MailScanner.conf.index.html
+	dodoc README MailScanner.conf.index.html
 
 	keepdir /var/spool/MailScanner/incoming
 	keepdir /var/spool/MailScanner/quarantine
 	keepdir /var/spool/MailScanner/spamassassin
 	keepdir /var/spool/MailScanner/archive
-	keepdir ${BASE}/var
+	keepdir /usr/var
 
 	if use postfix ; then
-		chown -R postfix:postfix "${D}/var/spool/MailScanner/"
+		fowners -R postfix:postfix /var/spool/MailScanner/
 	elif use exim ; then
-		chown -R mail:mail "${D}/var/spool/MailScanner/"
+		fowners -R mail:mail /var/spool/MailScanner/
 	else
 		keepdir /var/spool/mqueue.in
 	fi
-	use spamassassin && dosym /etc/MailScanner/spam.assassin.prefs.conf /etc/mail/spamassassin/mailscanner.cf
-
+	if use spamassassin; then
+		dosym ../../MailScanner/spam.assassin.prefs.conf \
+			/etc/mail/spamassassin/mailscanner.cf
+	fi
 }
 
 pkg_postinst() {
 	if use postfix; then
 		elog "Note that postfix 2.4 now supports HOLD of messages"
 		elog "and reinjection without second postfix instance"
-		elog "Inbound path is now ${ROOT}var/spool/postfix/hold"
+		elog "Inbound path is now ${ROOT}/var/spool/postfix/hold"
 		elog
 		elog "See http://mailscanner.info/postfix.html for details"
 	fi
 
-	if [ -f "/etc/MailScanner/MailScanner.conf" ]; then
-		einfo "Upgrading the MailScanner.conf file"
-		cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV}
+	if [[ -f "/etc/MailScanner/MailScanner.conf" ]]; then
+		ebegin "Upgrading the MailScanner.conf file"
+		cp /etc/MailScanner/MailScanner.conf \
+			/etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} &&
 		/usr/sbin/upgrade_MailScanner_conf \
-		/etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} \
-		/etc/MailScanner/MailScanner.conf.${MY_PV} \
-		> /etc/MailScanner/MailScanner.conf 2> /dev/null
+			/etc/MailScanner/MailScanner.conf.pre_upgrade.${MY_PV} \
+			/etc/MailScanner/MailScanner.conf.${MY_PV} \
+			> /etc/MailScanner/MailScanner.conf 2> /dev/null
+		eend
 	else
-		cp /etc/MailScanner/MailScanner.conf.sample /etc/MailScanner/MailScanner.conf
+		cp /etc/MailScanner/MailScanner.conf.sample \
+			/etc/MailScanner/MailScanner.conf
 	fi
 }
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index 64855ed21ad4..2a1c0727319b 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -1,5 +1,5 @@
 AUX confd.mailscanner 147 BLAKE2B be4369be15115d4e1194d0d56b547e88a824378dce4af82f1600cff3cbd7fc75bd99919a6127e1c4ae99268605cc4d96187b4806fb7dbe60000adda8b9c0b2fd SHA512 2fb6f96eef254fae597e23ddb80c649e5754999e542436b7172ab4fca0d3e281645a2fcf21a3bde4c6c9d7cd48de868e64e74c5caac7ff235dbbbcc6c2ebeda3
 AUX initd.mailscanner 982 BLAKE2B c630647b12057e9c56264b9d5b58a6cf4fca8e3d07d38204a64714fcc99d7be3929b2e774e268ec958fefa071db2ec20e9dacc22a64b6c1f4e338c57c1bee6ef SHA512 88a14b02ec004b487b6aa9a8732092a18b465f8aa81e2c958b96434064a15ad5a5ce43b473679bd8b18a661f972c8df756c54691d35c4261dff8a26cd8e291ec
 DIST MailScanner-install-4.84.5-2.tar.gz 9510489 BLAKE2B 7bfdb0ba9fbd38281328e66fab9512b6dcc596d92fb18186df950d26c451bff0a8fa5345df7849e60e0040e6559754ef9e2099c17425ed4a6465071e0fb610dd SHA512 d9d082e29ddb6eae4f30069298507805a7674c264bf8edad3db3322fa0f2c2ad4539c0c2213c6fcbee11b7c57a36218c1d24243077358bac98e7ae07f7ee506f
-EBUILD MailScanner-4.84.5.2.ebuild 9641 BLAKE2B 39cc746459d095ef060f5315da64ad6e7a8b2f31c65d03eab8d4c0fa10a7951e6b3e9ad2ee4da29ef24671e80dad08acf284df6023aa74592f5ecdb629ff9849 SHA512 e00529e0fd604c684cef8b598034f0a5b7b064a95fef50235d9437ac6702e6fb51114f554f8dce2f8575eea7e82a0ba5c03839d4f52c3283755c6c6cf99dd223
+EBUILD MailScanner-4.84.5.2.ebuild 9558 BLAKE2B 0fa0a676e8407e44fce381a0dc027026acc4bfe3fbc33190f4bc2e037b39ef0fde6cfd3aed3ab4675eeabf67b618815ac51428e5f1fd8944a3510b2b24a3dc91 SHA512 f0003842049b6a7f198d0ba64ceae698a6790b0de51f6a813151f8128871ea91495733fd62d43bee33a89853eaac842b53a4d8083a48d57b3b73eade85c9428b
 MISC metadata.xml 511 BLAKE2B aba5245d0255701f471123abd5309a3b2d8702ed1189257ffb47ff5af540a24c82aad2f6115f79e146e1c90a6208bd961da29a553219eb71508d152c8be4d0d0 SHA512 6087d7d6977befe9271c7f95cb0ed5a232e7d4bb1e070259ee3fef10173be00f77cc834ce14f55b9123f7c4379595c4a5f817fefdbd9fde760a57e66144791b0
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 962a0e0f91c4..63fb9ed65268 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/clamassassin/Manifest b/mail-filter/clamassassin/Manifest
deleted file mode 100644
index 56fbd6bc903b..000000000000
--- a/mail-filter/clamassassin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST clamassassin-1.2.4.tar.gz 35350 BLAKE2B 397fea744d58814b5aad42aed81de7e12a29d1751315ae541fa9af580fea97ac253bae0a83790e081db7165ccfe56ef8bca16d1c88d9d439850a1ad793d2b997 SHA512 174a62f3c201d061b49641d6210c1c5adf21ee96e6881ca9c6b44577efc4795cbb5f0879cbb99222c8313095307c95f0dd3376743a0ab32c50f0b9eae45e0163
-EBUILD clamassassin-1.2.4.ebuild 1151 BLAKE2B a4b15c10d805d38be73460f00a2294ef51dbc5859f17cd0a5f56cdffc20e3197c998e62d1ff940438b727a7961ca28d8f5a678981a7d64e55103b329c1393305 SHA512 a7a237d0d92a55adbd7e581b6b301b5e1662731abcb5a1e83fadf8e5f2b03d003c2195f0cd72a33dabd2b739f560c1dc202fc63a6d4ec95866b86fcec04c558f
-MISC metadata.xml 346 BLAKE2B 00818af1710bbd6b2f9818b8d98e92584c63fa8ab5b7b719a40638594cde05ad73ee53135c85d6023429b2c308d22ce4f9f62826ced19af0fe104a7ebea78b60 SHA512 2f482897cd13cf8fc0a85fdaa54205d0a5357f6212c6eef8cffb95378a772c30dcde7de0ae7196145924b237d3e8495bbfe08dd4de9f20651daf8867355144b0
diff --git a/mail-filter/clamassassin/clamassassin-1.2.4.ebuild b/mail-filter/clamassassin/clamassassin-1.2.4.ebuild
deleted file mode 100644
index 688d386ec859..000000000000
--- a/mail-filter/clamassassin/clamassassin-1.2.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Simple spamassassin-like script for virus scanning and filtering e-mail messages"
-HOMEPAGE="http://jameslick.com/clamassassin/"
-SRC_URI="http://jameslick.com/clamassassin/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="subject-rewrite clamd"
-DEPEND=">=app-antivirus/clamav-0.90
-		sys-apps/debianutils
-		sys-apps/which
-		mail-filter/procmail"
-
-src_compile() {
-	# Try to get location of clamd's DatabaseDirectory
-	local clamav_dbdir=`awk '$1 == "DatabaseDirectory" { print $2 }' \
-		/etc/clamd.conf`
-	# If not defined in clamd.conf, go with default
-	if [ -z "$clamav_dbdir" ] ; then
-		clamav_dbdir="/var/lib/clamav"
-	fi
-	# Add an entry to sandbox write prediction list, so sandbox doesn't complain
-	addpredict ${clamav_dbdir}/
-
-	econf \
-		$(use_enable subject-rewrite) \
-		$(use_enable clamd clamdscan) \
-		|| die
-	# Fix problems with Portage exporting TMP and breaking clamassassin. #61806
-	sed -i -e "s:${TMP}:/tmp:" clamassassin
-}
-
-src_install() {
-	dobin clamassassin
-	dodoc CHANGELOG README
-}
diff --git a/mail-filter/clamassassin/metadata.xml b/mail-filter/clamassassin/metadata.xml
deleted file mode 100644
index 1faa3f8661f8..000000000000
--- a/mail-filter/clamassassin/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="clamd">Use the <pkg>app-antivirus/clamav</pkg> daemon for virus
-		checking</flag>
-	<flag name="subject-rewrite">Adds support for subject rewriting</flag>
-</use>
-</pkgmetadata>
diff --git a/mail-filter/clamsmtp/Manifest b/mail-filter/clamsmtp/Manifest
deleted file mode 100644
index 12b5c256ccb3..000000000000
--- a/mail-filter/clamsmtp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX clamsmtpd.init 463 BLAKE2B da33de783a2dae18774326fd13553c484c7418094570114b1df08b8dcc34193b9d44b1b843c469017f0597da4275de817e1b79cdb63d1389a2fe1b87e7021c92 SHA512 27ddb17a4061d1f7f6d135101655c17803aae8b8f19595ec29c3d4d01b31bdccc9d743e66662ca63ce0316e6b1812f7df6f44fd6c083832eb28bd45adf0f91a0
-DIST clamsmtp-1.10.tar.gz 217126 BLAKE2B 843dcec5bb920c97954d86aa0f342493e0820578f40b01dcb6ea7d69fce54cd1757b05be7ad606c037960e5fb6dfeb66086446dc938887ced9b23225e8b090c7 SHA512 f28e2c1d78c965245d8d7a8810fbeb11d41e40383eba2e8fca500f94c2e4b8d9a2c0b9e4e8e967965bf50266968e0b9549fb62369f37724350a20174c89a044b
-EBUILD clamsmtp-1.10.ebuild 1112 BLAKE2B 6bdda36cd32c19c1ae5057999868a6855837be56e397eeeb7535b221f4d07b9956ed16ca75472d03323220dfe5af423ae6834f14069b4e8999ebbaaf3d9e8b6e SHA512 f06b00677ca4284f69869127d35812823a1b5248f294abce95d8e316c68ddf85baffc6fd2bedd6e818ac960bfcb48c79bdd32d1b27c518becb41cdd2c8f2f3f9
-MISC metadata.xml 574 BLAKE2B 99514bef9d7d857cdb5e970fd360039c1db85b68a1005c7c37e9baaec04d51d72c13fb454f14dc895dfcbba7fb357cff821f49cf3e7e4793a432e71b8fa43bd9 SHA512 0dbf9ebd8101d8e188361f9ee1b55b5ef1077450e586ea2a9b0dd970e5270cf7a3bf42550f529d5fba2e6ffaba2f9e016bf7b45bd972fac1fecbd5651da6da39
diff --git a/mail-filter/clamsmtp/clamsmtp-1.10.ebuild b/mail-filter/clamsmtp/clamsmtp-1.10.ebuild
deleted file mode 100644
index d582f2536455..000000000000
--- a/mail-filter/clamsmtp/clamsmtp-1.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="An SMTP filter to check for viruses using the ClamAV anti-virus software"
-HOMEPAGE="http://thewalter.net/stef/software/clamsmtp/"
-
-SRC_URI="http://thewalter.net/stef/software/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ~sparc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=">=app-antivirus/clamav-0.75"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README NEWS
-	newinitd "${FILESDIR}"/clamsmtpd.init clamsmtpd
-	insinto /etc
-	newins doc/clamsmtpd.conf clamsmtpd.conf
-
-	sed -i \
-		-e "s|\#\(ClamAddress\): .*|\1: /var/run/clamav/clamd.sock|" \
-		-e "s|\#\(User\): .*|\1: clamav|" \
-		"${D}"/etc/clamsmtpd.conf
-}
-
-pkg_postinst() {
-	echo
-	elog "For help configuring Postfix to use clamsmtpd, see:"
-	elog "    http://thewalter.net/stef/software/clamsmtp/postfix.html"
-	echo
-	ewarn "You'll need to have ScanMail support turned on in clamav.conf"
-	ewarn "Also, make sure the clamd scanning daemon is running (not just freshclam)"
-	echo
-}
diff --git a/mail-filter/clamsmtp/files/clamsmtpd.init b/mail-filter/clamsmtp/files/clamsmtpd.init
deleted file mode 100644
index 94baa2d87b94..000000000000
--- a/mail-filter/clamsmtp/files/clamsmtpd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-           
-depend() {
-	need clamd
-}
-
-start() {
-	ebegin "Starting ClamSMTPd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/clamsmtpd -- -p /var/run/clamav/clamsmtpd.pid -f /etc/clamsmtpd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ClamSMTPd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/clamav/clamsmtpd.pid
-	eend $?
-}
diff --git a/mail-filter/clamsmtp/metadata.xml b/mail-filter/clamsmtp/metadata.xml
deleted file mode 100644
index 5a2e34b38296..000000000000
--- a/mail-filter/clamsmtp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>ClamSMTP is an SMTP filter that allows you to check for viruses using the ClamAV anti-virus software. It accepts SMTP connections and forwards the SMTP commands and responses to another SMTP server. The 'DATA' email body is intercepted and scanned before forwarding.</longdescription>
-	<upstream>
-		<changelog>http://thewalter.net/stef/software/clamsmtp/ChangeLog</changelog>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
new file mode 100644
index 000000000000..b5f0b919defe
--- /dev/null
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -0,0 +1,3 @@
+DIST courier-pythonfilter-3.0.2.tar.gz 59121 BLAKE2B 6223ddd62c1c1af980720451e3446cd3b2296a243c5c8d3b5e60fd8640e3391ba2e561ea251bbacbb4a1c6cdbe7eccf6f7ff8221d952cf5703d389b0267a1a2f SHA512 62985a3fefc2d324b3ba7035117e88e4e246815e63fe1b681af11a38a20ea55e649a233c1979b918b166f5c2abbcc22037f215b73be298763f777648249cd652
+EBUILD courier-pythonfilter-3.0.2.ebuild 506 BLAKE2B 18d62d19d3795a14bbd833905046da4e1c399d1e88ec94a838e2b78754c17307959c943860ec62467538dde5c89ce955bc2a970092524c08e2f56b709be305d3 SHA512 48f84d8a7591cd7d9e30a37c6e8e75726bdee8f0e513efc872301c67f654020e8adb8ec098174c7c070cdfe216dd90be839fb440ba46efd2553841c5890591d9
+MISC metadata.xml 216 BLAKE2B ff21e786382ce75611e7386f0689145fa9b64a7ef8c3c23ff92ef9c0f2bae866fec67838df7ce6608d4f1954f107b8d424103789c62384a04af120eea19053a8 SHA512 6309007f7bf488d882e2769f332c0c76bcc5972bbb60e90f86fc1895b9421494be9b1d962ce7b8a68b484f5bef6e0d6bb67247496b1d5e00e0a6ba55403e1df0
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild
new file mode 100644
index 000000000000..8807a3f26a5e
--- /dev/null
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python filtering architecture for the Courier MTA"
+HOMEPAGE="https://bitbucket.org/gordonmessmer/courier-pythonfilter/src/default/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="mail-mta/courier"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/mail-filter/disspam/metadata.xml b/mail-filter/courier-pythonfilter/metadata.xml
index 6f49eba8f496..1d07f2a1081a 100644
--- a/mail-filter/disspam/metadata.xml
+++ b/mail-filter/courier-pythonfilter/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/disspam/Manifest b/mail-filter/disspam/Manifest
deleted file mode 100644
index 0740d60274e7..000000000000
--- a/mail-filter/disspam/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST disspam-0.14.tar.gz 14080 BLAKE2B f84cee4f3c369d65dbc65aa40d1dcad98505e79f6466b0b77fc788a4c6c149f2fc3a83b10f67d7246bf80edbae3c610e3c83d9ac5e9324979591c30d7bcf9b56 SHA512 549210d7a5aacd62cdf3ce7384c5d35e011147355388fdfde14ee1f951752ebd3f1f4844c4c2016ee3b1cb0cf88242d0bb7dccbc9dfa6ec2ca3e39e2f1b7195b
-EBUILD disspam-0.14.ebuild 807 BLAKE2B e8733707ca9336052094c659d20cc003d7b2bb8431b4524dda992c1686f1df011aeea313528dde8e9875f33ddfac0d57685491f0b081ef8f3b548c781e7507ee SHA512 3d9cff3918c0d0f723e62fe5b143cbf366dc74e4d97962007a5700c2e378f05cf4598ac3c827a817fa1b4fc3f7b0e061334c230800b0ae2e93d5f99030a802bb
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/disspam/disspam-0.14.ebuild b/mail-filter/disspam/disspam-0.14.ebuild
deleted file mode 100644
index e207d9a2c66b..000000000000
--- a/mail-filter/disspam/disspam-0.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A Perl script that removes spam from POP3 mailboxes based on RBLs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://fossies.org/linux/privat/old/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.1
-	>=virtual/perl-libnet-1.11
-	>=sys-apps/sed-4
-	>=dev-perl/Net-DNS-0.12"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#This doesnt look neat but makes it work
-	sed -i \
-		-e 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' disspam.pl || \
-			die "sed disspam.pl failed"
-}
-
-src_install() {
-	dobin disspam.pl
-	dodoc changes.txt configuration.txt readme.txt sample.conf
-}
diff --git a/mail-filter/libsieve/Manifest b/mail-filter/libsieve/Manifest
index 2e0852a0e9f2..93531518a5ae 100644
--- a/mail-filter/libsieve/Manifest
+++ b/mail-filter/libsieve/Manifest
@@ -1,3 +1,3 @@
 DIST libsieve-2.2.7.tar.gz 569646 BLAKE2B 2dbfc152110936b5a385af4169a3a2c36a95d241db63153fca94357cb7a8009de2712340185480a13714e8c3c7fc0a648de1d7ce6c1dbbb9ae116dcd3f685ca7 SHA512 e943a76009f3de41274d7100a8b995fe66a91ec92c1c22236ab765cb449add42b38402cc8e161a1b9870dcdd6abc05d9fb5d99d9230c6814896fb0647afe0796
-EBUILD libsieve-2.2.7.ebuild 590 BLAKE2B bd5a47ecb12d0c4d902797b3f36015aee83f6ad4f4eaa3e4576ae54faa3cfef58a4e625d67e06c718844099ce093fb52a1cf3a226c6a551ec2eb60042a054627 SHA512 748deb9bd1ce781a511a7d0aaeee901725d68ea2b0280350b8bc94f4242b61e625c5fc3d1c057862eb43256e6f0df3d20da9bb00767fc4d17f42ae4b2c02c6cf
+EBUILD libsieve-2.2.7.ebuild 425 BLAKE2B f523ea556d21215fb77c283829c08f455b412cf209ba10e8532e759afeb894024a214d82b397e31dc876f433f692b832dcf569968d72684a40c26800f1f84db2 SHA512 a4f62c1309fff3b763654d3d994709a89e70b8a7317ea63f0bce40c6c859ff7bba6db03129bb6694099f08b9baeeaf8cc533eaa39d5a04ff6aba03452ff53334
 MISC metadata.xml 547 BLAKE2B a8799ccc731378de59e89f68b94a61a3f1591d4247bc645830c2058d2b25b8b4c0d280ff40b84e04be49852ba4a8800abf6aec6abce6bb35109a7fee2d966adf SHA512 0a5b5c0a03fa5e616d9204c1a03da5e0bcc42d43481168604edcdd15b8125e7ca0b3983cc6eae576561a4990359bc47fcb0536a9af71a4ed3c6ccea4d45dfdd5
diff --git a/mail-filter/libsieve/libsieve-2.2.7.ebuild b/mail-filter/libsieve/libsieve-2.2.7.ebuild
index 9d0a996a5403..828b84ce2820 100644
--- a/mail-filter/libsieve/libsieve-2.2.7.ebuild
+++ b/mail-filter/libsieve/libsieve-2.2.7.ebuild
@@ -1,27 +1,18 @@
-# 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
 
 DESCRIPTION="A library for parsing, sorting and filtering your mail"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libsieve.sourceforge.net/"
 
 SLOT="0"
-LICENSE="MIT LGPL-2"
+LICENSE="MIT LGPL-2.1"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="!<net-mail/mailutils-2.1"
 
-src_compile() {
-	cd "${S}"/src
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	cd "${S}"/src
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
+S=${WORKDIR}/${P}/src
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index bd2d39cec8a9..d6fe9a2208a5 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 1160 BLAKE2B d7d9917a9078da4354b44f9f54b3d6ea23a86cdfbd9789a4cffb642d5c48343c31ab6d6009b8aa51cb637307442a7019d551f41e0ac4460f282a17f49ce46448 SHA512 5f18ffdc1abf07b793d0b6818afc5bdbfadc08b7ad2481124fd38ec76a6481f2b30775cb87a59bdae94a90e21020ce6c8b64ad41b1b7689a8e7e3ca3d8257715
+EBUILD libsrs_alt-1.0-r1.ebuild 1159 BLAKE2B ade7067f839dcccc54f2ff5f3e77a8f0340913b9e0e8097a88bcb2dd490a88b7df105dd5cfb87b87642f88442907d92143fefac8b79584850ad866fa8da00e05 SHA512 4ccb73d8b8897d9ee28be4349d73d115f56c511d691e6d10f2ea3bb0561c97b06136f9c8da00939df213768eb3eadf2a8d61baaaae4cdbfebc30e4ea46f6797a
 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 00557d6ce5a1..032bdefb4ab6 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/normalizemime/Manifest b/mail-filter/normalizemime/Manifest
index 551d4f3782db..671cd387ea9e 100644
--- a/mail-filter/normalizemime/Manifest
+++ b/mail-filter/normalizemime/Manifest
@@ -1,3 +1,3 @@
 DIST normalizemime-1.19.tar.bz2 12192 BLAKE2B 663d2b67c597003c8b8f8d098bbb0538abcb2a68109ede900d9f6aca9b5af8d0a2822c86738dc8763b2693a4b1a642518c1d46cd8525fc2d94c1a8d2cf93f5e6 SHA512 670d2508dd6d79e09a9187d2161d4fd81168b34705d620d1ad3547d298404b3964ddb5ae1921e9e570c7132df1cd65e27f4da6e532bec39a9177085da84eb46c
-EBUILD normalizemime-1.19.ebuild 458 BLAKE2B 9512031b4b1090f60c815a9168e62a8b512616cdebc2ca1276102b743f63640518a74a3c627493fd906062773762be6bd8cd1ac7eb5b2ef841336f1fb26eda6c SHA512 eeac0794f9edd933bfb001b3a8147e04d7e962ca302f545f5c25867ff5d6c6201b697f595e74fb7617a297088bfdb36f87cb1704f9df0b4411e9f5b9f450dfcb
+EBUILD normalizemime-1.19.ebuild 441 BLAKE2B 779c3d5fa72bb357d08de6eb095359584ef2a3dd10a7336e6421ac1865f43960f03759539d45298e78649629a7799f7893777b57f2edc2f901fca93e2dcf242d SHA512 7e1b6172685947895f4dcf9449821bed0bf4a4620f30a81ab42bd74d4c2bb71a011d5cf3c873c4564e78bf5a4dcf94bd0ad1616a2be173cc38ad5ef34300c2bb
 MISC metadata.xml 170 BLAKE2B 596d3ac9dabce24bba0cde2371d477e82ca5f9200bfeda69429558c79d4b59db07d8cb368f7eac09605bd132564778c12a20934e61cfede0197b9ebf69a3b5ca SHA512 ad26626abac376b8d9cb5b3125c4361c443524ef85ec99212acd972ca75190b15fe2f701c00c5110c74efc2171db92e41d580786ae2356bf1248e7808b6c67b8
diff --git a/mail-filter/normalizemime/normalizemime-1.19.ebuild b/mail-filter/normalizemime/normalizemime-1.19.ebuild
index d5077b3a88e4..2741d63cba57 100644
--- a/mail-filter/normalizemime/normalizemime-1.19.ebuild
+++ b/mail-filter/normalizemime/normalizemime-1.19.ebuild
@@ -1,7 +1,7 @@
-# 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 toolchain-funcs
 
@@ -16,9 +16,9 @@ IUSE=""
 
 src_compile() {
 	tc-export CC
-	emake normalizemime || die
+	emake normalizemime
 }
 
 src_install() {
-	dobin normalizemime || die
+	dobin normalizemime
 }
diff --git a/mail-filter/procmail-lib/Manifest b/mail-filter/procmail-lib/Manifest
deleted file mode 100644
index 2fbb51210975..000000000000
--- a/mail-filter/procmail-lib/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST procmail-lib-2008.1108.tar.gz 763653 BLAKE2B b4c1a6d41031366e2147cdc62c9cc08825a029f11f5f85d29f2673476d0efe3525c1627dd01bc49bababe5747c727df04736669fc004840124d75c8a02ba605d SHA512 54a9ffa7bd5e5554c0d48efa59c22ed4aaa635d3b87a3b8cdc2b660ab8a4acdd1dfa39d7d816ed3ebc379ddc7e8e58e54e0f0fb8c8f6eb51661201f03bc0332b
-DIST procmail-lib-2009.1202.tar.gz 765078 BLAKE2B e732ab6e4e298ecd1b4155e4761b0420ce6d82639ec85d3b1b21fee1e52ab5845178718dbde70219793fe08c1e257252b27ccf16706608d5e091850715b434ea SHA512 374681de60f7ba55f6581b248684841482eca01b04bf81b67fca8fc62caf1e7acc5e7562db16f6aa11fa072bee032e54e925081483e3987f820c9863d19e4a97
-EBUILD procmail-lib-20081108.ebuild 619 BLAKE2B d66c91c65c6eab3675fb4a2938ca6c9efc73aa553340b784b63a0c9d6095417486a16620bfcda99d90679559836f30adfecb99000c7d331de0da1ff7601e1b85 SHA512 025e4c48e0f5c9dd1fc751347293bddc35e69945a7ba05e713fc726db5cbc998394eacb7373527f359b437fc13717bde4882b77a8e431eb82ad6b56f317801a5
-EBUILD procmail-lib-20091202.ebuild 623 BLAKE2B 2f3b0eb28950099e5efb6b18eb1b2df67fdb975648ed775856e6594a9ae924fcc28cb4ce0e9b64531f5c7634cf0a2030111385443789cbf48b82bd18cc795951 SHA512 e61136975bcb573ccd9ffd828ea4bc124deda14437929548b12ec5e9cadacbc37e42eb1f2d9088aac619b8a2abb334df19396ddf25c4f68064cdba5b53fd80bf
-MISC metadata.xml 247 BLAKE2B 5492bd3fa9d43d25503d3be74f5641033957cfcf7837ef1291ccdc65ad0593a4898ae7974f771de1757a2610e5d8fd1f4546b8eee31ada2521078958eecac938 SHA512 8aeb42fa36e5e828d7563eda215af37fee3de8d7f0ccaad42147ab2ae07af8ea1d2e142b89df7bcc0728f7bd55f7bc29a5eb9886c3b9c355e6790c1be0e5bcd4
diff --git a/mail-filter/procmail-lib/metadata.xml b/mail-filter/procmail-lib/metadata.xml
deleted file mode 100644
index b751ca573b70..000000000000
--- a/mail-filter/procmail-lib/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="freshmeat">procmail-lib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-filter/procmail-lib/procmail-lib-20081108.ebuild b/mail-filter/procmail-lib/procmail-lib-20081108.ebuild
deleted file mode 100644
index 44a405895038..000000000000
--- a/mail-filter/procmail-lib/procmail-lib-20081108.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PV="${PV:0:4}.${PV:4}"
-
-DESCRIPTION="Procmail Module Library is a collection of modules for Procmail"
-HOMEPAGE="http://freshmeat.net/projects/procmail-lib"
-SRC_URI="mirror://nongnu/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="mail-filter/procmail"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	emake DESTDIR="${D}" prefix=/usr install || die "make install failed"
-	mv "${D}"/usr/share/doc/"${PN}" "${D}"/usr/share/doc/"${PF}"
-}
diff --git a/mail-filter/procmail-lib/procmail-lib-20091202.ebuild b/mail-filter/procmail-lib/procmail-lib-20091202.ebuild
deleted file mode 100644
index fd708a7c7f97..000000000000
--- a/mail-filter/procmail-lib/procmail-lib-20091202.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PV="${PV:0:4}.${PV:4}"
-
-DESCRIPTION="Procmail Module Library is a collection of modules for Procmail"
-HOMEPAGE="http://freshmeat.net/projects/procmail-lib"
-SRC_URI="mirror://nongnu/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="mail-filter/procmail"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	emake DESTDIR="${D}" prefix=/usr install || die "make install failed"
-	mv "${D}"/usr/share/doc/"${PN}" "${D}"/usr/share/doc/"${PF}"
-}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 11bdb71845ef..76b22905dd44 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,12 +1,15 @@
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r6.init 1370 BLAKE2B 333683396f499c3d1cfc92d67434fc9d1fdab695b1ddf9798d0bed42b227111cb9c779fd33e04bb095affd09326edf6f80100d58248061795bf3540e2e9e0771 SHA512 40016348ed413414c9a06182f8da896bcb5b0f48bf7ec51db1cd7e4f9adea59e30c6c5ddc79135141b795e829af2660c047ed8f93fed1e181f9f2f01a419d690
+AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-1.8.3.tar.gz 4319623 BLAKE2B b7fdd6791df5899710bb1d696a9b94d1840335b6a34d6cdeebc2b5eebe9f4e5b6da3e90ed9ab5e3945aab7ef33f54f048024b51c3de37db1a083ad89c656b456 SHA512 5e20255466fe2cd4842196fb2138732b59911de655e73d9cc13009b5179b84e5a2060083961b35fe40b9f550f8e18067056415a1d803fac54fac000070024c01
 DIST rspamd-1.9.0.tar.gz 4402395 BLAKE2B 11f90fc232496b493296ef0fb9ff4118ac11863528cd6a52bcae6adbdc09ce86453bb39df35714702fcd5c6a535007ec402a580bd735abbddeeb154ff8807219 SHA512 fee2a60c10fbab087b12d9188974a0c47417a9894308f66980eb6311496b16661194d858d1e522d2d524b3e359f2f3ad88535421d1dc05be26414b5a346afec6
 DIST rspamd-1.9.4.tar.gz 4476230 BLAKE2B e4866fb8fd97210e77b75d948ae97f038eccc33ec9f6214693579e5d84210c87ff9258204f466ffe6bea780159d24d819aaf393a06dbf2785659a784e4f4e8b6 SHA512 3acecec6adb91580ac2ad96419fdc9588b120ec5a3b4a44135fc5a3e7c15f2dbc99963a8337f9effb9423846489545a55d89d1849c5ba62d8cd91dc67c32d8dc
+DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
 EBUILD rspamd-1.8.3.ebuild 2315 BLAKE2B ab1addaef1d8b0df9d8e4a91ca13f189101a447906f97e97913224b5fe3b4fd2b8447a9348450793d6e2a654807b7a722f1852ba1252b845baae5fde45e3b939 SHA512 b0dd11c1b5576ad96ac73241cc08433707a2167ff3ee3095d4b752e1b68f2dde1d7584aa4750ac94332ddcde7a0eeb60ce597709dc995f2643cf3e7a91f432ce
 EBUILD rspamd-1.9.0.ebuild 2242 BLAKE2B f294fc165ccf83af918e37b5f4659bbca79e1fae2b378d4c7218074dcac318c3faea6ef10eb59bff59fc4ca3ea5115182d53948debdc6314ee457d70598a4df8 SHA512 c6f28512d0dee9213dcd48d7df0c3672c2f86d520090ed392efaa0c27ac0e27653ce487e5570953d34b50d6bfbc2c74d282f3ecd8d67acf1b5874f55c7f59797
 EBUILD rspamd-1.9.4.ebuild 2243 BLAKE2B 761b7957ef0863740a9c23a398a8a8de7721a6d34dbafc27f10ede69bac81e8a43b163d5528a1355390aba63909d338b72e39bbe9fb76484e8dffa017804dc97 SHA512 99bc3601ea709a6b7acd2f791db39c994d498995f91362b7d092980cad49df5b36849af9086af26ca3acbe49ecc18e82a09f196101e59bb36aac0490bea198b2
-EBUILD rspamd-9999.ebuild 2242 BLAKE2B f294fc165ccf83af918e37b5f4659bbca79e1fae2b378d4c7218074dcac318c3faea6ef10eb59bff59fc4ca3ea5115182d53948debdc6314ee457d70598a4df8 SHA512 c6f28512d0dee9213dcd48d7df0c3672c2f86d520090ed392efaa0c27ac0e27653ce487e5570953d34b50d6bfbc2c74d282f3ecd8d67acf1b5874f55c7f59797
+EBUILD rspamd-2.1.ebuild 2152 BLAKE2B ab16f6795a05f64b157073b2919d2140f77ceedb8b6fc23ed266d9e6892833e23e991964af599dac1dec996b4defee096dba9def8b33efb4db20e654a78b6200 SHA512 2645c7bf6488cba8c2ff4d61738e0ec78923365c0e5d071ba0b50b000892b911436f6151d58c2414a0175500eda2141788ea3e491e88dfc56d63be775e2f936a
+EBUILD rspamd-9999.ebuild 2152 BLAKE2B ab16f6795a05f64b157073b2919d2140f77ceedb8b6fc23ed266d9e6892833e23e991964af599dac1dec996b4defee096dba9def8b33efb4db20e654a78b6200 SHA512 2645c7bf6488cba8c2ff4d61738e0ec78923365c0e5d071ba0b50b000892b911436f6151d58c2414a0175500eda2141788ea3e491e88dfc56d63be775e2f936a
 MISC metadata.xml 834 BLAKE2B 48979c23212a496c955667b99cfb618da9f682e2269bb42c9b4e4932b94304197422bc2480e7177d73ff6cb246e53a964bd43f5819827e4b6342786c282277db SHA512 c9a2106f419b90885905947aebacfdd15e7d1a66cb9cc6267cb79f487c9069f8ed2cc65c3d6d0ec05b011ade53ed2177df8f11ee49ee1e720dcf6ac365bc28d1
diff --git a/mail-filter/rspamd/files/rspamd-r7.init b/mail-filter/rspamd/files/rspamd-r7.init
new file mode 100644
index 000000000000..311fde9d6372
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-r7.init
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 2015-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+RSPAMD_CONFIGFILE=${RSPAMD_CONFIGFILE:-"/etc/rspamd/rspamd.conf"}
+RSPAMD_GROUP=${RSPAMD_GROUP:-rspamd}
+RSPAMD_OPTS=${RSPAMD_OPTS:-""}
+RSPAMD_PIDFILE=${RSPAMD_PIDFILE:-"/run/rspamd.pid"}
+RSPAMD_USER=${RSPAMD_USER:-rspamd}
+
+command="/usr/bin/rspamd"
+command_rspamadm="/usr/bin/rspamadm"
+command_args="${RSPAMD_OPTS} -c \"${RSPAMD_CONFIGFILE}\" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} --pid \"${RSPAMD_PIDFILE}\""
+start_stop_daemon_args=${RSPAMD_SSDARGS:-"--wait 1000"}
+pidfile="${RSPAMD_PIDFILE}"
+retry=${RSPAMD_TERMTIMEOUT:-"TERM/60/KILL/5"}
+
+required_files="${RSPAMD_CONFIGFILE}"
+
+description="Rapid spam filtering system"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+description_checkconfig="Validate rspamd's configuration"
+description_reload="Sends rspamd a signal to reload its configuration"
+
+depend() {
+	before mta
+	use dns redis
+}
+
+checkconfig() {
+	${command_rspamadm} configtest 1>/dev/null || return 1
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		checkconfig || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		checkconfig || return 1
+	fi
+}
diff --git a/mail-filter/rspamd/rspamd-2.1.ebuild b/mail-filter/rspamd/rspamd-2.1.ebuild
new file mode 100644
index 000000000000..a44b355c466a
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils pax-utils systemd tmpfiles user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/libev
+	net-libs/libnsl
+	sys-apps/file
+	dev-util/ragel
+	dev-libs/libsodium
+	blas? ( sci-libs/openblas )
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( dev-lang/luajit:2 )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's/User=_rspamd/User=rspamd/g' \
+		rspamd.service \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newconfd "${FILESDIR}"/rspamd.conf rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+	systemd_newunit rspamd.service rspamd.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED%/}"/usr/bin/rspamd-* "${ED%/}"/usr/bin/rspamadm-*
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 2000be8f5492..a44b355c466a 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -17,18 +17,18 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://github.com/vstakhov/rspamd"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
-REQUIRED_USE="torch? ( jit )"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
 
 RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu:=
-	dev-libs/libevent:=
+	dev-libs/libev
 	net-libs/libnsl
 	sys-apps/file
 	dev-util/ragel
+	dev-libs/libsodium
+	blas? ( sci-libs/openblas )
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	gd? ( media-libs/gd[jpeg] )
 	jemalloc? ( dev-libs/jemalloc )
 	jit? ( dev-lang/luajit:2 )
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
@@ -57,11 +57,9 @@ src_configure() {
 		-DDBDIR=/var/lib/rspamd
 		-DLOGDIR=/var/log/rspamd
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
-		-DENABLE_GD=$(usex gd ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
 		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
 		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_TORCH=$(usex torch ON OFF)
 	)
 	cmake-utils_src_configure
 }
@@ -74,7 +72,7 @@ src_install() {
 	cmake-utils_src_install
 
 	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r6.init" rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
 	systemd_newunit rspamd.service rspamd.service
 
 	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf