gentoo resync : 03.03.2019

16 files changed, 81 insertions, 588 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 12f15b6bb25f..3df0724fec18 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 8278f8a4787b..0ed9b4df30f2 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,15 +1,9 @@
-AUX amavis-mc.initd 384 BLAKE2B bc481913a052855add95b0149177754e95742bcafe70b3e44699b2765126d401bb6d406ca09f2252f768b2b8354209fdb35fb9d5c64f6749c83c1d5ca1e52767 SHA512 96bb67ce2088c2c4b3187d55040db4ef9f281506a368ceca54df3b90d3e9c6e8c8be96c8010c581c7b2fc75e8439892db800b361da75ed9549a89d94cf7d95df
 AUX amavis-mc.initd-r1 492 BLAKE2B b2bafdecd2d57ca52216154def014596f31670300510b0d2d049a4790ee3cc5a29c339ca8b7bb27503d0671b028d9da7d1ddadc662cabae18cac2a659ce2b676 SHA512 66d6364e12a0e71184682bfd35bdd1004c0cd6ee634936da8888b49f21d6c506e0645eabf8ae53ca08dccd9081f9753d63951258ccee8abd9fabf7d28233c533
 AUX amavisd-2.11.0-dkim.patch 428 BLAKE2B f9c1bcab637febaf0546f204db0260cb7dc6bc35e27092545f99fb13cb2de27638a3cb04177de6dcb406c216a1168f44141e477f460eced830ba4376581005af SHA512 85628ad2b9c1cde478b579865d414fb941798aafe8968d26af5ef9dddf0f9ec4a3ed1e2077a46ee0632a9ce9be159ad9696badad35a1117cb7437c2ab0c4a973
 AUX amavisd-snmp-subagent-zmq.initd 911 BLAKE2B 7cb247978f70d1b7468919b1df3f2e147b4ca48c6748401c6621d1db7b326981b513b0f02fce582052fdf6a0d5e8b6d55cab52198e262a673802626769050edd SHA512 846ed4622417657f7bc3dc5fa5d9b361dddfe7a13753dab7e8b2328a09dc9c21800c4cd990bc5dc466945ef857861413b8e5a8e726a40f0fa1831c509755e60b
 AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e
-AUX amavisd-snmp.initd 692 BLAKE2B b47671b5e8962a151cda0369bf13eba302e37e2f014fddff63f1a1d706868cd14d82c9141a79f8d123fb50cd95251f45407a6bb884398899e456dcf972bc37d0 SHA512 0e8513f7bfb03ae6d28190edd0f4f59b87f81b412b68dcfa3c91d77fd138d4e92ff6b36864bb590d214c08d9f73ec5de694e5fbc1b7e1d27ae0e532f052e3910
-AUX amavisd.initd-r1 710 BLAKE2B 46d484e167e45f5a5772373a4d636727ceda2feecf2e6260c737d513f1d7fb563b069c5e79a28459a6c75fd382cf106a260bd4d94c7b0c76bfca7dbf74ac30ef SHA512 0c45276d4b487c9550b36a56e1e296a401fb46985dafe1227bf70ec840fc4a255e959026ef31dffbd0719ebbcec064619e096602ab32da2b95776030772878de
 AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
