gentoo resync : 16.06.2019

11 files changed, 2 insertions, 482 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e458303c011d..dbffb015d39a 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
deleted file mode 100644
index c8b5f03aea80..000000000000
--- a/mail-filter/mimedefang/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX mimedefang-2.72-ldflags.patch 2458 BLAKE2B 3d78cfee8b7bfe87c57390045919511ee11548bc0279316b54c63a428e04d4d168b1d5cd430600e17fa63c5ca2770756bfdf8f681025dff08a600629af3eb9d6 SHA512 a84ff0cefc9dc56b348b8fe6715e9669af43a25d20867b63c63a3006565edd6fb40d2f27b8ddcfd8dd5bb9a4f023e23ae4d258da70df53e3309d680fac4b0aef
-AUX mimedefang.conf 4347 BLAKE2B 9a0733bfe9ffa8dffee9b21e840d84141826e6f2ffb9de0f8e9b319ac140ea4a86af45a5784acff0edd3ddcbecf69126e5aa6e69318e6cffe445323cf802b3a1 SHA512 fb516748e87fd4e0e2b0db6acacd582aa878654d5062102debfda5d492c4bef192e1613a973ccb011cbd7c7f5246cec2e7ff98ef6caf5d9e25757a98965e8861
-AUX mimedefang.init 3459 BLAKE2B e6c6419fa444e3e106ba86030522afe1a9098b9d0a05542d9e065571fbd8be1312eb037f7aeccf62edfe1319b2594efbf66c081e614d41ae35dd3be87f5013a5 SHA512 2ce7a9a35f037c6fa9905d0275ccb915e4744ae54ddc129368d1782173559a2805a461121a7096345fd6f99d5aba14b0e218a50c4da7b8a4aebc9a6d8f8f9882
-DIST mimedefang-2.73.tar.gz 356601 BLAKE2B 75d945f549e4e60c17c2de33de2bab27d93a62e150a60abcec5f45aeab7fc0c37cbf9875f088bf4d07a399ac305e08ff1bda43b6f440fc648233939ec8e2aa5e SHA512 c20ee35235107342d4bce5a95cca01fc6c45365bf270b11c2bfe44a614ec39bcdd2a7b71836a092d6df88519194dbb3e93e293144b740e95e9846ebe0302cf5e
-DIST mimedefang-2.74.tar.gz 362500 BLAKE2B 745536aeb511f8025e738443b18b2922666af417ed8c6ac0a62096ef8c1b01b532dfad4984bae18b33fecc890bd264695190cb44a10ffd6f7df33c0a89b1b9a9 SHA512 0168c4e664fcd2df7f08e4f7d110114d907f8f37d50986c89b33f5a575c87291574d0b5dff0197fb5666281f4fe1b67a61e8719a470bd01c5b7f2fc354f066b4
-DIST mimedefang-2.75.tar.gz 363535 BLAKE2B 7ede4ca1c2797630672adc00f7cfc8dd1daa0a2756b6c8fe24c4b6bce382fe713a21be90ef6b5f0cedfa4c1f46109b4011ccf6f862f2f3b7ea1cf29b656393b6 SHA512 a8b5c83116d973ea8971df8682d4ba26a37a47fd58cf740eecc1b70aa68a8aa765f7fa2415542d54f147990310b68e64d1e949d3b988cee24c4c2c5194123d98
-EBUILD mimedefang-2.73.ebuild 1476 BLAKE2B d83869aaa588377f9dc8164bba95d28c7c9aa3fe0f89bc1ba827fdb74ae2898ec625565b9935bc057732666d578708f9bd703e99dd3f755df5a2fb43edabd37d SHA512 5ada1f9b4791cf5e299a6819432b542c8b729b6ba6e582c58631bb0e5797158b4c63ded130cc176e24df848d60145d80830d40e3461d981e460d7d67aa3ddf56
-EBUILD mimedefang-2.74.ebuild 1432 BLAKE2B 81a3107cde5d1bbcff7388f3eaf3b6b7c30cf5c4b26ec27bb3d615b0e7d65fcca6f93e9b8de3cc2dc86da1c73f20a82fcebf719cf0a558b31feb7179ead1a34a SHA512 1ad65fa8c118e235273eb7b7bcbeafea5a16ba134fcd915f3ed2a3468ae691941e232cad9f6f38aa984e545eab3b148d1640a7573cfdc22f3704ac63469fa0f0
-EBUILD mimedefang-2.75.ebuild 1434 BLAKE2B 01872ad4e01416011bf7966d60d188eed3868f0d7b6bed0bebf65ab523b56a92da28ac61cff4ce4e324325fad1dce89e0285ed52e6c6f66434bf9b3c8c2b7291 SHA512 a8930408d780dd9cdf1226a627b3e60ef78f04c04f909949e1c519ee906a363e425e51a6114e423292f229469dafe6e9afffa4802bb6b395e53fe84041418181
-MISC metadata.xml 398 BLAKE2B 49cdc8a28b624bcd1788ad0634d048678a474ffbf3579db5ebe5b9f162882583db5949f63a4c610ef8ee75add02524253c64691e04684355133baf859864fd13 SHA512 f7f9ebbd62d77578f6f716b4bbe55d91de62f06a446b1a3a44766f116307130f1d30752b1ac20698d47a8b1aa865e530c9e57bd93e541e451d3b77af8d8f46c6
diff --git a/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch b/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch
deleted file mode 100644
index 998b3183e661..000000000000
--- a/mail-filter/mimedefang/files/mimedefang-2.72-ldflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- mimedefang-2.72/Makefile.in.orig
-+++ mimedefang-2.72/Makefile.in
-@@ -52,7 +52,7 @@
- all: mimedefang mimedefang-multiplexor md-mx-ctrl pod2man
- 
- mimedefang-multiplexor: mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o notifier.o syslog-fac.o utils.o $(EMBPERLOBJS)
--	$(CC) $(CFLAGS) -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o syslog-fac.o notifier.o utils.o $(EMBPERLOBJS) $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs_nothread.o syslog-fac.o notifier.o utils.o $(EMBPERLOBJS) $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
- 
- embperl.o: embperl.c
- 	$(CC) $(CFLAGS) $(EMBPERLCFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o embperl.o $(srcdir)/embperl.c
-@@ -67,7 +67,7 @@
- 	$(CC) $(CFLAGS) $(EMBPERLCFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o test-embed-perl.o $(srcdir)/test-embed-perl.c
- 
- te: test-embed-perl.o
--	$(CC) $(CFLAGS) -o te test-embed-perl.o $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o te test-embed-perl.o $(LIBS_WITHOUT_PTHREAD) $(EMBPERLLDFLAGS) $(EMBPERLLIBS)
- rm_r.o: rm_r.c
- 	$(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o rm_r.o $(srcdir)/rm_r.c
- 
-@@ -75,7 +75,7 @@
- 	$(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o syslog-fac.o $(srcdir)/syslog-fac.c
- 
- md-mx-ctrl: md-mx-ctrl.o
--	$(CC) $(CFLAGS) -o md-mx-ctrl md-mx-ctrl.o $(LIBS_WITHOUT_PTHREAD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o md-mx-ctrl md-mx-ctrl.o $(LIBS_WITHOUT_PTHREAD)
- 
- md-mx-ctrl.o: md-mx-ctrl.c
- 	$(CC) $(CFLAGS) $(DEFS) $(MINCLUDE) -c -o md-mx-ctrl.o $(srcdir)/md-mx-ctrl.c
-@@ -99,7 +99,7 @@
- 	$(CC) $(CFLAGS) $(DEFS) $(MINCLUDE) -c -o mimedefang-multiplexor.o $(srcdir)/mimedefang-multiplexor.c
- 
- mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o
--	$(CC) $(CFLAGS) $(PTHREAD_FLAG) -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o $(LDFLAGS) -lmilter $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(PTHREAD_FLAG) -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o gen_id.o $(LDFLAGS) -lmilter $(LIBS)
- 
- mimedefang.o: mimedefang.c mimedefang.h
- 	$(CC) $(CFLAGS) $(PTHREAD_FLAG) $(DEFS) $(MINCLUDE) -c -o mimedefang.o $(srcdir)/mimedefang.c
diff --git a/mail-filter/mimedefang/files/mimedefang.conf b/mail-filter/mimedefang/files/mimedefang.conf
deleted file mode 100644
index 49ccef7be077..000000000000
--- a/mail-filter/mimedefang/files/mimedefang.conf
+++ /dev/null
@@ -1,131 +0,0 @@
-# Additional options for MIMEDefang.
-# read man pages mimedefang(8) for additional informations.
-
-# Locale should be set to "C" for generating valid date headers
-LC_ALL=C
-export LC_ALL
-
-# The settings which follow are defaults.  You can override them by
-# placing assignments in /etc/mail/mimedefang.conf
-
-# The socket used by mimedefang to communicate with sendmail
-# SOCKET=$SPOOLDIR/mimedefang.sock
-
-# Run the multiplexor and filters as this user, not root.  RECOMMENDED
-MX_USER=defang
-
-# Syslog facility
-# SYSLOG_FACILITY=mail
-
-# If you want to keep spool directories around if the filter fails,
-# set the next one to yes
-# KEEP_FAILED_DIRECTORIES=no
-
-# "yes" turns on the multiplexor relay checking function
-# MX_RELAY_CHECK=no
-
-# "yes" turns on the multiplexor HELO checking function
-# MX_HELO_CHECK=no
-
-# "yes" turns on the multiplexor sender checking function
-# MX_SENDER_CHECK=no
-
-# "yes" turns on the multiplexor recipient checking function
-# MX_RECIPIENT_CHECK=no
-
-# Set to yes if you want the multiplexor to log events to syslog
-MX_LOG=yes
-
-# Set to yes if you want to use an embedded Perl interpreter
-# MX_EMBED_PERL=yes
-
-# Set to full path of socket for Sendmail's SOCKETMAP map, if you
-# want to use it with MIMEDefang
-# MX_MAP_SOCKET=$SPOOLDIR/map.sock
-
-# The multiplexor does not start all slaves at the same time.  Instead,
-# it starts one slave every MX_SLAVE_DELAY seconds when the system is idle.
-# (If the system is busy, the multiplexor starts slaves as incoming mail
-# requires attention.)
-# MX_SLAVE_DELAY=3
-
-# The next setting is an absolute limit on slave activation.  The multiplexor
-# will NEVER activate a slave within MX_MIN_SLAVE_DELAY seconds of another.
-# The default of zero means that the multiplexor will activate slaves as
-# quickly as necessary to keep up with incoming mail.
-# MX_MIN_SLAVE_DELAY=0
-
-# Set to yes if you want the multiplexor to log stats in
-# /var/log/mimedefang/stats  The /var/log/mimedefang directory must
-# exist and be writable by the user you're running MIMEDefang as.
-# MX_STATS=no
-
-# Number of slaves reserved for connections from loopback.  Use -1
-# for default behaviour, 0 to allow loopback connections to queue,
-# or >0 to reserve slaves for loopback connections
-LOOPBACK_RESERVED_CONNECTIONS=-1
-
-# Set to yes if you want the stats file flushed after each entry
-# MX_FLUSH_STATS=no
-
-# Set to yes if you want the multiplexor to log stats to syslog
-# MX_STATS_SYSLOG=no
-
-# The socket used by the multiplexor
-# MX_SOCKET=$SPOOLDIR/mimedefang-multiplexor.sock
-
-# Maximum # of requests a process handles
-# MX_REQUESTS=200
-
-# Minimum number of processes to keep.  The default of 0 is probably
-# too low; we suggest 2 instead.
-MX_MINIMUM=2
-
-# Maximum number of processes to run (mail received while this many
-# processes are running is rejected with a temporary failure, so be
-# wary of how many emails you receive at a time).  This applies only
-# if you DO use the multiplexor.  The default value of 2 is probably
-# too low; we suggest 10 instead
-MX_MAXIMUM=10
-
-# Uncomment to log slave status; it will be logged every
-# MX_LOG_SLAVE_STATUS_INTERVAL seconds
-# MX_LOG_SLAVE_STATUS_INTERVAL=30
-
-# Uncomment next line to have busy slaves send status updates to the
-# multiplexor.  NOTE: Consumes one extra file descriptor per slave, plus
-# a bit of CPU time.
-# MX_STATUS_UPDATES=yes
-
-# Limit slave processes' resident-set size to this many kilobytes.  Default
-# is unlimited.
-# MX_MAX_RSS=10000
-
-# Limit total size of slave processes' memory space to this many kilobytes.
-# Default is unlimited.
-# MX_MAX_AS=30000
-
-# If you want to use the "notification" facility, set the appropriate port.
-# See the mimedefang-notify man page for details.
-# MX_NOTIFIER=inet:4567
-
-# Number of seconds a process should be idle before checking for
-# minimum number and killed
-# MX_IDLE=300
-
-# Number of seconds a process is allowed to scan an email before it is
-# considered dead.  The default is 30 seconds; we suggest 600.
-MX_BUSY=600
-
-# Extra sendmail macros to pass.  Actually, you can add any extra
-# mimedefang options here...
-# MD_EXTRA="-a auth_author"
-
-# Multiplexor queue size -- default is 0 (no queueing)
-# MX_QUEUE_SIZE=10
-
-# Multiplexor queue timeout -- default is 30 seconds
-# MX_QUEUE_TIMEOUT=30
-
-# SUBFILTER specifies which filter rules file to use
-# SUBFILTER=/etc/mail/mimedefang-filter
diff --git a/mail-filter/mimedefang/files/mimedefang.init b/mail-filter/mimedefang/files/mimedefang.init
deleted file mode 100644
index efe52c673cb1..000000000000
--- a/mail-filter/mimedefang/files/mimedefang.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/sbin/openrc-run
-#
-# Generic start/stop script for MIMEDefang.  Should work on most
-# flavors of UNIX.
-
-RETVAL=0
-prog='mimedefang'
-PROGDIR=/usr/bin
-SPOOLDIR='/var/spool/MIMEDefang'
-PID="$SPOOLDIR/$prog.pid"
-MXPID="$SPOOLDIR/$prog-multiplexor.pid"
-
-# Make sure required vars are set
-SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock}
-MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock}
-
-depend() {
-	use antivirus
-}
-
-start() {
-	if test -r $PID ; then
-		if kill -0 `cat $PID` > /dev/null 2>&1 ; then
-			echo "mimedefang (`cat $PID`) seems to be running."
-			return 1
-		fi
-	fi
-	if test -r $MXPID ; then
-		if kill -0 `cat $MXPID` > /dev/null 2>&1 ; then
-			echo "mimedefang-multiplexor (`cat $MXPID`) seems to be running."
-		return 1
-		fi
-	fi
-
-	rm -f $MX_SOCKET > /dev/null 2>&1
-	if [ "$MX_EMBED_PERL" = "yes" ] ; then
-		EMBEDFLAG=-E
-	else
-		EMBEDFLAG=""
-	fi
-
-	ebegin "Starting mimedefang-multiplexor"
-	start-stop-daemon --start --quiet \
-		--exec $PROGDIR/$prog-multiplexor -- -p $MXPID \
-		$EMBEDFLAG \
-		`[ -n "$SPOOLDIR" ] && echo "-z $SPOOLDIR"` \
-		`[ -n "$FILTER" ] && echo "-f $FILTER"` \
-		`[ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY"` \
-		`[ -n "$SUBFILTER" ] && echo "-F $SUBFILTER"` \
-		`[ -n "$MX_MINIMUM" ] && echo "-m $MX_MINIMUM"` \
-		`[ -n "$MX_MAXIMUM" ] && echo "-x $MX_MAXIMUM"` \
-		`[ -n "$MX_MAP_SOCKET" ] && echo "-N $MX_MAP_SOCKET"` \
-		`[ -n "$MX_LOG_SLAVE_STATUS_INTERVAL" ] && echo "-L $MX_LOG_SLAVE_STATUS_INTERVAL"` \
-		`[ -n "$MX_USER" ] && echo "-U $MX_USER"` \
-		`[ -n "$MX_IDLE" ] && echo "-i $MX_IDLE"` \
-		`[ -n "$MX_BUSY" ] && echo "-b $MX_BUSY"` \
-		`[ -n "$MX_REQUESTS" ] && echo "-r $MX_REQUESTS"` \
-		`[ -n "$MX_SLAVE_DELAY" ] && echo "-w $MX_SLAVE_DELAY"` \
-		`[ -n "$MX_MIN_SLAVE_DELAY" ] && echo "-W $MX_MIN_SLAVE_DELAY"` \
-		`[ -n "$MX_MAX_RSS" ] && echo "-R $MX_MAX_RSS"` \
-		`[ -n "$MX_MAX_AS" ] && echo "-M $MX_MAX_AS"` \
-		`[ "$MX_LOG" = "yes" ] && echo "-l"` \
-		`[ "$MX_STATS" = "yes" ] && echo "-t /var/log/mimedefang/stats"` \
-		`[ "$MX_STATS" = "yes" -a "$MX_FLUSH_STATS" = "yes" ] && echo "-u"` \
-		`[ "$MX_STATS_SYSLOG" = "yes" ] && echo "-T"` \
-		`[ "$MX_STATUS_UPDATES" = "yes" ] && echo "-Z"` \
-		`[ -n "$MX_QUEUE_SIZE" ] && echo "-q $MX_QUEUE_SIZE"` \
-		`[ -n "$MX_QUEUE_TIMEOUT" ] && echo "-Q $MX_QUEUE_TIMEOUT"` \
-		`[ -n "$MX_NOTIFIER" ] && echo "-O $MX_NOTIFIER"` \
-		-s $MX_SOCKET
-	eend $? "Failed to start mimedefang-multiplexor"
-
-	# Start mimedefang
-	rm -f $SOCKET > /dev/null 2>&1
-	ebegin "Starting mimedefang"
-	start-stop-daemon --start --quiet \
-		--exec $PROGDIR/$prog -- -P $PID \
-		-R $LOOPBACK_RESERVED_CONNECTIONS \
-		-m $MX_SOCKET \
-		`[ -n "$SPOOLDIR" ] && echo "-z $SPOOLDIR"` \
-		`[ -n "$MX_USER" ] && echo "-U $MX_USER"` \
-		`[ -n "$SYSLOG_FACILITY" ] && echo "-S $SYSLOG_FACILITY"` \
-		`[ "$MX_RELAY_CHECK" = "yes" ] && echo "-r"` \
-		`[ "$MX_HELO_CHECK" = "yes" ] && echo "-H"` \
-		`[ "$MX_SENDER_CHECK" = "yes" ] && echo "-s"` \
-		`[ "$MX_RECIPIENT_CHECK" = "yes" ] && echo "-t"` \
-		`[ "$KEEP_FAILED_DIRECTORIES" = "yes" ] && echo "-k"` \
-		`[ "$MD_EXTRA" != "" ] && echo $MD_EXTRA` \
-		`[ "$ALLOW_NEW_CONNECTIONS_TO_QUEUE" = "yes" ] && echo "-q"` \
-		-p $SOCKET
-	eend $? "Failed to start mimedefang"
-}
-
-stop() {
-	ebegin "Stopping mimedefang"
-	start-stop-daemon --stop --quiet --pidfile $PID
-	eend $? "Failed to stop mimedefang"
-
-	ebegin "Stopping mimedefang-multiplexor"
-	start-stop-daemon --stop --quiet --pidfile $MXPID
-	eend $? "Failed to stop mimedefang-multiplexor"
-}
diff --git a/mail-filter/mimedefang/metadata.xml b/mail-filter/mimedefang/metadata.xml
deleted file mode 100644
index 812025210606..000000000000
--- a/mail-filter/mimedefang/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>A program for Milter supported mail servers that implements antispam, antivirus and other customizable filtering on email messages</longdescription>
-<use>
-	<flag name="poll">Use poll instead of select</flag>
-</use>
-</pkgmetadata>
diff --git a/mail-filter/mimedefang/mimedefang-2.73.ebuild b/mail-filter/mimedefang/mimedefang-2.73.ebuild
deleted file mode 100644
index c87ab3177048..000000000000
--- a/mail-filter/mimedefang/mimedefang-2.73.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
-HOMEPAGE="http://www.mimedefang.org/"
-SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clamav +poll"
-
-DEPEND=">=dev-perl/MIME-tools-5.412
-	dev-perl/IO-stringy
-	virtual/perl-MIME-Base64
-	dev-perl/Digest-SHA1
-	clamav? ( app-antivirus/clamav )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup defang
-	enewuser defang -1 -1 -1 defang
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.72-ldflags.patch
-}
-
-src_configure() {
-	econf \
-		--with-user=defang \
-		$(use_enable poll) \
-		$(use_enable clamav) \
-		$(use_enable clamav clamd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_STRIP_FLAG="" install
-
-	fowners defang:defang /etc/mail/mimedefang-filter
-	fperms 644 /etc/mail/mimedefang-filter
-	insinto /etc/mail/
-	insopts -m 644
-	newins "${S}"/SpamAssassin/spamassassin.cf sa-mimedefang.cf
-
-	keepdir /var/spool/{MD-Quarantine,MIMEDefang}
-	fowners defang:defang /var/spool/{MD-Quarantine,MIMEDefang}
-	fperms 700 /var/spool/{MD-Quarantine,MIMEDefang}
-
-	dodir /var/log/mimedefang
-	keepdir /var/log/mimedefang
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/mail-filter/mimedefang/mimedefang-2.74.ebuild b/mail-filter/mimedefang/mimedefang-2.74.ebuild
deleted file mode 100644
index 24f01e24f08f..000000000000
--- a/mail-filter/mimedefang/mimedefang-2.74.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
-HOMEPAGE="http://www.mimedefang.org/"
-SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clamav +poll"
-
-DEPEND=">=dev-perl/MIME-tools-5.412
-	dev-perl/IO-stringy
-	virtual/perl-MIME-Base64
-	dev-perl/Digest-SHA1
-	clamav? ( app-antivirus/clamav )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup defang
-	enewuser defang -1 -1 -1 defang
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.72-ldflags.patch
-}
-
-src_configure() {
-	econf \
-		--with-user=defang \
-		$(use_enable poll) \
-		$(use_enable clamav) \
-		$(use_enable clamav clamd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_STRIP_FLAG="" install
-
-	fowners defang:defang /etc/mail/mimedefang-filter
-	fperms 644 /etc/mail/mimedefang-filter
-	insinto /etc/mail/
-	insopts -m 644
-	newins "${S}"/SpamAssassin/spamassassin.cf sa-mimedefang.cf
-
-	keepdir /var/spool/{MD-Quarantine,MIMEDefang}
-	fowners defang:defang /var/spool/{MD-Quarantine,MIMEDefang}
-	fperms 700 /var/spool/{MD-Quarantine,MIMEDefang}
-
-	keepdir /var/log/mimedefang
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	dodoc -r examples
-}
diff --git a/mail-filter/mimedefang/mimedefang-2.75.ebuild b/mail-filter/mimedefang/mimedefang-2.75.ebuild
deleted file mode 100644
index fe9400a104bc..000000000000
--- a/mail-filter/mimedefang/mimedefang-2.75.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
-HOMEPAGE="http://www.mimedefang.org/"
-SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clamav +poll"
-
-DEPEND=">=dev-perl/MIME-tools-5.412
-	dev-perl/IO-stringy
-	virtual/perl-MIME-Base64
-	dev-perl/Digest-SHA1
-	clamav? ( app-antivirus/clamav )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup defang
-	enewuser defang -1 -1 -1 defang
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.72-ldflags.patch
-}
-
-src_configure() {
-	econf \
-		--with-user=defang \
-		$(use_enable poll) \
-		$(use_enable clamav) \
-		$(use_enable clamav clamd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_STRIP_FLAG="" install
-
-	fowners defang:defang /etc/mail/mimedefang-filter
-	fperms 644 /etc/mail/mimedefang-filter
-	insinto /etc/mail/
-	insopts -m 644
-	newins "${S}"/SpamAssassin/spamassassin.cf sa-mimedefang.cf
-
-	keepdir /var/spool/{MD-Quarantine,MIMEDefang}
-	fowners defang:defang /var/spool/{MD-Quarantine,MIMEDefang}
-	fperms 700 /var/spool/{MD-Quarantine,MIMEDefang}
-
-	keepdir /var/log/mimedefang
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	dodoc -r examples
-}
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index f0b522471cd3..170f3c2934ac 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -8,6 +8,6 @@ AUX opendkim.init.r5 2200 BLAKE2B d617879b128d5de97cc7239865400ea0d12e438c5f13ac
 AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47ae67533a94c67371aa12963c347361056939cc18492612f067102eca09166de6aa83d1b0541d4a8e6 SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834
 AUX opendkim.service.conf 60 BLAKE2B 797a3947c9c984378955701252cc9d956c8398f1bba7696e7d5c052dd8103355dbf147ac05ae5b7f372867f2b330aaaf160e83709e440a9fc942e9069dbe7c2e SHA512 635e474464f81abe8444030b3cdc6e747298fc463bd02e4292e914ad622761f354b92921cd380387c8e9272435e1660de1a1cf8dbe34ded870e728ecc9e00246
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
-EBUILD opendkim-2.10.3-r13.ebuild 7406 BLAKE2B faf1df82130ec9edeaff68c11b5dc2619b206af3001d5142083189c58bb6e73cac66785cc0ed983a0ddb194dd0a9cfb211e5f19ea3fb4333e35254fad4756161 SHA512 cd67d66da191109f40089bcbc0c9d959ce762003d1d773febb30bb3ee44f5e211eb2637cc40481d742a5ebfd626a0bf61a1a5f60ee87985bdce2cab00048b9fc
+EBUILD opendkim-2.10.3-r15.ebuild 7370 BLAKE2B 4dece98e2599700b5a3add3cf3ec0ea6430c6b07be798f051cd45b2ab9f8b9b74cb1c7a643d55e54982097ed9c78260e945587f07b881fdbb2320678bff00a5a SHA512 e7caccb36dc6bc5a7b046d9c8fb56cf4606657026c5ffc91dbfb7ce043631bf87168fd8f8278141296573d3e7e3ecebe91ce871d504dc4b49ca170737d194f76
 EBUILD opendkim-2.10.3-r8.ebuild 7233 BLAKE2B 81c780d136560365a2a4eebf31901448cadec91616388ab9851c0bbd24dfff965c517cec5af73fd3adc4507708aba1c24d13d8905f7e5499c09ef4e6751171ee SHA512 385e2da6c53900a98f35a9839007f5dd7caa65fb9138599e1ced1639759fbb674223ecd2ccf8bddd4341334934440476112b07f280efabf345af8e0b77098815
 MISC metadata.xml 1988 BLAKE2B 14cc3bed4822cd17ff675b16aba8a973476b78da8fcd73953ecc419778498c7d8e2b6837c7bacf7a0221086ec740ffbac6900cfb8d50143f995c6f8ddcb72752 SHA512 dea34aca15c223d2195de689333b98c23abb18830a64f73e602405d36b5ca7f46b065533f116307075ab2d01570e52e8352a394efae39a6e5d1af51c56b91543
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r15.ebuild
index 037a1b0f98cd..2a84537cc6a6 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r13.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r15.ebuild
@@ -68,9 +68,7 @@ src_configure() {
 	local myconf=()
 	if use berkdb ; then
 		myconf+=(
-			$(db_includedir)
-			--with-db-incdir=${myconf#-I}
-			--enable-popauth
+			--with-db-incdir=$(db_includedir)
 			--enable-query_cache
 			--enable-stats
 		)