gentoo resync : 12.01.2019

28 files changed, 45 insertions, 632 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index ec56d77c921a..7778c9971055 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 463ad132a0b9..8db1cf030f3c 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -11,6 +11,5 @@ AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca0
 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-r1.ebuild 4949 BLAKE2B f0dc3dd57190d24752fe09be30b3c9299e7fdb591347548adea000b2ab2f8a5bc7b6ec66f76eb6046da4bd1857e2f7e6e017899fb466d9ea784dec2481a44308 SHA512 57cb159e9e4da2b6e2393039c85bbd534b275744cb435b0879bee2a3fcf41a86531e154be591281c4e51c066de52a1a75259fcc988de1582e7d1db0156f0db56
-EBUILD amavisd-new-2.11.1-r2.ebuild 5220 BLAKE2B b0488be1475b10b25582a3b020a8a8517c5e9062eb7ddcfd4790e3b36f29e8c0b8893f9183436ba0021d1507a11e73347bc537179bf9d281d5eb1c2938f894ae SHA512 12dbe4d2b83a4c12c98170224ba69f4c3d16d65db6c761beb5400f3c6709da8e0b71c24e1b9dd859dcb0728d92b727276f16e1de0d676db3a4418e6f59d985c0
+EBUILD amavisd-new-2.11.1-r3.ebuild 5203 BLAKE2B a36ab3dd37f5d1a49a8ac2acb0e43568d837bf238d2d4380c925f32d8ce7b69e73bcb59b4ee8ee234aa8ae29a2768c6af6bb1eea8905ffddd1a3cd1ad01daa64 SHA512 271ed5e8d12f8c71fc12738f5c69419d2b166de3afd53d7f9f34d02356cc3cd7d07c665ad2226d45d327952d9bba069e09b8a4d55ca9879157b968e09f96480a
 MISC metadata.xml 845 BLAKE2B 5ea031bb47ac8f1ca3cb703ed6e6bcd94fa63ea275874c616e3c24c5802f0f2f4b2443b379b62e708eb6ea075a0950116722319cc08023b20d7152cbabce512e SHA512 4409524d4819357253b63c143f0aa4b760ffe0b4ed22d30d28632f86ee2731c7e84a95131016a21ab43a63c32ea35cfbe741010a07f45e8d21fe05f020387228
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
deleted file mode 100644
index d436def3bdbe..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-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
-	dev-perl/File-LibMagic
-	>=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}/amavis-${P}"
-
-pkg_setup() {
-	# Create the user beforehand so that we can install the config file
-	# (and some directories) with group "amavis" in src_install().
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-}
-
-src_prepare() {
-	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
-	# see https://bugs.gentoo.org/603582
-	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
-
-	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
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema ${PN}.schema || die
-	fi
-
-	# The config file should be root:amavis so that the amavis user can
-	# read (only) it after dropping privileges. And of course he should
-	# own everything in his home directory.
-	insinto /etc
-	insopts -m0640 -g amavis
-	doins amavisd.conf
-
-	# Implementation detail? Keepdir calls dodir under the hood.
-	diropts -o amavis -g amavis
-	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
-
-	# BEWARE:
-	#
-	# Anything below this line is using the mangled insopts/diropts from
-	# above!
-	#
-
-	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
-
-	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
-
-	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
-}
-
-pkg_preinst() {
-	# TODO: the following is done as root, but should probably be done
-	# as the amavis user.
-	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
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 1767bdefc4a6..fb89008a1ca2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,6 @@ RDEPEND="${DEPEND}
 	app-arch/bzip2
 	app-arch/arc
 	app-arch/cabextract
-	app-arch/freeze
 	app-arch/lha
 	app-arch/lrzip
 	app-arch/lzop
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index e64ae8a892e1..d2418bb7f6fd 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,5 +4,5 @@ AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc962
 DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.154.ebuild 4358 BLAKE2B 0e3b69bf36dc2a6f8f58eac9638c76648b825a2d9deee643e1a4ae174b34ce150a885fc115284aad0dc817743355f07bb450a75e62b5942172fc6d812c943c37 SHA512 d22050cdf0e5ab84a524c62e3752faa5a2bd986a57ee3ac643f56bf8ff5c7501b396d9a81f3788652e4f0c3229ae9c5bb7a45646bc903fac7b636670a0748508
-EBUILD dcc-1.3.158.ebuild 4355 BLAKE2B db260571a46aed8ade1ffcc14ccf3ab77eb729eef6bdac34c92005087e26052793ad53ff355279ef7c7841b4d9d4dfe7124a155a4845828d5abcd64845b487ca SHA512 e74657b3ac0746564ac784de51f21306ec6765408a0ae4c04a09e5c027efad0d80e03430c991f87f03ca91a6fa8e5dbdedb51b32f82dd1e8325e832d62f672e7
+EBUILD dcc-1.3.158.ebuild 4351 BLAKE2B e95eb22145d2e7af6a5cb8cccedce16ffd5965e3334dd7f90e829c504ceb54ffb89f373d16e4ae2cd78a3a8336b0d28e42508849e022a3bd333eb70794fb68ec SHA512 7934e9494707f325e8836d3be51b329590f4439ea72076a5589a2ffdccbd2128cdd14e19d7286eeb712d85cbd2d54681bf219922919483bca2de16de22ed853b
 MISC metadata.xml 417 BLAKE2B b1228d8060b3a3ce26e0a301089873d253bdee3e4e5fa785db1aef00528dbf3b786d3f2acd0d810b707fca436384cf26e67b5cfad63c912d3e6ae5cc374562e8 SHA512 8a17fc0c9502d8e21389a520cba60b482593a89064fb913a87b1c4fc73d20f0652948f848c803f22923a0873ed213025db2663effa584c800a9fe6b3a29f9339
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 80d5dcb71c67..e007b2d85ba1 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 62ef2fa87893..9feac3510616 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -2,5 +2,5 @@ AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502
 AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
 DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
 EBUILD gld-1.7-r2.ebuild 1875 BLAKE2B 1f2f2dccb676953a92aa4933fdd8a4ee580500c5118327d1c2ea950cbe6a92879a133d7a742d96409253e73df5a0a5409270ad9c9fba1e8a54269d3c982e618f SHA512 16e11bd850678ef303a81fab386870bc54d9a6341f66ac55e8a84b3d0d86cf9f0fccb3aec9cd39c0eff906eac976e554c055e91c197af8f91eadb35414b931ab
-EBUILD gld-1.7-r3.ebuild 1931 BLAKE2B fec3907fd7080e4269f09168e92b1e604c2c83d22fa4acae9aa36e8939205807e7ff50a887d55f5b5a57455a5accd2fb5b2b903d3efb65afa025145941692a86 SHA512 fe2aa744f937f40f8be53c48a902f5c4711cf5f8ea7261a5bfaea30d39c2bec960cd4d74d3404de0a93ebf2ce9185f346e61b40e18728d876698964069fee833
+EBUILD gld-1.7-r3.ebuild 1929 BLAKE2B c2a3e3266e8c292a02287aa57899cb59a4e8945c54db46902b55f1c1d6959cdd7ea740b7977f6bcb00a81f910a206c26f5ecc10fa02de71c991fd9b17241d89a SHA512 7bd8f2401b6fb94bcfb98cb0b8bad2ed89e76df04f0fee17e738c574a823021f533811961889cce7778b05cf2b333e34d36fea71b241164e6d045272cce75f9e
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-filter/gld/gld-1.7-r3.ebuild b/mail-filter/gld/gld-1.7-r3.ebuild
index 24fe380c91f3..90926c4222af 100644
--- a/mail-filter/gld/gld-1.7-r3.ebuild
+++ b/mail-filter/gld/gld-1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libressl postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
 DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	!postgres? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:*[server] )"
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 22d8339e4d36..2588a6a04a2d 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,8 +1,8 @@
 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
