gentoo resync : 15.01.2020

24 files changed, 584 insertions, 252 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 630f5e97171a..5096a950c96b 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index f6549a1b1aa5..2cd73e92cffc 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,5 @@
 DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
 DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
-EBUILD afew-1.2.0.ebuild 825 BLAKE2B c2422af2db6930bfe25bd5cffb8c909dc5664a6b1d46902abe70e69c73ea6c0608d899b8549c5a40561fe0a6fc0945f0ee8dfcf02bc95b422f58e010d7979859 SHA512 ab2ec9c90871c429b7afc4ed23e13f8f635d503dc6e66b2f1d1d7c21dd75746fbead5b8bd8622d0172049cce711ea86ac1b3c35aa3bb28a0ecd15ae71878e9ec
-EBUILD afew-1.3.0.ebuild 868 BLAKE2B dc951c0038c316b24af86717973235a3115918ccf23f075d2125f799d783c98668343a1d836fca48bab11eb15d5ac532e97073e56ec9325424b155e95a3c6a77 SHA512 d12ddb330910e2619febd677109acd9b6d4103fdf5fb4f9a303ce0fac084a57d10148225677cbe2f5ac17998588ce0c63d10d6446080d45e08024c4847cbfa83
+EBUILD afew-1.2.0.ebuild 819 BLAKE2B e4069a671885f99dd0cfbbf69b90dc7284fe10e1097adb9dbf81583eb1b0de4f4f7c1e16664be26684be169f217ced401619159883e4853f4d7709389782ed63 SHA512 fa6038475ce14ea46b66523d8676147d6ebffa3c264830ea75816232f13b5be19f7ae83ca7ba634fbefaa543c770207b321de1e830ef860a46cb64e2049649f2
+EBUILD afew-1.3.0.ebuild 864 BLAKE2B 0f78c19218a8a1c30492be0a1bac3cd8c20afa3f194c03057a8f3191c8da3469d8ae95f9e0666a18aa89904d229ed930c6f0b2a98cfba1d286587f64e5f114d1 SHA512 2d41afc265e7ba4f62549851d3cd7b39192fa488270aafc7378a654f1b1e482e7b9f91f346e3c73e244d5b1efa5fcd97f748fac263e68a993cfbe614c52e11ce
 MISC metadata.xml 883 BLAKE2B 64c438e53564d21a25684eb8b8bcf6b5a9e53a79202a27eb43a7621669c716f5af96cec95ee616c5ef3d1be91433c523badb16cb1c6363ebb9574066b2d65833 SHA512 5f799a3db42139165f32075a9f753cdc2f11072c067e5602bc37f557b6edfc8c631a8ea9c512e492587224b287f2d996e38a4e690fe294e508f7b9568b6f15e7