-AUX amavisd.service 459 BLAKE2B 66648cbc40345ae57c5934dc5377c7c1fb6220c591904dce8685123772ef3ecff2827105dcd0b52336700a0e16f593480446991690f27cf6a8a3714ed593fb7e SHA512 6f196484fc546e16f319abfcd171a68826da35813cc477a572c79594b0bb5e0f8f61370dba30af690be6d064e48f07139b6b0b7f6024dbbfb820547d8bc6998e
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
-DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
-EBUILD amavisd-new-2.11.0-r3.ebuild 4605 BLAKE2B 5e08b390567ea546fa4bb7ab8371dabcef91cb0c39d2ff87cfab4580f2f878c3a066f4d607fb57f214c9b4e837c079ecce80157662df805768f2f1e3db33e469 SHA512 0e349d6bf27c0492688b3715270dcc4e49d2ce2b2050a08d7f8b8854981752efa32361c661982e3eec083efb571a0fa831cba6d040f9799d1facee4b59fa893a
 EBUILD amavisd-new-2.11.1-r3.ebuild 5198 BLAKE2B 457f30c228dc83915c5862178e1f7d8320f111f1b4c236b8f9a3cc6dbc7e7e5098b0bd136d54f16f2fad15c4442ee477bdd09ba86a2e6ab172cdc8453f746ff1 SHA512 079de83758024ea385e85565d893b16aad985ed8aec45e9348b86793a1f9c9f2af05454dc15f6ddda16df35f50333a23ffce184cf0460a7d243773c145d30bb0
 MISC metadata.xml 845 BLAKE2B 5ea031bb47ac8f1ca3cb703ed6e6bcd94fa63ea275874c616e3c24c5802f0f2f4b2443b379b62e708eb6ea075a0950116722319cc08023b20d7152cbabce512e SHA512 4409524d4819357253b63c143f0aa4b760ffe0b4ed22d30d28632f86ee2731c7e84a95131016a21ab43a63c32ea35cfbe741010a07f45e8d21fe05f020387228
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
deleted file mode 100644
index 7ccaa3f1f4dd..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-MY_P="${P/_/-}"
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://www.ijs.si/software/amavisd/"
-SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
-PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.10.0"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/Net-Server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	virtual/perl-IO-Socket-IP
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	dev-perl/Net-LibIDN
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/perl-File-Temp
-	dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	virtual/mta
-	clamav? ( app-antivirus/clamav )
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-	eapply_user
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
-
-	systemd_dounit "${FILESDIR}/amavisd.service"
-	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dodoc -r README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		insopts -o root -g root -m 644
-		newins LDAP.schema ${PN}.schema || die
-	fi
-}
-
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-	if use razor ; then
-		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd b/mail-filter/amavisd-new/files/amavis-mc.initd
deleted file mode 100644
index 84658da9a4e2..000000000000
--- a/mail-filter/amavisd-new/files/amavis-mc.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/amavis/amavis-mc.pid"
-command="/usr/sbin/amavis-mc"
-command_args="${amavis_mc_args} -P ${pidfile}"
-start_stop_daemon_args="--interpreted"
-
-depend() {
-	use logger
-	before amavisd-new snmpd
-}
-
-start_pre() {
-	checkpath -d -o amavis /run/amavis
-}
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp.initd b/mail-filter/amavisd-new/files/amavisd-snmp.initd
deleted file mode 100644
index fc23a1fc1019..000000000000
--- a/mail-filter/amavisd-new/files/amavisd-snmp.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="amavisd-snmp"
-pidfile="/run/amavis/${name}.pid"
-command="/usr/sbin/${name}-subagent"
-command_args="${amavis_snmp_args} -P ${pidfile}"
-start_stop_daemon_args="--interpreted"
-
-update_command() {
-	if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then
-		command="${command}-zmq"
-	elif [[ $amavisd_snmp_command ]]; then
-		command="$amavisd_snmp_command"
-	fi
-}
-
-depend() {
-	use logger
-	before amavisd-new snmpd
-	update_command
-	if [[ ${command##*-} == "zmq" ]]; then
-		need amavis-mc
-	fi
-}
-
-start_pre() {
-	update_command
-	checkpath -d -o amavis /run/amavis
-}
diff --git a/mail-filter/amavisd-new/files/amavisd.initd-r1 b/mail-filter/amavisd-new/files/amavisd.initd-r1
deleted file mode 100644
index d772433aa418..000000000000
--- a/mail-filter/amavisd-new/files/amavisd.initd-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-extra_commands="debug debug_sa"
-
-prog="/usr/sbin/amavisd"
-progname="amavisd-new"
-
-depend() {
-	use net logger antivirus snmpd
-	before mta
-}
-
-start() {
-	ebegin "Starting ${progname}"
-	"${prog}" start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${progname}"
-	"${prog}" stop 1>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${progname}"
-	"${prog}" reload 1>/dev/null
-	eend $?
-}
-
-debug() {
-	ebegin "Starting ${progname} in debug mode"
-	"${prog}" debug
-	eend $?
-}
-
-debug_sa() {
-	ebegin "Starting ${progname} in debug-sa mode"
-	"${prog}" debug-sa
-	eend $?
-}
diff --git a/mail-filter/amavisd-new/files/amavisd.service b/mail-filter/amavisd-new/files/amavisd.service
deleted file mode 100644
index c53c38ac1632..000000000000
--- a/mail-filter/amavisd-new/files/amavisd.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Amavisd Daemon
-Wants=postfix.service
-Wants=spamassassin.service
-Wants=clamd.service
-After=network.target
-
-[Service]
-User=amavis
-Group=amavis
-ExecStart=/usr/sbin/amavisd -c /etc/amavisd.conf foreground
-ExecReload=/usr/sbin/amavisd -c /etc/amavisd.conf reload
-PrivateTmp=true
-CapabilityBoundingSet=
-ProtectSystem=full
-NoNewPrivileges=true
-PrivateDevices=true
-ProtectHome=true
-MemoryDenyWriteExecute=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 2588a6a04a2d..6d6b22da8b3c 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,8 +1,10 @@
 DIST imapfilter-2.5.4.tar.gz 52585 BLAKE2B c23ace9d5c4642ea7455406886dc0a045bb954d6edfa92e9c14b08b9f4500a1b9b3d566b3fef0967a920766f200d30bd8810f18ad6584e27177845243bcf4140 SHA512 33d8cc822a4ccd02ede6df7f30b5d2893088b352b9d1900df6597fd6443ae51ceb9ff22cd0100f9ec9e28dc84ac294bb717e0a85c4670677dfb09b5e5da76915
 DIST imapfilter-2.5.6.tar.gz 53579 BLAKE2B a62900f29d6a1056985e41e4ba4d36c193ef2cbe44c870f2e6b5d2fe012320c5d872605f579149b1e5b4ba2f96ebc823f8a5e7df795b29415fe76ca8388a381e SHA512 98bca5cea00cdbbd0bcb3b98c381ae75ec43a3b6651a171cce47df38948d6d7f043f5bd6f42c8f9e30297db17f5d542bb0174dfbd46fc83d25cb5ea6e60d962c
 DIST imapfilter-2.5.7.tar.gz 54861 BLAKE2B 24c8fdd32c946cd446fa8fc0aa6bc855c82ddb7cabacae6537b98a4a02a39531d74d5137893f1718fa031de73debe04778f54540c4130877d1e9300022db4121 SHA512 9297e98812312fbf2c92aa5477bdfecb522048e45b4bc4922e312bd89a72b020a98f5547e3f0882ae665c24db21e6995eda839b762947adc48bc413ab0c882f1
+DIST imapfilter-2.6.12.tar.gz 59249 BLAKE2B 5d828bfb7680feee0787741e48a5e61fde33b41dd0e0034f7d91b3b8865704f5acd3766e00c277c37b1276204ebb356c459ac5ea626dbee58af0e2b07777f918 SHA512 1425041c288ac46833af6119fd0169cf783a1fec61bf07dfad6f732ec74834ec3beb4e81c3b19f7436310324d9a4369c4ec61aa3a83eef203d7897ea0fc26528
 EBUILD imapfilter-2.5.4.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
 EBUILD imapfilter-2.5.6.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
 EBUILD imapfilter-2.5.7-r1.ebuild 877 BLAKE2B df18f8c5ebee719cc1c858d6d1a46eedc063acd013f00929f5e28789f3c055fc6179494e8b2b15a113ab9aa37e58c6405c3ca232fdc38a340013678ff7a8c10e SHA512 690908c780a1a8c6cfd2515623ea495a23e0c62a305f83a53f82ff54951aeff5c792a80232d15ce1fe4c1166f8ccdf4168aeef8066798734a8879d58ac487d54
 EBUILD imapfilter-2.5.7.ebuild 810 BLAKE2B 6497e07d3def2c187cb91678444b5f4a510363dda35fef39fc7d1632a458ecf88bf98fe3bc2d8da3aef64f811d18bb0f578c749c1e27e61bd532752456421735 SHA512 c597b163d3e81ce0a468cde8eb8448bad789053bf5b935df035d55c964b1f67145f5befde51bd01b8821a07a36c06097b771435728df7b3e8bd3da5327afd9f6
+EBUILD imapfilter-2.6.12.ebuild 898 BLAKE2B ccf32725cf7a31769523eadf3da76700e7e7df38bfc932babe1bc67566c7b1d13d72dfa521333a5c489166ae0b49e0fdc5e477d8e7f823d5b955ac9fe906ca88 SHA512 75ea1168731120ebbcb315d9af068afb54137fcf0056aadff3725500cb8a42e76e6a8b0e6cf275bb12a2147eab0f2a6f8bfb0aa10ada2581f6a0e282b44f05d6
 MISC metadata.xml 326 BLAKE2B 543654a3c3b9467c7cfb7bffc75022a9d37256e98cdcb57e6bf6f6249ba26caad17d1bfa4d1e58921ebc3947011e4c9f994477ba1105cef2bab2a5a26b503f81 SHA512 6165c1ddbb6368df4efcb1eae82e454df078865810366c7f62dabd3c84eb426f18208b49cc02d54acc9961e7ff4a0d4b825b720386d80122662b1ed98ecfd936
diff --git a/mail-filter/imapfilter/imapfilter-2.6.12.ebuild b/mail-filter/imapfilter/imapfilter-2.6.12.ebuild
new file mode 100644
index 000000000000..396bcc311fe9
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.6.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="https://github.com/lefcha/imapfilter"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libpcre
+	dev-lang/lua:*"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+src_prepare() {
+	default
+	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^MANDIR/s:man:share/man:" \
+		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+		-e "/^CFLAGS/s/-O//" \
+		src/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest
index df7c748d8869..50aac6dc608f 100644
--- a/mail-filter/pypolicyd-spf/Manifest
+++ b/mail-filter/pypolicyd-spf/Manifest
@@ -1,5 +1,5 @@
 DIST pypolicyd-spf-2.0.1.tar.gz 38086 BLAKE2B 70d13722000548eac9bb9a6ff80913e88b18227f1a90b864e4fc7749b8e0886e56fff6694d514ed0becb32ca129023cb9e66af3f33a4d4390c8c8c05affa1fb6 SHA512 85f51491ab1f44e197dbf9a15f9e723ba3aaf0472d9d1653595490d7211670a67cdca5699111ab5a29f9d919cd935ed58d8d70bd1312a4f0f90da4ef26a50509
 DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673
 EBUILD pypolicyd-spf-2.0.1.ebuild 1229 BLAKE2B 55192ce4b93e9517464a346e54116aee1fea7e3dd320d96b7a5701c6b2803f4420851552d7bb5c8776278f037c1f15d2aa854a5cffa0fa6693d372db0fde3bac SHA512 564469702551ba214455b51385810e2149848ca15ab55b646e2a4c4195efd0be387f504bf6c1e640dbf0428876f14149b77c8ee797098a697fae1c99d6743a35
-EBUILD pypolicyd-spf-2.0.2.ebuild 1223 BLAKE2B 20479d4c2d06411769111ada8525d13c0b382b5dd06ec6b652ef8966fac9118cf5efa2c56bc32ff561a43ba09524508bd5e9691eeacd1bcbbbc1052c655a1955 SHA512 d96db6c5673798ced4374e01724b94c2ca77bcbbfaa7d8e9e08b262e0ee05a6325a7758cc5811a174de6e7dfd91c7be2f1e8137adde6baae4ecb9e4e4ba985c9
+EBUILD pypolicyd-spf-2.0.2.ebuild 1218 BLAKE2B e0207c016b88c2a2355a48c5b4fccd44f1aebbf2582709b562ac6aad1b430b7fb1664924d1bb87b185665f106d437f649ac46ac6cd19c0b18e3d2903fb7d272d SHA512 0b99240593c33485576d3e93f861226302f815acc502e69cedb5823c210f2509cb28dd4cdd5bcaaf376f7adb7144a2fb70d4ae537c6da3a837e5a04eb845a495
 MISC metadata.xml 356 BLAKE2B e28aba8830da5e0c372cc7090736a5a90c208af79c6fe338e8bf96ef79e17afa05cdabdb48ca172d57fd34203c66ff7e3be4ce4c043b14c0e9694639512a82f3 SHA512 67a8fd46090c3e558e7bf963277e99e11be4d2df97f4a4491a7fbc64a42f89e19af2131d13efec7370df1f27b2eb7385f59e732fae57b6ec67c47f18af8cfc72
diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
index d5169e8a55a5..f5bb05b2fbd4 100644
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
+++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pyspf[${PYTHON_USEDEP}]"
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 499204821bca..34e5da0e7447 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,8 @@
 AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e0110994dac66bfccb4ee1d84c9c50e6c2fd6649b09b7206e16120ed7e55b387ba76afdf0fe7e629bc767d87a80c SHA512 b2233d9330fa06d13dc8d222fa16198a1f81dcb9c87ca93961db54d9f2514cdabd824d0f25c0cca678495f271f48f601ee14363c2a2f833100facae307226beb
 AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02
 AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72def5b3e168f235afc16a1dc34afa0e839ffa9da6c0c360c9a93a126d9dd711b4473e0a19ebcc SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb
+AUX spamassassin-3.4.2-bug_7623_p1.patch 599 BLAKE2B 620cd321761d0c87aa4e064b4576f2e1909c3cc9835861e351f35997f0fc0543ecbb0d8509ab5d61ff4901a5ec0f3068d7089dec8800dfa6d25e54be4b81bc9e SHA512 4bf3d4fcfe50ee5a4c1b7357bc6f014cfe46c419a30a5c3ebe26415b700260f5f82f89ce39044b32f799c7b8614a5baaf5db54de5599e14fcc64e45c5c75d2a8
+AUX spamassassin-3.4.2-bug_7623_p2.patch 742 BLAKE2B c3011fc1edd2b399b4cc9a4cfb518b197aa96ee0e58a6605934a88aa5e56c669791d591db365673ecf820e943e6728abab9734492f6fb3abb6cff194786c6fe9 SHA512 b17df1f5b332895976ab00553d6b1c85b8576fb688f20fd3485531ab897263e31d4adcb47afa5f1f2bf5b7aca91d70de6097bac740ddd8c56b2b0d6777c3d0f4
 AUX spamassassin-3.4.2-bug_7631.patch 2022 BLAKE2B 33b67b585fdb2ce82b6e64856463714e014f8e6ae69671a70f0a8c0952450c888e9e42cd4cebe0d57cf6552d30ae50214757c0192f61601294b4e11c39537832 SHA512 f23c7f9d821ef9d24f716f56016ce3bb1b29fabd177ad7ce3f8b6728601fcfb22d2c8aad82f36b978f3343bc18a514e1e85ce7c5b207ffd732c2921cf4909353
 AUX spamassassin-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
@@ -8,6 +10,5 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
 EBUILD spamassassin-3.4.2-r2.ebuild 7607 BLAKE2B c1232716b004a956480f5bc87f4ff1266471424302f17836bb34922e81d2815a97c12e4a204c0444b89180c0254dcd9b7f8e8f093d366c55274da9bf2836c97b SHA512 2b3bbad6b186b9af4dc17a5c664120e6a413fbf885f6ed91530653c88b2a9b2046dc0563a5f3dbe81492abe3dab4b55235e9b5c7caee5eb201cfdfd9c0ed41ed
-EBUILD spamassassin-3.4.2-r3.ebuild 8559 BLAKE2B 0657529ee4324147998e4b6ee935cebe63b20643abc3a7fdc321370ff9343a44b1d97e6d7073dc568e35fde983b0734d363f81599c423ac35546592b8b1be984 SHA512 b8ad6679c0928e174c8c0f446af91f2dbb8e40e5dd48fab6299aa3d68ef29d6e597d5656a50a7875b15cbc4c1029720950af994b0a0c1e98a4c2e46ed531d04a
-EBUILD spamassassin-3.4.2-r4.ebuild 8582 BLAKE2B f9dc4a124e16259d75a304f181109891c55e715fcacf004d83f94907d54c5221f6444021c91f7c8e2754b5a87000fa0c732685c959a658f239ba57d6bb23b779 SHA512 4ca9334c68447aaede7a9946d5354989ea1dbbe1eacbc88ee9dd3ee0ddbd558baa588a77fdb4f900fbb5dca7977f4fef680e10576e31ce81e8f14f9f61637ff0
+EBUILD spamassassin-3.4.2-r5.ebuild 8686 BLAKE2B 64d562d875653d12b98267481c21487d6a8405cdad169c8f264f2595927512710c5d50faf282d97cf89360c4ee3cd45aad5f875932685b4bb05469c04e5319b5 SHA512 59c195e05533d8e6280e606d4f7a292739f8fccca33b7345ce3ac4c754d026cae25d63779d359da735b3dc10b75b4377098ee0be9b15e6c40ba1512ce1341809
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch
new file mode 100644
index 000000000000..d0fe21bf9ef9
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/677250
+Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623
+
+--- a/sa-update.raw	2018/09/29 09:33:52	1842302
++++ b/sa-update.raw	2018/09/29 09:41:24	1842303
+@@ -1659,6 +1659,7 @@
+     my($a_rr, $aaaa_rr);
+       # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+     $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
++    $mirror =~ s{[:/].*}{}s;  # strip all starting from :port or /path
+     return 1 if $have_inet4 && do_dns_query($mirror, "A");
+     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
+     return 0;
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch
new file mode 100644
index 000000000000..26d921a6e676
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch
@@ -0,0 +1,15 @@
+Bug: https://bugs.gentoo.org/677250
+Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623
+
+--- a/sa-update.raw	2018/09/29 10:16:29	1842320
++++ b/sa-update.raw	2018/09/29 10:20:26	1842321
+@@ -1659,6 +1659,9 @@
+     my($a_rr, $aaaa_rr);
+       # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+     $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
++    # No DNS check needed for IPv4 or IPv6 address literal
++    return 1 if $mirror =~ m{^\d+\.\d+\.\d+\.\d+(?:[:/]|$)};
++    return 1 if $mirror =~ m{^\[};
+     $mirror =~ s{[:/].*}{}s;  # strip all starting from :port or /path
+     return 1 if $have_inet4 && do_dns_query($mirror, "A");
+     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r3.ebuild
deleted file mode 100644
index e1fd17004951..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r3.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user eapi7-ver
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/spamassassin-3.4.2-bug_7631.patch"
-	"${FILESDIR}/spamassassin-3.4.2-bug_7632.patch"
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-
-	# Upstream bug 7622: this thing needs network access but doesn't
-	# respect the 'run_net_tests' setting.
-	perl_rm_files t/urilocalbl_geoip.t \
-		|| die 'failed to remove urilocalbl_geoip tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-
-	if use mysql || use postgres ; then
-		local _awlwarn=0
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${_v}" -gt "3.4.2-r3"; then
-				_awlwarn=1
-			fi
-		done
-		if [[ ${_awlwarn} == 1 ]] ; then
-			ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
-			ewarn 'You will need to manually ALTER your tables for them to'
-			ewarn 'continue working.  See the UPGRADE documentation for'
-			ewarn 'details.'
-			ewarn
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	if use mysql || use postgres ; then
-		local _v
-		for _v in ${REPLACING_VERSIONS}; do
-			if ver_test "${_v}" -lt "3.4.2-r3"; then
-				ewarn
-				ewarn 'If you used AWL before 3.4.2, the SQL schema has changed.'
-				ewarn 'You will need to manually ALTER your tables for them to'
-				ewarn 'continue working.  See the UPGRADE documentation for'
-				ewarn 'details.'
-				ewarn
-
-				# show this only once
-				break
-			fi
-		done
-	fi
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild
index 46de7f1fb3fd..2162b9ce2b61 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r5.ebuild
@@ -81,6 +81,8 @@ RDEPEND="${REQDEPEND} ${OPTDEPEND}"
 PATCHES=(
 	"${FILESDIR}/spamassassin-3.4.2-bug_7631.patch"
 	"${FILESDIR}/spamassassin-3.4.2-bug_7632.patch"
+	"${FILESDIR}/spamassassin-3.4.2-bug_7623_p1.patch"
+	"${FILESDIR}/spamassassin-3.4.2-bug_7623_p2.patch"
 )
 
 src_prepare() {