-EBUILD imapfilter-2.5.4.ebuild 793 BLAKE2B 8d3dd760bed913f82a8cc0c1e8d58455c0a2d3c17f0a660e8cd83c857231183f18eb430177328c5e49ddeef8e7a90585a75f7dd724b62ace00128c7629644b7d SHA512 8f6fd50fabb3e7996c4c5ffc8a3de5506b45320cf60ddf9761fa0d51f8ba15959a2a696279449bdabf6f328ac048dc894f42cb0c776b3b92801e512d5cd9d706
-EBUILD imapfilter-2.5.6.ebuild 793 BLAKE2B 7cdd82c5f306c48de016846dfdb7cb952c63d96c278a226d89400f3500ebb67d23e34c12db5cf324de5b691780627b3015d757f7016beed94f22e9acf166b955 SHA512 6c0d6b884e3993f06cc16d9d8fe7085397f80233262163fe5f1642924511cbe1bcf2152bb1ae250ec0520e844530dbf66d5de7d4313789989be407728057c3b1
-EBUILD imapfilter-2.5.7-r1.ebuild 879 BLAKE2B f8a33d644ff8e3c8d601a576f5a470008f701b1e67aac3301c73383165d382c8d66e7795616e8d8dab3b040318675e747d7eb6a6e045aefd0507ca734c7e2cde SHA512 e139264c30735ce0f57f89b07dc91abb926726a6fa3418fb2001a3e3dc41b9fa1ba13a99f4ee7493772cae36806b4fe86187e86c9648fa203145e4ec5baabab6
-EBUILD imapfilter-2.5.7.ebuild 812 BLAKE2B a8b2d8e5a9ae68d69ecd5068725401c9982dde795fdb75aeb9496cab3a392e6a92f3e658ee1027f336eb6a7dabb4d3b6c6c990825717801c191914f6cea44210 SHA512 6d7fac38d8383bcc8b184fadf6e9a9e86c6278dc16e18f88eda5e21c4acfab1a16749ae206f376a42082030254eea466697ae0468d912c69722c6161aeaae501
+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
 MISC metadata.xml 326 BLAKE2B 543654a3c3b9467c7cfb7bffc75022a9d37256e98cdcb57e6bf6f6249ba26caad17d1bfa4d1e58921ebc3947011e4c9f994477ba1105cef2bab2a5a26b503f81 SHA512 6165c1ddbb6368df4efcb1eae82e454df078865810366c7f62dabd3c84eb426f18208b49cc02d54acc9961e7ff4a0d4b825b720386d80122662b1ed98ecfd936