diff --git a/mail-filter/afew/afew-1.2.0.ebuild b/mail-filter/afew/afew-1.2.0.ebuild
index 7a4d43ab559b..064cd5191335 100644
--- a/mail-filter/afew/afew-1.2.0.ebuild
+++ b/mail-filter/afew/afew-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/mail-filter/afew/afew-1.3.0.ebuild b/mail-filter/afew/afew-1.3.0.ebuild
index dd77ae4b9249..ea538391bf69 100644
--- a/mail-filter/afew/afew-1.3.0.ebuild
+++ b/mail-filter/afew/afew-1.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 105b146eadcc..b6f86c7d175c 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -6,6 +6,6 @@ AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a8650
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
-EBUILD amavisd-new-2.11.1-r3.ebuild 5198 BLAKE2B 457f30c228dc83915c5862178e1f7d8320f111f1b4c236b8f9a3cc6dbc7e7e5098b0bd136d54f16f2fad15c4442ee477bdd09ba86a2e6ab172cdc8453f746ff1 SHA512 079de83758024ea385e85565d893b16aad985ed8aec45e9348b86793a1f9c9f2af05454dc15f6ddda16df35f50333a23ffce184cf0460a7d243773c145d30bb0
-EBUILD amavisd-new-2.12.0.ebuild 5249 BLAKE2B dd6f6a0ada3feab940f9280d8aeb89fb01b2a9c3227b9184ce76ddbb1815eabec6cbf0bed2534d24af86078c298c992fc585a67090463b77eecc0a592f48122d SHA512 b925e5c94fbefffa832fd34f6d2cd39a2520686c060364a001cba6fcdf5370821cba2907e179e3665ab29bf59e52508aedca55518eca31824f99aee4f0a63fae
+EBUILD amavisd-new-2.11.1-r3.ebuild 5219 BLAKE2B 0ef8d5b24c0ec58541a403f2548ae361841472561e90f2b953247309765340cf5c179e23d1837a6fc377db8e402cd147fc182c577374b7e63d81e9052270f9df SHA512 bfd83eca3317a54aecef1c0965655c1c0dcbbde87f8903fb186ff7166de85b0a665e183eb819159900c455fe15a20f47e88cdd5503a02295ea67ad1d382e93f0
+EBUILD amavisd-new-2.12.0.ebuild 5270 BLAKE2B d40e5b8227bf64fbf35a9a9abe0f140b5c1c0e552321adafcdf5b0e1c8f0455150a450bc7f0b2d0a44d6f108c435896dfe58eecc5a00b2a8b3eaf0fd7596a367 SHA512 152bec554ce9893f1778cacfd12838e02932acb3b0c426b7532cee20941ed85639c0513c14e742def461acc49d064677d55a30ba1bd6be59b04b9f12946226c7
 MISC metadata.xml 1037 BLAKE2B 5ae38ff4c197dfb0f9cb2b5da9da4175b645695ace08f98148200fc90958b7f07f9825a9a971e6176da8129c8871d9a51834f4ae0a06fc083b8a34499edabdf8 SHA512 c2122fdef6fba6df7e096f462dad5ba21a98c04636edeae5367eaa6b02b5cb58a5fc25eb8f3b6dc6616ed337e33eb959855ffbd2af55b65a75f9bd21243d5234
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 91ff573e6369..d9f97e928164 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -6,7 +6,7 @@ inherit systemd user
 
 DESCRIPTION="High-performance interface between the MTA and content checkers"
 HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
+SRC_URI="https://gitlab.com/amavis/amavis/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
index cbb0a5544214..d426c624789d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -6,7 +6,7 @@ inherit systemd user
 
 DESCRIPTION="High-performance interface between the MTA and content checkers"
 HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="${HOMEPAGE}/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
+SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index f18b0552291b..a316063bfa8c 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,4 +1,5 @@
 AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41b45c87b42abbc6f68432eef597eb691609130d57f8723a800da6eaabbf87b87e4eed79539a5cf6f88539803d8f9bc4fb SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 EBUILD bogofilter-1.2.4-r2.ebuild 3770 BLAKE2B 05d7455ed57edb32fe4e15826c9d576134492f916be02ee0c112942cd2a4e503719fa9dd0d1d8119eade16cd9430ecc3870cd1d32f95817a44eff009273597f9 SHA512 8c1f25341d43e0d2f3d1b7b80c4fe58ca4c7ef49e0a5a7a6e216fec0e5216c0f787b6f2ea2fc97af3c44fca16062a473030efba263d4f5ea52fc15356c490e90