diff --git a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
index ef51fa3defeb..78c29f258103 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0=
 	dev-libs/libpcre
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/imapfilter/imapfilter-2.5.6.ebuild b/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
index 57e302b6f299..78c29f258103 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0=
 	dev-libs/libpcre
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
index 65f218891503..e0489a8fead9 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libressl"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	dev-libs/libpcre
 	dev-lang/lua:*"
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
index 3f0bcd1d9fc3..790a22454336 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND="dev-libs/openssl:0
+RDEPEND="dev-libs/openssl:0=
 	dev-libs/libpcre
 	dev-lang/lua:*"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/libdkim/Manifest b/mail-filter/libdkim/Manifest
index b41d84d8f5d1..a3c4eee7643a 100644
--- a/mail-filter/libdkim/Manifest
+++ b/mail-filter/libdkim/Manifest
@@ -10,6 +10,6 @@ AUX patches/fix_warnings.patch 9483 BLAKE2B 8a0eb57a22712348adcadb7fb09f4375f9c1
 AUX patches/series 34 BLAKE2B 8975814e5d91240964865f029c4e1b985b95796b20c6bd49a6e7213b0bf36a9a68cf68fdd444511ff9f6a27489844ce8804aaa1c6ead4a7e7a4f8ed6a8bd9cad SHA512 d2ba14924b9d56a2fb92ced7cc3186f061b0c9f4a7f3c6976e5051ac459998413667d7d5d7352eb05561f0f711fa104d78c7bbb47c193a383a9a5ce4ba6f44d0
 AUX patches/strtok_r.patch 3378 BLAKE2B f245cb047e8699084a25f1389834c0a2730bf09d013d038a8a539937336622259fd34c363c8671639150eab8c3d61784c9920e05227b3b92be6fc23967743a61 SHA512 ef6e5576ab1158e1bc05dfa20e686462e09461da870a41557d736848ea876c449e4064e7e44ba2e64647538c03208eaee06389f050feaa07cc615d547f7e061b
 DIST libdkim-1.0.21.zip 55049 BLAKE2B f7481bc41a2f43357a67aa9f6e251634f1c2850fd1dfe3c4a4e0ea64341a3625ff0e393e039d679784c8c1ce349ee7063511f988ff6cf6d5b7acfc7c9633f9da SHA512 3996c64398151dc9c07d357e8f3ac9b94e3c8d06ce5d83ebbe546416f361349d869b0b73216f28d0b732319731f31e61afd9eab0f540471760b944a90130a094
-EBUILD libdkim-1.0.21-r3.ebuild 1159 BLAKE2B 4005bbb6ac5b6cefe2ccb057e37d6fc16061987d123eaa6591be5de5bf389b482d627731a861aa0fcbe99e0a133d9637d4a5b89133d7b7f722b804b140521778 SHA512 439632cb76e30aa54834ae9a36d8e909100281d4d6f43700ff0ab61f61d7385f519a1ec45fd0d7c39cf47efc59eb6125ab70d212725d2d8cce92841f3b6663d4
+EBUILD libdkim-1.0.21-r3.ebuild 1157 BLAKE2B 240cc29463de8eaeb956368ca5af6f9161fc81bec9102744b1c91b81e89c6ddcf923ffa229ed282a09b7fff4d35a9033b66c57eeaacb9a00b38b786ee1bfe8c3 SHA512 883f7771388d591b3b64a132088b56abf5f40406252f856cb8fbcd2610bf6cee0c42192a9cb498bda62d2ea80bd302939876a49eabc198953e8d446c04b66101
 EBUILD libdkim-1.0.21-r4.ebuild 1078 BLAKE2B d381feec1ff7b56cf0750516318dd25f14956a836406c632bef830247849d9822423e2f37ed7863e26a62e2cf68e9a8c2af9f85802d3a454af58946e4a5c503a SHA512 790c84a98900be44aa11bed8f3b7e1f95db049b6fc4f685ae99085a1332898fc1789817585174ae7e880908184d84488fbd31dafb6ad21351b17207abfc3bcc3
 MISC metadata.xml 249 BLAKE2B 84210e21cccad244171f7fc855596c16abacf300aec5087825ccdfd4245a2a04f46dc99fbad2ae1998071511941f89380089cb1bf4d9e80111ecac1a5f157a03 SHA512 a2be284cf2f4e9a6c84979c88c89dc591d63b1c9093f63a72e96c7a725660467e69f780a7e6e586ec8e2665a8ae1b687cdec7cf79c16fbbd693dc5156c3f413b
diff --git a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
index 86a1e2d444f9..d6a2a309bf8d 100644
--- a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
+++ b/mail-filter/libdkim/libdkim-1.0.21-r3.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="5"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="libressl static-libs"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	app-arch/unzip"
 RDEPEND="
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index a338dceee8f7..6821b97d1bd5 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -4,8 +4,6 @@ AUX opendkim-r1.service 516 BLAKE2B 738fd145b6e6c62d76bdb45a6f782c1dfacb1623a658
 AUX opendkim.init.r3 1430 BLAKE2B a09484ef2123f9d7096211c1539eab5fda14ff1f36a291c2f6366781ad868d43028bae60eb4e3676380f3c830a350cf53c6cb42837f56160c5b9c59d1f7e261b SHA512 d0a5985ffac171774664d4f619924f25c462d5829e8281b8ff643c22918295d513cf6e0e3a335c550c378b6d4739604539585f2ca809172a090f15d5c1294cf4
 AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47ae67533a94c67371aa12963c347361056939cc18492612f067102eca09166de6aa83d1b0541d4a8e6 SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
-EBUILD opendkim-2.10.3-r2.ebuild 6175 BLAKE2B 05595a7b01903c41fb9ca88b02ee7a9cce42782f79ed0b9ef66df0983c732bd2f3556bbc8236a5ce92bf04fe7baeb6f9c756c5a580a9fde3650cf1b2b1bced8d SHA512 35a36a6a9ad16b322faf0d51356e7c0401900f8f98dadfbf0ea9c884665baa404b9ca3ebf22af160c5ef03a08a60775b379897a61b7102d178214b3424eb38b4
 EBUILD opendkim-2.10.3-r3.ebuild 6086 BLAKE2B f1473a7605c8ebb73170498ce826ce0b6a630c5109a0661a6a3226aa25d06fad04fc621b9b8c3931f47f497bbaae1cf2273fdb101c2c805aef6921283ee5f8e4 SHA512 4601d56f81230dca6753b3793b0392c1b05365706d1f97961f6bbe5172cbeebb2fa4b914390460b7872e9aca72e44c6b89ba6ea71c2c40504a1e8343d84bf74d
 EBUILD opendkim-2.10.3-r4.ebuild 6125 BLAKE2B f5e860bf2e5ca784c9b7d5b325d5ad2ea991a0b568507645753192ed2b8c85feb192b40f5ebcfe07e13884770a3161ca17fc5af66c84da07dffb1e9f1180bbec SHA512 d47ef5280f95272f7cf6087c1a5c67325564cf8058b083aa0b7b85b3b1f1a634f3a770ee2e08eeb0b428f04a24cc26a8ae7c43d04d5b83f9378d7f57e7cd3758