+EBUILD bogofilter-1.2.4-r3.ebuild 3785 BLAKE2B 49c9456060768e144c295b389b5723254fc9a2f32a4e58a71d32133c8b72f9a83e8992c0e0e7d27a83092cd66b1978ba5c23f8c165f189674c60db65e8d290fc SHA512 5dbfb92c306b35e38681b8808926ed8ba364e7c09d3789cbf70e8d4c715e6a322885d29bf8788b4a8eda10947a44fbad5d13426a39ed94ff19391baa1c97fb3b
 MISC metadata.xml 681 BLAKE2B 847326098ccdb227a492c2c03c6173e8260db73a91df37ed739511402fc2466476cc7ffb5c356b203b46945524224237bcec8058e2ef19d0436c25a2611003cf SHA512 cce40d35e042c532ccac225225ca6a137a041f9da6f8f0696cfd4b12fa6876662379bf2cc01e36bb91bf32479561be0ca44b20a86a7788448207a35983042277
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
new file mode 100644
index 000000000000..278f265ab734
--- /dev/null
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
+HOMEPAGE="http://bogofilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="berkdb sqlite tokyocabinet"
+
+# pax needed for bf_tar
+DEPEND="
+	app-arch/pax
+	sci-libs/gsl:=
+	virtual/libiconv
+	berkdb?  ( >=sys-libs/db-3.2:* )
+	!berkdb? (
+		sqlite?  ( >=dev-db/sqlite-3.6.22 )
+		!sqlite? (
+			tokyocabinet? ( dev-db/tokyocabinet )
+			!tokyocabinet? ( >=sys-libs/db-3.2:* )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-test-env.patch" )
+
+pkg_setup() {
+	has_version mail-filter/bogofilter || return 0
+	if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
+		( ! use berkdb &&   has_version 'mail-filter/bogofilter[berkdb]' ) || \
+		(   use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
+		( ! use sqlite &&   has_version 'mail-filter/bogofilter[sqlite]' ) || \
+		( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
+			(   use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
+			( ! use tokyocabinet &&   has_version 'mail-filter/bogofilter[tokyocabinet]' )
+		) ; then
+		ewarn
+		ewarn "If you want to switch the database backend, you must dump the wordlist"
+		ewarn "with the current version (old use flags) and load it with the new version!"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# bug 445918
+	sed -i -e 's/ -ggdb//' configure.ac || die
+
+	# bug 421747
+	chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id} || die
+
+	# bug 654990
+	sed -i -e 's/t.bulkmode//' \
+		-e 's/t.dump.load//' \
+		-e 's/t.nonascii.replace//' \
+		src/tests/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="" berkdb=true
+	myconf="--without-included-gsl"
+
+	# determine backend: berkdb *is* default
+	if use berkdb && use sqlite ; then
+		elog "Both useflags berkdb and sqlite are in USE:"
+		elog "Using berkdb as database backend."
+	elif use berkdb && use tokyocabinet ; then
+		elog "Both useflags berkdb and tokyocabinet are in USE:"
+		elog "Using berkdb as database backend."
+	elif use sqlite && use tokyocabinet ; then
+		elog "Both useflags sqlite and tokyocabinet are in USE:"
+		elog "Using sqlite as database backend."
+		myconf="${myconf} --with-database=sqlite"
+		berkdb=false
+	elif use sqlite ; then
+		myconf="${myconf} --with-database=sqlite"
+		berkdb=false
+	elif use tokyocabinet ; then
+		myconf="${myconf} --with-database=tokyocabinet"
+		berkdb=false
+	elif ! use berkdb ; then
+		elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
+		elog "Using berkdb as database backend."
+	fi
+
+	# Include the right berkdb headers for FreeBSD
+	if ${berkdb} ; then
+		append-cppflags "-I$(db_includedir)"
+	fi
+
+	econf ${myconf}
+}
+
+src_test() {
+	emake -C src/ check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	exeinto /usr/share/${PN}/contrib
+	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
+		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
+		contrib/{spamitarium,stripsearch}.pl
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/{README.*,dot-qmail-bogofilter-default} \
+		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
+		contrib/vm-bogofilter.el \
+		contrib/{trainbogo,scramble}.sh
+
+	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
+		doc/integrating-with-* doc/README.{db,sqlite}
+
+	dodoc -r doc/*.html
+
+	dodir /usr/share/doc/${PF}/samples
+	mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
+	rmdir "${D}"/etc || die
+}
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
index fcc3c65d4b11..413d7fd0f9f4 100644
--- a/mail-filter/courier-pythonfilter/Manifest
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -1,3 +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
+EBUILD courier-pythonfilter-3.0.2.ebuild 504 BLAKE2B 9b580c1dbb288afe2643653e4a0ef3f42a775e1e42797ee8161755dc05e1b50361f810f5aa76e4a5610d2334aace7813027be93b2d08c7996b4ce350e4dab660 SHA512 081373974673539c6d21ba02d25c27c237741cb37e1062f05b34404777610f203374e3fddf97c767b64cd95efcc6fd6787937cecc8964de9ba5047bc4b4ef70b
 MISC metadata.xml 299 BLAKE2B 495df9e20b847c1760adbd30a80d131f07be4a51f1bb4727835bcfaa37c804bf0cbfa9a2697e8907507445ad4785129c97902d88aa4890122d2c4100d9233db1 SHA512 3658867ae9276068ed78a26bf218dbe5125025336119678d699c77f643884c55dbb4b8b19eb304447b0efcacf4b8eda437217e9ba8cacb7dffccc0d4464bc6e6
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild
index 8807a3f26a5e..b11b48cd3da0 100644
--- a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python filtering architecture for the Courier MTA"
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index b974d19b4150..47a4e23a2b83 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,6 +1,9 @@
 AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
+AUX milter-regex-init 818 BLAKE2B 9130db7e295262a02cfc61464945029810f61fba4947e422fca9820d0d58762db228bcc760bc8e1f55aaa61cff9455abed19f66ff7bd910aecd9a969eaa3c12d SHA512 04549ec85a8b3c9fe4e65bcfe903aefbd9019b8324041448586bb3ed3bada20c0bf60fbe485e90bb1cf777703c696d2a0c9b3630c218d7037e1c6b2680eace75
 AUX milter-regex-init-2.6 438 BLAKE2B 36f12dc620dca2f1dd2bc0d471c76355474fe0d50c2cb87559cdf0f6b19f9058bf12b085fa0737e32d02509994752c567f719ec7dbb42e9bf5d48b55c862b718 SHA512 a6754fefd61f884733fca4d0bdb9fc7ed057b4d87d37e63dc473b06aa270da0b6cb4df7b95ba59e6198e9a013f959a052e426b0df987eb4690122528bea819b8
 DIST milter-regex-2.6.tar.gz 20517 BLAKE2B d98587146010d60a062833d8529af2788d657141e19c249e97bf5c847ffa01d6c76f42b6c8413f957fbeb9843ad38281ba8257aef10d0f1bd414726c416533da SHA512 33afa9a314ff2a2f14a301a85fa142e6e4166ffb77e8d18632b094c7873397e037ee6c5d3d1c248bfbb23037c45a15f21fb0cebcbb0f90c69b3d985aad37f169
+DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
 EBUILD milter-regex-2.6.ebuild 1268 BLAKE2B 34c4321f989434b0e3c0eda399ab1c6d55b5283c4cc654d75d54153ccae399c19c8b07d7da083d26022fa1c1977bf388d422f20fe9ba3d9e0d5f6af14aa1d742 SHA512 adddee9bc0c7003c138a49db2dd595e83a911f536183af12f0988921022e88457f5c0ed9a82d901d741e80cd216054b4d783476da6e01840fd47b7a86a543c34
+EBUILD milter-regex-2.7.ebuild 1124 BLAKE2B 19fec947296750e8c6fce958e03a1b432b101a9e7fdd3655098a2e88b0217616847f4cc71fb956d62ba788f5e62c217f7249257b36e57bbce8dca9c5be855c11 SHA512 9388ec1f471ae6b3a1c62db2b5a20b7dfa6e64de6b2f2a8cc6953b17272b256d82901ae2810315f9d8573f3ffa01ee465fb1e93e11fd6c837869873e93213c8a
 MISC metadata.xml 696 BLAKE2B b6735f8b042cd7f064f4f7edc2b0ac8293e0c1e4641090e8890e13ea8b9642e1f3bdd892e629261006c607216b71c9a912b8b48a24c568ec1b1a1f15ff2a5de8 SHA512 df7e66be229bc3c32ab7d0b7ee8d035840d7b09df8f9070f0a2239a063e6fa7a67b4ff25926b57211b3b7b9d3da43cb96b9e1355ac2f0d693abc248eac3b96d6
diff --git a/mail-filter/milter-regex/files/milter-regex-init b/mail-filter/milter-regex/files/milter-regex-init
new file mode 100644
index 000000000000..d20b6fa8a30c
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-init
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/usr/bin/milter-regex"
+command_args="-c ${MR_CONF} -r ${pidfile} -u ${MR_USER} -p ${MR_SOCKET} -P ${MR_PERM} -U ${MR_USER} -G ${MR_GROUP} ${MR_OPTS}"
+extra_commands="configtest"
+description_configtest="Test configuration file correctness."
+
+depend() {
+	before mta
+}
+
+configtest() {
+	ebegin "Checking configuration file ${MR_CONF}"
+	${command} -d -t -c "${MR_CONF}" || eend "Configuration errors found"
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+		checkpath --directory --mode 0755 --owner ${MR_USER}:${MR_GROUP} ${MR_RUNDIR}
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
diff --git a/mail-filter/milter-regex/milter-regex-2.7.ebuild b/mail-filter/milter-regex/milter-regex-2.7.ebuild
new file mode 100644
index 000000000000..b8a5df416985
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A milter-based regular expression filter"
+HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
+SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="acct-user/milter-regex
+	|| ( mail-filter/libmilter mail-mta/sendmail )"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.6-gentoo.patch"
+	eapply_user
+	# Change default user
+	sed -i -e 's/_\(milter-regex\)/\1/g' ${PN}.[8c] || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -f Makefile.linux all
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	newins rules ${PN}.conf
+	newconfd "${FILESDIR}/${PN}-conf-2.6" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	doman *.8
+}
+
+pkg_postinst() {
+	elog "Postfix configuration example (add to main.cf or master.cf):"
+	elog "  smtpd_milters=unix:/run/milter-regex/socket"
+	elog "Sendmail configuration example:"
+	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
+}
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index f32dbf5a2e90..274e6390bf61 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,6 +1,5 @@
 AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
-EBUILD opendkim-2.10.3-r16.ebuild 7464 BLAKE2B d73201ccdc7b3d98bca25dbf5f757deb4980b34d4f87dbe9ed5a848aa6e15427c87f24d97bd72e9635065d4f960dbf9e4a3df021e3c6343fb3e14108e42e0d0c SHA512 89aaae218cd06d9cafe36bd87ee4b2cbe11f2754b896d8935a3ce61bc14277a4ed29c9dca536aa04b67af51ba97bca357d89a0a97e960d82c0de0887c84a7695
 EBUILD opendkim-2.10.3-r17.ebuild 7370 BLAKE2B 5d651b5389f07920d307d9c9895d1bfb320edff2d4ce6cb339b9f2f75e9b2073ffeb528b3bfa409d5eab87d7c04b99c48f61793598c7d0b88cea84c8281f1c3c SHA512 cbc2f5869b49a0981ba874b26ff386adcaddcbc15d227d56ad3baf7b6b6b31c33691bfe5552daa8354cef1db3ded88f9576647347bc047835170bd5c31f9dff9
-MISC metadata.xml 2316 BLAKE2B 5bda2db8ef7a54711366213e84b3edb8a93e5327737a433a445d28a482e92e4c5e29e9dc22d318ba4c294d273f048a63f1e10999e132df9cdcbbc05c12c29d4b SHA512 4720d75af10968bfdcf4a53c2571724ad164ea081dd30b39568467b5eee25f6df25c8caf8b4551ddb2f2e97889b8ddff1fb10a7e24e1eaaf340c8d7bab542837
+MISC metadata.xml 2185 BLAKE2B 0cfb33303e8edf764700664863e2dbf90a288e71cf1a078c33ebaac20b11e398e34ae8ca289732b24401ec1f4b192e2c922a86297632af9a039736c52e0ac143 SHA512 56753bc62e8fa16ad3df9e49c2877bbfa5ca8f2f617455c8b9757e50cdd2afe6b27d2d185edb3620d447e42277d755373eafb448da08262723cfb0b5863c3399
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 70cf6ebedb92..224c3bd7ac44 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -59,9 +59,6 @@
     <flag name="lmdb">
       Add support for using <pkg>dev-db/lmdb</pkg>
     </flag>
-    <flag name="query_cache">
-      Obsolete, use "querycache" instead. Flag will be removed after next stabilization.
-    </flag>
     <flag name="querycache">
       Add support for query caching (requires 'berkdb' flag)
     </flag>
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
deleted file mode 100644
index 74145d2b43e5..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use eutils systemd tmpfiles user
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-# The GPL-2 is for the init script, bug 425960.
-LICENSE="BSD GPL-2 Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats query_cache test unbound"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	sys-apps/grep
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua:* )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )"
-
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-lang/lua:* )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
-	stats? ( opendbx )
-	query_cache? ( berkdb )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openrc.patch"
-	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-)
-
-pkg_setup() {
-	# This user can read your private keys, and must therefore not be
-	# shared with any other package.
-	enewgroup opendkim
-	enewuser opendkim -1 -1 -1 opendkim
-}
-
-src_prepare() {
-	default
-	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
-		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		|| die
-	sed -e 's:dist_doc_DATA:dist_html_DATA:' \
-		-i libopendkim/docs/Makefile.am \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use berkdb ; then
-		myconf+=( --with-db-incdir=$(db_includedir) )
-	fi
-	if use unbound; then
-		myconf+=( --with-unbound )
-	else
-		myconf+=( --with-ldns )
-	fi
-	if use ldap; then
-		myconf+=( $(use_with sasl) )
-	fi
-
-	# We install the our configuration filed under e.g. /etc/opendkim,
-	# so the next line is necessary to point the daemon and all of its
-	# documentation to the right location by default.
-	myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
-
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable query_cache) \
-		$(use_enable static-libs static) \
-		$(use_enable stats) \
-		$(use_with memcached libmemcached) \
-		"${myconf[@]}" \
-		--enable-filter \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing \
-		--with-test-socket="${T}/opendkim.sock"
-}
-
-src_compile() {
-	emake runstatedir=/run
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
-	systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
-	systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
-
-	dodir /etc/opendkim
-	keepdir /var/lib/opendkim
-
-	# The OpenDKIM data (particularly, your keys) should be read-only to
-	# the UserID that the daemon runs as.
-	fowners root:opendkim /var/lib/opendkim
-	fperms 750 /var/lib/opendkim
-
-	# Tweak the "simple" example configuration a bit before installing
-	# it unconditionally.
-	local cf="${T}/opendkim.conf"
-	# Some MTAs are known to break DKIM signatures with "simple"
-	# canonicalization [1], so we choose the "relaxed" policy
-	# over OpenDKIM's current default settings.
-	# [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
-	sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
-		"${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
-	cat >>"${cf}" <<EOT || die
-
-# The UMask is really only used for the PID file (root:root) and the
-# local UNIX socket, if you're using one. It should be 0117 for the
-# socket.
-UMask			0117
-UserID			opendkim
-
-# For use with unbound
-#TrustAnchorFile	/etc/dnssec/root-anchors.txt
-EOT
-	insinto /etc/opendkim
-	doins "${cf}"
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "	emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		elog "If you are using a local (UNIX) socket, then you will"
-		elog "need to make sure that your MTA has read/write access"
-		elog "to the socket file. This is best accomplished by creating"
-		elog "a completely-new group with only your MTA user and the"
-		elog "\"opendkim\" user in it. Step-by-step instructions can be"
-		elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
-	else
-		ewarn "The user account for the OpenDKIM daemon has changed"
-		ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
-		ewarn "from being able to read your private keys. You should"
-		ewarn "adjust your existing configuration to use the \"opendkim\""
-		ewarn "user and group, and change the permissions on"
-		ewarn "${ROOT}var/lib/opendkim to root:opendkim with mode 0750."
-		ewarn "The owner and group of the files within that directory"
-		ewarn "will likely need to be adjusted as well."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector="${HOSTNAME}"
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}var/lib/opendkim/${selector}.private" ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# Generate the private and public keys. Note that opendkim-genkeys
-		# sets umask=077 on its own to keep these safe. However, we want
-		# them to be readable (only!) to the opendkim user, and we manage
-		# that by changing their groups and making everything group-readable.
-		opendkim-genkey -b ${keysize} -D "${ROOT}"var/lib/opendkim/ \
-			-s "${selector}" -d '(your domain)' && \
-			chgrp --no-dereference opendkim \
-				"${ROOT}var/lib/opendkim/${selector}".{private,txt} || \
-				{ eerror "Failed to create private and public keys."; return 1; }
-		chmod g+r "${ROOT}var/lib/opendkim/${selector}".{private,txt}
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /var/lib/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters	   = unix:/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}var/lib/opendkim/${selector}.txt"
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest
index c49db00caf55..f1bf87f76d9f 100644
--- a/mail-filter/pypolicyd-spf/Manifest
+++ b/mail-filter/pypolicyd-spf/Manifest
@@ -1,3 +1,3 @@
 DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673
-EBUILD pypolicyd-spf-2.0.2.ebuild 1216 BLAKE2B 049868c40a0db7fc35d600c5cdf5619d6e45322240ec4e96142f553017ad39646ab4c31327f6305cff8d10509831b93e62e5f6829a3880a885b5f9aeaaed9ba7 SHA512 9daba1e4c33212178536ee7dc6faef1578d14fa939528492a05b1a4ceb4e2961d9f75121a3b83530088a39914e1be40a53486c3e5084c5ecaeee3f36cd4cbee5
+EBUILD pypolicyd-spf-2.0.2.ebuild 1212 BLAKE2B 810e17a6971fa6f167a9b15ecf4847745bf999d1dad5f3a911604d5323ff7a44843711bbc3e3b17866c0c024fa3a7925939db863fe5d8bace3b17b7b3ea61697 SHA512 c181503c88943fdf0ff60535816dc971838015fa26085df73b0a2c8ec3b56775069de58d7f2fe3906a9f94f3f7313287d5d3b272edb1db4684292c3af64f338b
 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 8ad06af76151..f23806403dc8 100644
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
+++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 # The built-in ipaddress module handles the parsing of IP addresses. If
 # python is built without ipv6 support, then ipaddress can't parse ipv6
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index f35086d468b0..6670d0a06439 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -10,6 +10,8 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
+DIST Mail-SpamAssassin-3.4.3.tar.bz2 2739618 BLAKE2B cd77fc99cbec17f10c04f211e773fe2df9dd9c2efb54c9cc169f1fbfed884e74b77c96d8eee333af4bcefb05dee4519408b2e53e0c519734d582f95bad6030d6 SHA512 4d50b30a42d318c3a4c868b4940d1f56c329cc501270df12e1a369dd7de670c30f328a5fbc37dbd3b0d06538b9500085e920939c62de80ad6d8740bc47162cb0
 EBUILD spamassassin-3.4.2-r2.ebuild 7630 BLAKE2B cf03c3a415a636ff6370cb17ebe7c23dba199ccc086e5f6135c68511ce0989f1015db8d9b9eb6da174eec56d65f8c0f8c3b21a230f6cc017e47b1def33e2fed9 SHA512 1ff9b5f891546d54ed65042b20cef3fab77812a7df6da4a94a9346b0565f8a043648265d9a0b4a0fb5231ab2fc85a57266490bc1f4b6198a113e34f00988686c
 EBUILD spamassassin-3.4.2-r6.ebuild 8713 BLAKE2B e13be6c1028c5dbd95d642582ab3f08a5b61c9139cbd2aa82d948787ae36c8081fd39ec9d15844af44d0970857178c17adea45d0cab2cd509d241765212896dd SHA512 2f45421391ced81ddb47a973e059d62939c5be9e7e286449d93bc313949238c20f540fe112cfb97836e4e79d9f0438d2fc61324ac70202ca7baeabaccf948967
+EBUILD spamassassin-3.4.3.ebuild 8513 BLAKE2B 6f9b702a7d921309d37896d021833b1325a75f7da299535458addc4e9686d9f55e0fd20ac52217d06d29555ed01a8852b4fe66a51dbe6bb27b0576a320b24fd8 SHA512 9d50f7d7fc765a323484fbd91a6700ea08a62a968515b97a870154612dbf6eee4e268014944d393dcda2f963765d74cb253c76b1d0caef0679b6593deea22271
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/spamassassin-3.4.3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
new file mode 100644
index 000000000000..41014c59d26f
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.3.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2019 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( 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/BSD-Resource
+	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=(
+)
+
+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-r1.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}" -lt "3.4.3"; then
+				_awlwarn=1
+				break
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.3, 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.3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.3, 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/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index 6134b87c1ed0..700dc2220f11 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,5 +1,8 @@
 AUX sqlgrey-1.7.6-init.patch 408 BLAKE2B 09ac51cd9c16ebf21261eeae4a405042e57444a1b727dc62a10cb5a073a50e9a774dc19e26fdeed152c86d199a10d862cef224987a27fa165abba03b7c0b5821 SHA512 f22a872651e21bd45aeb22723c7d45f1c637e9227a51636655189e92f9ffa3cd2680d78d43ffc807fd85930110b5052eb74fdc07b5f32522255ae7218e29a2d3
+AUX sqlgrey-1.8.0-init-openrc.patch 284 BLAKE2B 33384a04eeca7d22a8cd7c6e95d997428be6c90a958e7598c17a29aa6c158118de25819c9e005f6fd4cbc9eb6750793c2c6c5bc3b98c75d30d77e1e3cf2e91cc SHA512 8d403977fff4afb82d32e3901da0f0791b798239e4a2bdac075adeeb9629e2cade8c9392860af91a9aa627bfdbd34fc889175c28841e3113ad7afac33689aecb
 AUX sqlgrey.service 429 BLAKE2B 330c83bbe4f4ce4aabef28d9eb3c00d9c1659ad899e1c4aa5fe82f99cf2f5e46eb5900c4a0ee0731c27184a60568af14bb78baed3b0053134b121fea0f00a070 SHA512 7e41344e3820537d73a413d728d455de58c5358922a354904cba5a870f61fecbf96f84f91dadad283d406cad05010bc3fd57644f18ba319083af92a1810d9a27
 DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
+DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044
 EBUILD sqlgrey-1.7.6-r2.ebuild 8427 BLAKE2B 4cb1fecc4b2817edd41f11459c86afa1e2c3c2572aef7fc50d8668778a2a5d3df3f1d0f06b5b462aad1386c405eb14cd7753c35daf2d8b891cac6e2c0e579b75 SHA512 9a9f5f42e247df21a609afae682ff631c1e60ceba2a508513f4e7d6b34bf187ee8eb6fbb9d915a88ce862ef43b69ae7487ce664fbb3b4cacb6f449e14b0c2447
+EBUILD sqlgrey-1.8.0.ebuild 1649 BLAKE2B b6ebcfbdf7daa9e9b8217c010239dec220c0986718e78e2ca98b0607f9c1f4efb1fe1ee1d8fe9a962b31b5e24d278fd60c62e06c64adcd37c44fac41e939815c SHA512 ad5b93a5f10b171a3a926da847657d277aaf3593b9ca10a57201e0ac97fabeb3c7970e88e6e17b09aabbf2a6615f215b9485507ae213f7ca72f9e5a7b66f2e14
 MISC metadata.xml 352 BLAKE2B 22d2cabf23b745a432e22edee82b9184fad33a5fe579cdd2b0efe584c9a34d422d16a7552dad88fe9ba93b11bd496920450d7510e627576d08ac9ed4c0df541b SHA512 4681c824087ebac9bd919143cc665481311fd503d58655323bef2d8e8f204a502daf7d0d05ba5aedfb32a67b97d2b942dc1f39eab35df92677a43d77fb1f04cb
diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.8.0-init-openrc.patch b/mail-filter/sqlgrey/files/sqlgrey-1.8.0-init-openrc.patch
new file mode 100644
index 000000000000..aa1560572bc6
--- /dev/null
+++ b/mail-filter/sqlgrey/files/sqlgrey-1.8.0-init-openrc.patch
@@ -0,0 +1,7 @@
+--- a/init/sqlgrey.gentoo	2007-05-12 11:12:12.000000000 +0200
++++ b/init/sqlgrey.gentoo	2007-05-12 12:05:52.491468250 +0200
+@@ -1,4 +1,4 @@
+-#!/sbin/runscript
++#!/sbin/openrc-run
+ # Copyright 1999-2004 Lionel Bouton
+ # Distributed under the terms of the GNU General Public License v2
diff --git a/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild b/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
new file mode 100644
index 000000000000..958ff327b18f
--- /dev/null
+++ b/mail-filter/sqlgrey/sqlgrey-1.8.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A postfix policy service implementing a grey-listing policy"
+HOMEPAGE="http://sqlgrey.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/sqlgrey/sqlgrey-1.8%20%28stable%29/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="acct-user/sqlgrey
+	dev-lang/perl
+	dev-perl/DBI
+	dev-perl/Date-Calc
+	dev-perl/Net-Server
+	virtual/mailx
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+DOCS=( HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog )
+PATCHES=(
+	"${FILESDIR}/sqlgrey-1.8.0-init-openrc.patch"
+)
+
+src_install () {
+	emake gentoo-install ROOTDIR="${D}"
+	einstalldocs
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	elog "To make use of greylisting, please update your postfix config."
+	elog
+	elog "Put something like this in ${ROOT}/etc/postfix/main.cf:"
+	elog "    smtpd_recipient_restrictions ="
+	elog "           ..."
+	elog "           check_policy_service inet:127.0.0.1:2501"
+	elog
+	elog "Remember to restart Postfix after that change. Also remember"
+	elog "to make the daemon start durig boot:"
+	elog "  rc-update add sqlgrey default"
+	elog
+	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
+	ewarn "included HOWTO in ${ROOT}/usr/share/doc/${PF}/"
+	ewarn
+	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
+	ewarn "the SQLgrey db"
+}