-EBUILD opendkim-2.10.3.ebuild 6095 BLAKE2B 9711f8fc38d5539b6d7b736aae3716c19ccdd0cd309ba70cab1b9a13d899899ef332d1883a90b85481b1bb2176fa26b12338c8885466a19c18b3ee836711b287 SHA512 36bf472733dca5a49ee41bde1317a4a0c4de519f7490f0c506437223080ef158b9172d51d6db81ed9555a3a1e9fbc31cd5fab9fa3eb05d928dc474d779b9d14e
 MISC metadata.xml 1576 BLAKE2B 055ffde1fc3b21a129056d4a457a40ffcc72aa06ded28068165ef67e5af180ac422dec4bf1a395d97fe31987da3426a007044e3c6d3424f08c944c04f26e2007 SHA512 8595e50d9a6775a337a06d7ca32c00d6b37c862eba46c5edfe895230d89cd8952fccca8ad0ed98483b7d47318c6178a11d0ee33070f731d31960c8c20fb10cb7
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
deleted file mode 100644
index 83fbee2e61f9..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
deleted file mode 100644
index 19bee906d0e1..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
-	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 )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	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 static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--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=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	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."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	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}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/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:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/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}"etc/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/policyd/Manifest b/mail-filter/policyd/Manifest
index 62ea66fbca60..86659ec0553f 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -5,5 +5,5 @@ AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e
 AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
 DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
 EBUILD policyd-1.82-r1.ebuild 1974 BLAKE2B 9467c9cb11441d4e528717b1c01abb878b18f02e0321c3195c4ae359ca413ed16d4abb28c54834494661ee92124f7ccb9da8439048c2ee0f75e48b7bbf3b44e9 SHA512 17c253ac9d1f3c0b8e2eccb320e1fc3df627014828fbc4c95f3438b67a27075fb703eb42c806644dd6e9741450b897aaca11e1799255a257269513fd228caf2b
-EBUILD policyd-1.82-r2.ebuild 2012 BLAKE2B acf486a4b8b4b39415c94cadb56bc10020a7b7bc268f5e717724b3cdaeeb3ed31373d49516ac786f9756a8453983b502f6e5d838530cc92d15fb97adab8bcf29 SHA512 12c74c85941fca22caadf4d8e1dc8b64b7562a784f2611507039cd4c5582addd3e8e8fc6f6a0f41cb70915510ab9b64f9df6a59bf89f23bdf3486e6e5c329a59
+EBUILD policyd-1.82-r2.ebuild 2012 BLAKE2B 3476d80843b047cb3f91dbb2715594a4a12bb1b250eaf0e2f1dc4776f3bfdd2c807d866f6db425edcc019e5061e2d7854a6fbd2b59db2718f0f5e1a018bfb792 SHA512 bca8d2d5aa6e86f28a1f91397c3cd1b331105f73a14a9c732a89cca94b104069c950245ad23c1d3dcd109ebcd542479c08dc8506992019c17bbacb0a36e5b58e
 MISC metadata.xml 331 BLAKE2B 2a54160dd40023392bf403418c358eb93eb1a591010d9184352ed74cb0c8688276a3026b4287dc47d4173f2472df56f35c422d8483796d264d85edcd1367e8b9 SHA512 5241c40be23d5183ef4d5d07901ce582e98a404da73cb5bbac6f51767d028b870315ef3dea6db0341fca1697b9f4d2b2b4a7ad99cd8e1ca9d601b3743ad677e8
diff --git a/mail-filter/policyd/policyd-1.82-r2.ebuild b/mail-filter/policyd/policyd-1.82-r2.ebuild
index b472846f713d..1e145672a007 100644
--- a/mail-filter/policyd/policyd-1.82-r2.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="libressl"
 DEPEND="virtual/mysql
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index b7ee5dfeb804..47546b4482a2 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,5 +1,5 @@
 AUX popfile 715 BLAKE2B 071dd14e37401ab0c5c25d644f55275fbf59bd9dba5bca39202f27338492603a95c023fe1288c507f76f78d4c0137580d8a279c4738247f8b507b3090318a313 SHA512 a802f753de335552a0b54da98baaad07ceda1da83f0c082d4e2204c90378c35ca5f34bfee1f7beaf11ee6795b7287dcf3db07eedf958665134064dfd9168fae2
 DIST popfile-1.1.3.zip 523431 BLAKE2B cf084e572bf0d8da7d4ce4435f7df9c527ebb0d6714f9b5ac2c2d8701231f452989de048e24bdd7cec2483466ed20f1ed9aa84255f7606a9ffb2bb06bf05b30c SHA512 0e3ed3d67d2c2b456643335dd030a51e890bb371c5b8cf9eed9fac350a2536b8884eeffff78fcb27b99c39711505df533ee3ded5b40714fb46e54c2d25b3dda9
 EBUILD popfile-1.1.3-r1.ebuild 1121 BLAKE2B 591b689643bab0fb5c4b192732eb4ad2221b14577862fecb63f18331417feda567d0fd16bcff279338cc2cd36852748ead54062788af676c684c0dbcdea36c36 SHA512 72ed23bb8be7e51b20baf540fa4fce83d611966de7c1dd528edef72087a8ca4e729c79caa7e87f4dece3567912a4d4d38e057708bc854b402956c03ddb3bdfd1
-EBUILD popfile-1.1.3.ebuild 1059 BLAKE2B 99bd36b8930cba8c2306c49534dc7fcc01f4951db16bc12f7762dcba637929902e0a1179bc76b7d709bb7f65ea53a07738460e698b787c50e9280a2cd87917e9 SHA512 1a7ed343d807f7288249a2217fbe9d21ad2125bdc81e714c69d510c96d56115e510bbeb8beb841a565acbfec24b3b320575de86897af243cba4f501ed533d842
+EBUILD popfile-1.1.3.ebuild 1058 BLAKE2B 1713631777762f13a14d5b75cab280044951f2d910fba8803458f3095125994f888ac15bcfa73a62b9d1cae982500a3f5431e536575e590b5ee1295c9711f588 SHA512 f6055e02d18329e3113e4eb56351d7ab78dd2fe09be5345b465e0e561edc84eaa35755c259108ed71428ee2e90023739f5086ae9ad88bb8e28f220f58f939555
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/popfile/popfile-1.1.3.ebuild b/mail-filter/popfile/popfile-1.1.3.ebuild
index 2c438d39d840..21e54839f75d 100644
--- a/mail-filter/popfile/popfile-1.1.3.ebuild
+++ b/mail-filter/popfile/popfile-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="virtual/perl-Digest-MD5
 		dev-perl/Text-Kakasi )
 	mysql? ( dev-perl/DBD-mysql	)
 	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ssl? ( dev-libs/openssl
+	ssl? ( dev-libs/openssl:0
 		dev-perl/IO-Socket-SSL
 		dev-perl/Net-SSLeay )
 	xmlrpc? ( dev-perl/PlRPC )"
diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest
index f5b87b33f017..df39853fa68e 100644
--- a/mail-filter/sid-milter/Manifest
+++ b/mail-filter/sid-milter/Manifest
@@ -5,5 +5,5 @@ AUX sid-milter-1.0.0-as-needed.patch 1213 BLAKE2B 9ad17c0011c3e8acb8cb419652560b
 AUX sid-milter-1.0.0-nopra_on_spf1.patch 1777 BLAKE2B e1a7c26af42372fd58c3fcfc282bedd11e21959bacfb5163bef4f8b72e363c69c96d84c2f9dcae682c96d157e575540e3863bf7abe28312f831d1954703cec55 SHA512 b920806c3b0a3baa5581b028ae291e22281810c680b2cca82c12635690b3acfbb76fbce656324042ffbc536e17214699291720ec4bf0c7a5138bd6ab9283c79e
 DIST sid-milter-1.0.0.tar.gz 351161 BLAKE2B 152472577addbebf549ccc17f96e3e4d7bb645ab7924fe1b1ffa8361f0629851143818b1fe0d856ad72b097037482198152dab20e6e39f2fe8b374263de5653b SHA512 599eae36b7708e045e3f120cd6b4215906ea954b5f10be520d917404a02cf0b03d79b8fcf9543080288a9ab8e436b393c8b6340d2b1edced3d4fb827ff4c30dc
 EBUILD sid-milter-1.0.0-r6.ebuild 1743 BLAKE2B 68de5b445bbaff3e40bf7fe6306b3d8a02d27d3797b12546c54b74b9c32d168134a7bb3a04d82868aa8d1cbd94fc8336917b558ea8e38fc24e123df20a97fab0 SHA512 9479ca6315d83737f98be70e8c990048f23678d06a02936be1a1f0ac54945d972bdcce31fedf306835950eac0c1d76d2fa6921068a4d6fbaca37deea828aeda7
-EBUILD sid-milter-1.0.0-r7.ebuild 1807 BLAKE2B 744cc848622512147bb4386925eb896952b651a898fac064cbbee80f0ed5a2b2739d84e11fbefcfe2786050e40779e71efe376c7183c9a1487a164d66c341c73 SHA512 8aa3144840a8d73bac90309306d3c2d0eec0d60065f7bf6370aeb43fb734e791d9491f0f70269d44f717d46d1f079fe5056686b277449f55363e7a50aafe85e9
+EBUILD sid-milter-1.0.0-r7.ebuild 1807 BLAKE2B 0b369987fded1688ddbd536b65def4e5bc9f27f73fd0c642ea436d46cdb2aa851766879f9c97ba5a4e5419021f3db36c54a8f319c5a1f84c02b0354e4551a177 SHA512 3dc900634efcf2c44819e8b1d256fc90c1fbc8efde3932bb840e8fbbd3a8a561d33109991bb031acb5fd08636b4911c00b3f46ec1c13e75527b6e080fca7706d
 MISC metadata.xml 519 BLAKE2B 12f727054a736e7232695462ac1bd97cf30d7c86b26b3ae8779d4306b9d1fe236f115f19d12396078f3bef29af891022ad97e810be3ff5d03f108f4b697eb703 SHA512 d7e99dc5571665d707b79fed4020f109fc09eb5b01952ac01dbe53bf5f6278b0e8c667cb99d00cccbd9ba79a26b7791d0aa780c8bf0b20f14cb3ddb7adb48e39
diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
index 44343e54c357..9c8ac171f4bf 100644
--- a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
+++ b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 libressl"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 	>=sys-libs/db-3.2:*
 	|| ( mail-filter/libmilter mail-mta/sendmail )"
 RDEPEND="${DEPEND}
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index 5814c057c9fb..459366cfec4e 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,7 +1,7 @@
 AUX spamdyke-4.3.0-gcc46.patch 237 BLAKE2B c60cfe8f6680b246268fd769c30eb81acf2d87a04ef08c73b70b7e9cdb1b052d1e9b5eac6c6160855a2d2b03852ed0726ab9251ec7306813141fedcef8560ac2 SHA512 3714399437215680057a2266added2c158f015da518f4e00021f7a1492c287fdf8db4875b0c5f7e242782cc40f676dca9f610931047a7d23f8bdd5876e629846
 DIST spamdyke-4.3.0.tgz 525399 BLAKE2B 46e3fd1508ea91d925675186ec2555e63a9d22d2fe07d9417fb5a151af76bae22676410dd6c648696621fe80d34c6e87f845b581a0db09b7b19f45e46d656f09 SHA512 6ba4b440e6d20e677c39439c78037ae3e2ff291bde7f48500a4e2eac8a3f17eeb7230b8ded7feee60c66f01b6aec2d259eb2d9a5794535860345957b1102d118
 DIST spamdyke-5.0.1.tgz 383720 BLAKE2B 5128ef128af1b136e9a78df6e38f727d06e51bae82cb604513f80458265eee03d5966655ae70544d6ba24f0719c35dcc9a153e245a8c2c7ef1f7dab3ee90e561 SHA512 a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
-EBUILD spamdyke-4.3.0-r1.ebuild 2215 BLAKE2B 8f7390a44a86a1a709291e73372a3f9f50070688f3cabd30b9392b2750f89f84b774aeed339592ecef61853339126fc197c4cf7207164c5568604f547b5b7d51 SHA512 9ed4ff5d87c2af68fe75941636df32e4e502d44bb997ffe0a392dcf4a5caad979aabdfabb3932e31292f850771c4e3be59686e61b9d8f761cee03dbce13f6229
-EBUILD spamdyke-4.3.0.ebuild 2148 BLAKE2B 099d6099cf2c7c99a0ad1ceecaf45d9d8915f1f81cae26c270f2a81a00331b5d78c29fde34691cf9d2146e97c2269943618d30c402a4a89625395826465ed8e9 SHA512 36be65f2dc8efcb42a8f4c00c36f1974d553ea7a36c3e93ee36b838b72ae1f2faed316bd4682af958e0b38e588477cf65aef4581abe4efc2a01b9f4f00fd45b0
-EBUILD spamdyke-5.0.1.ebuild 1994 BLAKE2B d40224facc1047e3e4209fb9ca4902243fe504db27a90333d95bf7ab51ddc50a23a9de7b8e8bc5ffaad4ec8d637ce07f1b4ab7ead62a27c397c8c7480a404886 SHA512 6f96e89dacb6987256150de1ad7ade3041a40561d77400816ab1c14b5cfde1eb4dc434aa85ee96029fe113efc4103fb30362e1be33bddfa7025d9a944287f643
+EBUILD spamdyke-4.3.0-r1.ebuild 2215 BLAKE2B df58eba17d1fca388545717ae5c0a362ae4f632f5953255a787c2f9ccb897d2092524620cb1bb6c65449286d8cd7a164e9a49c3a12ce97d8d31436940f3e4aa3 SHA512 f02d5e1038e98f170e43382883c6c293613e4111dfda5a81f22a20102038de6f672c4244af571d02a558496e77f2f34e8957893fe095a50954a0ea119d638c53
+EBUILD spamdyke-4.3.0.ebuild 2148 BLAKE2B 2bd0569c7dae493461da8b4b136b5524f88686ef14fd22b02f908cf56ac3de51288706d3f3cf634a6430feb8b06de41ccdb497e7cf37aabb1db9e0e79862cb63 SHA512 107d9bc05b9cb2edbc559463e2458538700e4f4428afe9c76c654677fc125e1d98b6c0f7421793dc627fa25f7a215ccbbc73554144682cb69929575080da1168
+EBUILD spamdyke-5.0.1.ebuild 1994 BLAKE2B 01fecf83c74b474f52c9fff6903c9f2f1124182b7c9c3629cd1fac9f8048115299cdf15fed0104135a352f00599d465238c32afc1de5ddb897793b2040ae2cb4 SHA512 21210746356b7cb995ad4e650b75b9ae9bbda1ee1f4a3bc8c09b94d983724002b530e730ccdd56a055478a4888383ebac7c0bb82c17caa2cbfb094b875b0aff0
 MISC metadata.xml 773 BLAKE2B 2792a130eb5180f3b9e6b23d97692cd24a6feb05ac5d260e753b27800c8e6182fbf5a8201a4b6f64ee6211b6fd0d805a1ed5c4c0316e58a0f143d5b002ea9fbc SHA512 a54127931e0e83ec0ef1ffbabbe39ed84502e9228cc6f13c0cf89dc7fdc33efd43e593a1a983930b86d0234f4bf18c44ef89d42e3ad614406adaab3150538f19
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
index a91c7403a927..02c6a579d924 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,8 +16,8 @@ IUSE="libressl +ssl"
 
 DEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)"
 RDEPEND="${DEPEND}
 	virtual/qmail"
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
index 14564e0a21c3..24eabfe02920 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}
 	virtual/qmail"
 
diff --git a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
index 9be8f12fbc65..c084bef63444 100644
--- a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
+++ b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,8 +16,8 @@ IUSE="libressl +ssl"
 
 DEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)"
 
 RDEPEND="