gentoo resync : 04.05.2021

26 files changed, 138 insertions, 78 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 7bd71895c365..faa28b29e3ad 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index c6138ef6b426..b1a5246b8569 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,5 +1,5 @@
 AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502acd6b3cf052a2c578a12120ce515ac640346cfb19135f83082dd2ff748adb95bfb9c519 SHA512 08c2d5db9e607bf583f0f7d4cfb0a8bbef68d19ae068f4e899cc620b199e2cea742e84d98ea79d14d09fc1f4635834140b8ae4c9f71f90d63c6b2fc3debd5ee6
 AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
 DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
-EBUILD gld-1.7-r4.ebuild 2049 BLAKE2B 8373f96ee3953781ad8df8c750bb7b38a1cef373a92fc468a7189537174e04be56126cb3ff6a847a2d571b080147fe90166b752997ff30766e41ba905742f729 SHA512 5f99a5bf91bd034e11b4b2c3b4dcb685441fa21dc0d835dac7d58724562c34dbcd9a7aced48d24c4b4f86499846934c7b3136f6283a2dc5cdf512023e923bc35
+EBUILD gld-1.7-r4.ebuild 1992 BLAKE2B 7c28849c1704a51fd9d48b7bc1b31755dd224af669cf301ad32b10d6d2925fcb44ff604114774fef03b2b33480442f75d1653f71d72c063937d961dc6fd55e69 SHA512 cd1c31163df141b85f119f562fb1d8d7225c5152f365212db7b28f0902fa88f70005c8efac4b6927c860b18d4f15da5edd5ccb1e0a5dfb75e47b49894818bb4a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/gld/gld-1.7-r4.ebuild b/mail-filter/gld/gld-1.7-r4.ebuild
index fb79d9897fc6..157778eaed62 100644
--- a/mail-filter/gld/gld-1.7-r4.ebuild
+++ b/mail-filter/gld/gld-1.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,11 +12,10 @@ SRC_URI="http://www.gasmi.net/down/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="libressl postgres"
+IUSE="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/libressl )
+	dev-libs/openssl:0=
 	!postgres? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:*[server] )"
 RDEPEND="${DEPEND}"
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 3f3ad613ad87..303beaf8480d 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,4 +1,3 @@
-AUX imapfilter-2.7.5-libressl.patch 806 BLAKE2B 4b0b40913d047f39b2faf23ebde782d5b34bf11f7e25243ea021c792d6a6854565e2df9924cd73b705d65a98dbe411677321dd848a11e929d8e32ada69937033 SHA512 ace3a8631dd23350a6a918bb2cd54d8eb3b9204c2f07d9fc64668216d0071a1acad76d2628936e0ac4a0b6e3ccc16299f17a8c833e866c3f346c27365a368051
 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
-EBUILD imapfilter-2.7.5.ebuild 1079 BLAKE2B 24f9fe64701889bb8484d1fcc62f849e419fa2cf33704380d3688c28ff78d656a88f4da61380ec2c1f2460f1f593abe87cbc9883c5c6cdc83a50e875954e13c1 SHA512 8d7c7e2b891b94b42869ef173313a384a41136db3d099a8c663ef44f19c5423fa944afd4a87553231128886d71e615668b3f6f0fb3e3e08b08b9d785f8e33d14
+EBUILD imapfilter-2.7.5.ebuild 964 BLAKE2B 2e559bbd69599a6b2324a301d5b96ea6fae09722f9e48579d736862bdad85bf71cad0535599e3769b63ef76d1719fedf80e1f3ec4105a52ba42243474810e1dd SHA512 bfaf9de115ec289be6fe523cf675747e5db9bfba190c8a1ce8b72ca3dad4175ccc143da90f579dc205231dec41bdc5d18f5d9ef7e5d252f771f178898e714581
 MISC metadata.xml 249 BLAKE2B 8f4404564610b1fc4705b073c963909d882aa72717e386d0ddaa11f4a58ea4fedb0505711baf498cb59107d8486b890eb337d56fad641a0c656d4553fc0139fd SHA512 8fb3a6309758c23abad3fd09a007212a6f5c0beb6d03d3c7d94f5fc8b8818d5cbddd55ef8fbe25700eb11dce04486295ddcc413a3fe568b5ba620b0b5fe0b0a6
diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
deleted file mode 100644
index fb665f852710..000000000000
--- a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 30 Dec 2020 06:48:40 +0300
-Subject: [PATCH] Fix build with LibreSSL
-
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/socket.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/socket.c b/src/socket.c
-index aa2ef4f..fa75de4 100644
---- a/src/socket.c
-+++ b/src/socket.c
-@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
- 		goto fail;
- 
- 	if (get_option_boolean("hostnames")) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_set_hostflags(ssn->sslconn,
- 		    X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
- 		if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
--- 
-2.30.0
-
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
index 7961612d5b7c..627b81140929 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
@@ -15,21 +15,16 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-IUSE="libressl"
-
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	dev-libs/libpcre
 	${LUA_DEPS}"
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS NEWS README samples/*"
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
 src_prepare() {
 	default
 	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index ac385a210da2..de17e81de46b 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,4 +1,5 @@
 AUX libsrs_alt-1.0-ftime.patch 313 BLAKE2B f634abd1e527a199374fc55bf84927c5e38730f79d1b13f7cb0199ce338f825902df662248fa99bb3baf4c4c07117031b52e3e986a7ad0b2816ca28cfe7601b2 SHA512 2566c9b7e9187a243f5eb6b4b67d649bc081538350f647f1afa69812892a8ff8ef889068ccb73f019cf287e9e6ae3999bc62b2003d197963606a4c30ebecd214
+AUX libsrs_alt-1.0-link-fix.patch 748 BLAKE2B ebfbdc88ff9aab28aeb3cf7db06f15f61147048abb69667c2cd3ea4d5138af322cc5fe92924b18e16a856f4b5189816cc3b57341df5c3377f5949562745a2328 SHA512 89a477ca6f7f8cdac5f4cec83c144a62eccded6ee8d4411e30c1faec69a202bb65bc04e3cc9b590f41601207144996b12617d112c59d4cdcd37a7841ed335256
 DIST libsrs_alt-1.0.tar.bz2 237984 BLAKE2B e55b01f28fdf240ccf2fea8b43e930bc02a78bfb82a2b9fe573c1c09e0839f89a0bdb51844dae237ed66e4bda925b5b3b93842462987e7f300f6f5d763adf382 SHA512 1e15f8b12c2174c8ee085fc5adae4cb267f69dd5656066d33af106ad4940769552e04cfc67af4ad9650eece2519c03ef383290f36a22df7d9e03fa2186262404
-EBUILD libsrs_alt-1.0-r1.ebuild 1162 BLAKE2B abe2d3edc71617faaab4ab4dbe310c3697d8f83d6a8dd28791e48258697bd8eb763d6f817be09f03d02e2ea546ee29636df05c1a5026d9108ec09064527f61e3 SHA512 215d4b7bc55a3e36b682b7dbb2a061e0eeef00922a8db02a875f19ce0e07ac8e547722e51c94d8614363a0329d965f6268f009e6f1da5a9b1d6b06fc1547324d
+EBUILD libsrs_alt-1.0-r1.ebuild 1204 BLAKE2B ef43a5c832d0f86c95a429e408ca59f845198fb2151007ed735d5675da795aa996126ffbab682890596e7b7772f0101909230b1ecf6b1a4f7242a8aeb97b4c6f SHA512 bfb6056cf5149443442d0afe52133c1ea1ca59eee7fd57f6480f26c832ac13e40e7f7b9712d9465b3e08bf6a4c5e1875461297dce2232ac490533d4febaf831b
 MISC metadata.xml 506 BLAKE2B 85745c6fffc19e1064f5d2bde90dbe56f5bdd674d4189630ccbe3d012e505dec487878097ed83d031e79e46478e7f0281f5edda1a94057671bcc051ca202025a SHA512 6a6096ee6f1895de958b8167e1a9632dc6901b16908d94af86932aead64fbc1690ffd300d8cc97792d46201e64cb20d6696e232e9d796e33fe4484e808e111ee
diff --git a/mail-filter/libsrs_alt/files/libsrs_alt-1.0-link-fix.patch b/mail-filter/libsrs_alt/files/libsrs_alt-1.0-link-fix.patch
new file mode 100644
index 000000000000..d2e37c07d625
--- /dev/null
+++ b/mail-filter/libsrs_alt/files/libsrs_alt-1.0-link-fix.patch
@@ -0,0 +1,32 @@
+From 5fe95ee063c1f29037cdaacd2d96aea4759b57c1 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 08:28:11 -0700
+Subject: [PATCH] build: Correctly use .la files and LDADD.
+
+---
+ Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 46de31a..5bdf9d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,11 @@
+ SUBDIRS = lib src .
+ EXTRA_DIST = MTAs
+ 
+-LDADD = lib/libcompat.a
+-
+ bin_PROGRAMS = srs
+ noinst_PROGRAMS = test
+ 
+ test_SOURCES = test.c
+-test_LDFLAGS = src/.libs/libsrs_alt.a
++test_LDADD = lib/libcompat.la src/libsrs_alt.la
+ 
+ srs_SOURCES = srs.c
+-srs_LDFLAGS = src/.libs/libsrs_alt.a
++srs_LDADD = lib/libcompat.la src/libsrs_alt.la
+-- 
+2.26.3
+
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
index ad3fc51b0e44..d40ae60fca99 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ RDEPEND="!dev-perl/Mail-SRS"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-ftime.patch
+	eapply "${FILESDIR}"/${P}-link-fix.patch
 
 	# add missing header
 	sed -i -e '/timeb.h>/ a #include <stdlib.h>' test.c
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 9f3c540c9598..4e7b75facc13 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -2,5 +2,5 @@ AUX 0.8.4-fix-parallel-build.patch 4549 BLAKE2B ed49f301046c489538d9e4e5544cf8d6
 AUX rcfile.example1 4010 BLAKE2B 83f425417e6c270ace4198bd6f4d4b5ecd1993a5926fa73cc2233986c5a3cfc55946114f535a09ebcd9bb6289ee8db22af2a9b3bf71c35ef71d6764275862b85 SHA512 875d926b525610c129dcbbba0cdaa177b4ea1a004eab853fc1f5f507e7e853923e7dfca58147b65cd403b561b85e3a9acf0da9101b344718f3ae732fae91038f
 AUX rcfile.example2 4554 BLAKE2B f5ea7e21821042e37506c6b43bb8aa0a8e3aa5872c6b24d14ce3e9b920a614590a290614e70e63983dc3438523d3ced08cdcb0820da1e9c047c621d8a1db669a SHA512 d58be80921e3372c9be79d1774a27106a113e710e4d1ee20a60f9ac2d6e8db86dd360df59801ba1c27c46069a341625069fcb36559f9d4c9847656f395f61f21
 DIST mailfilter-0.8.4.tar.gz 424789 BLAKE2B 3ffee855a52b6d85ca7241ab55fd31093ff7dad218b37d2caeaf61dbe0a6ce14a283a60f6bee33409363e516902d8024ec4e5008041ddc28b48d7fc1313d5de3 SHA512 d6cd3399240f60020bf17f460376bfa73132e0714adf1e9b34e2993367440eba28d3cb8ef20b997b1ecf02419f69b761f704598641222d32b3aefdb8a96930e7
-EBUILD mailfilter-0.8.4.ebuild 679 BLAKE2B 0a2118ab1a38866d1428a0396b5e420486a4ee57e67a66d56c67d48eafbfb0b3903ef48d6467649e4e653f6f960bc1ff1dfaa1f6ef25ea1da8ab56da043a75df SHA512 46297eec51a0e51601c369392c59780330316aa5356155dda50233591e3896a7fa81629cfd4894953d7e8213da5cf9fee61a2a70773bad641da41063aa04c7df
+EBUILD mailfilter-0.8.4.ebuild 618 BLAKE2B ed957402454a75f72de927bc7cbb5324794b52d5f092aaa43cceddb5e6bf0b9a01885e4aec25011e942f50d0474baa0c4ab30dc4d02cfaff90630ab4af48075d SHA512 f852288ffad5a16743d0500cbd4211cb144a510a72853743072aaa13cfcf29800567b6b392aa71470814bab479cff85d4b2b64037fbf3d92174935a696a13331
 MISC metadata.xml 247 BLAKE2B 7d481b0cede6e8bdaa87e4e460a2e9c022147ff75e58fa9f0c3881cd10a0feb7210be0f15ad4359c284db38388f74fe7308e9a415b8c85537adb0afbd867ef5d SHA512 75a4c0de2951d0542c787fc15e0b22ae7af87f391bcbb5416b0bd984a9ea6f1d384de28227dae6718a75b0f3826d24adec3192d0d8aec2b9e27b92defc1b4423
diff --git a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
index b84a6c85d78c..705603c899b0 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,12 +10,11 @@ SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="libressl +ssl"
+IUSE="+ssl"
 
 DEPEND="sys-devel/flex
 	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
+		dev-libs/openssl:0=
 )"
 
 RDEPEND=""
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 9bc961408a65..5ad277b472ab 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -5,5 +5,5 @@ AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad
 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-r26.ebuild 8205 BLAKE2B fb5503497408f7908554aef889bfec04c2a43efe7b40f91cbf8291faca9dd94939e83c5bf30e0bcfb61db0a0597518ee0dc7aeda1f070baa48fe2d624da0bb41 SHA512 acdb40e4fc7f4c145ad7e38a00845fcc16f46952f1b5f5e6e8468c8f8cd99467c4715c0bf5013987be6d9b6a322d7201f00888c8a1ceb8d5b1ddfb7844a19353
+EBUILD opendkim-2.10.3-r26.ebuild 8144 BLAKE2B f8bb63919f8bbebd2f5dd1296ddb447d1a1b5bb06901f75cab008f1a760ba34656f7d56686d5d89b951466c0cb8465ca4168f46dc10af17ca649d683e83187d1 SHA512 ceaef4b5ed79471fe761a02103877ef24c24077c53ecc91e88045a366030d1a5c878d81fe7920a7358348599e312db7a7ec3a115d1b756d6672e52b10a45351f
 MISC metadata.xml 1956 BLAKE2B 2f2af8f3fe2b66d08b72d55b9c1b3c73e3016e083466539827b5c3e02364605229972407e6953bd63d1d027310a2e5f4f8b5ba12cfeba86c5a578e437f42a963 SHA512 92239f5f0bab0cd81abe7f10bac347398b88d183cf1551076e2dcfa2000bfb192f3985779201c10be9834c51807f1bc4a5ef0d37773565ed90a265bdbc78e104
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
index e2394f1e21f5..d678d4120cc4 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
 LICENSE="BSD GPL-2 Sendmail-Open-Source"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
+IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
 
 BDEPEND="acct-user/opendkim
 	test? ( ${LUA_DEPS} )"
@@ -24,8 +24,7 @@ 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= )
+		dev-libs/openssl:0=
 	)
 	berkdb? ( >=sys-libs/db-3.2:* )
 	opendbx? ( >=dev-db/opendbx-1.4.0 )
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 9054da571d6d..fba7d6ea09a2 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -4,5 +4,7 @@ AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664
 AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
+DIST opendmarc-1.4.1.1.tar.gz 426618 BLAKE2B a74b2623bc35abb5c34f8d1eff737c71af8f5cadfd6a5d0a85adb6536efd2958118f9da25dd9b736dc24563221968c4ee1ff99b101fa30909764563bda2a8d88 SHA512 ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6
 EBUILD opendmarc-1.3.3.ebuild 1886 BLAKE2B d94da2b2c301f7b208dd43272539ee93758ff01b6ac583f9f6a092a8582492c6a5edb57a305380b5169a76e9c7ba5d32d8945535590406f1bd8d6ca90f745f57 SHA512 d8106ffa6ef62c24ad9503a499c8fe9bc1c84320b47a3eb84d59421f3855de70054b7cfc394d66f0260a51aab40bcc40639ec0c8c694503cc62c9b3b0afd14ea
+EBUILD opendmarc-1.4.1.1.ebuild 1628 BLAKE2B 48318219c649ffffe5002f01137bd41c0aac72fd69c4013185db8b1adcda1850a767e08a108073f9b5667954854666a45794c89e4be0471e6fbfabcfa4007c98 SHA512 5209b9da1408086f66c401ae3457f0184de5e07c631042f19c5e035d91f9baada2a8d2878c0afcebc7f2a21a2284d7d5053e2455d4ffda4e3669e51b583bcf95
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1.ebuild
new file mode 100644
index 000000000000..793fac6ee9b6
--- /dev/null
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib systemd
+
+DESCRIPTION="Open source DMARC implementation"
+HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
+SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="spf +reports static-libs"
+
+DEPEND="reports? ( dev-perl/DBI )
+	|| ( mail-filter/libmilter mail-mta/sendmail )"
+RDEPEND="${DEPEND}
+	acct-user/opendmarc
+	reports? (
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/Switch
+	)
+	spf? ( mail-filter/libspf2 )"
+
+S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	if use !reports ; then
+		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with spf) \
+		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+
+	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
+	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	dodir /etc/opendmarc
+
+	# create config file
+	sed \
+		-e 's:^# UserID .*$:UserID opendmarc:' \
+		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+		-e '/^# Socket /s:^# ::' \
+		"${S}"/opendmarc/opendmarc.conf.sample \
+		> "${ED}"/etc/opendmarc/opendmarc.conf \
+		|| die
+}
diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index cea13966affc..0e7e56b6dfe2 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,4 +1,4 @@
 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 1119 BLAKE2B 9eac6b7ee2b4ef9b8036e2c8648ce128cbe06fb1d755f58c7e54b128b476721847187d46a5eaf1f0709d37074248c9a0246bf1e0d7f4afe75cef40f2ad6f4c36 SHA512 360d89611f62aa21e75de05d3d4efff4aabe1acc922003c40b552412bbc4a979d1c98ee7c93c10bc52da968dd7b1ecc27a55060a2d89a48be0734ada31c98cb6
+EBUILD popfile-1.1.3-r1.ebuild 1061 BLAKE2B a2e05050da24674ddf86a57ee8989249e4474b3b0131c9191890d7ecec332fb141c57ce1d9c0330d5d79b1a950cd4bdd14e1e48c5753c9df2d3f891214ec0140 SHA512 1039a1b6941fdca5fd07160bf9527ec49b3facf62cdde2a6f8360ad58398da72d1b76e917b113601f4fde8ed7c3ab471871725fb2bf7e8ab40e1c4b2524a3b46
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/popfile/popfile-1.1.3-r1.ebuild b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
index 3e6c505f9fde..83d9ec1209ff 100644
--- a/mail-filter/popfile/popfile-1.1.3-r1.ebuild
+++ b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://getpopfile.org/downloads/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="cjk ipv6 libressl mysql ssl xmlrpc"
+IUSE="cjk ipv6 mysql ssl xmlrpc"
 
 RDEPEND="virtual/perl-Digest-MD5
 	virtual/perl-MIME-Base64
@@ -25,8 +25,7 @@ RDEPEND="virtual/perl-Digest-MD5
 		dev-perl/Text-Kakasi )
 	mysql? ( dev-perl/DBD-mysql	)
 	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ssl? ( !libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+	ssl? ( dev-libs/openssl:0
 		dev-perl/IO-Socket-SSL
 		dev-perl/Net-SSLeay )
 	xmlrpc? ( dev-perl/PlRPC )"
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index f57f50196282..dbf93a581cad 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -10,7 +10,7 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
-EBUILD rspamd-2.6-r100.ebuild 2744 BLAKE2B 2b7b8757bafa478ee1e024585b1b9865753bde923144a39fca8d5bda996891db1e9e141a9d6cb6ee5c9d2e905f83fdd0905b75b692750797cb1789cedf47ae2e SHA512 8bf9154733f4e394530447dba1bbd3c67b6ede15d400c36ec0657b851f074274bcbbf8e564ca506567579ce9ec3c061139c3eafd9157d3235da7e717c2251ccf
-EBUILD rspamd-2.7-r100.ebuild 2744 BLAKE2B aed01d2331baa44011232783865fcbe1c8871aa4dd3a3cec2532d6f6cb9157bc4b9a063824550ca066401bf1b22bd7e1c30be3fc18828847d5d4464fcf6da7c3 SHA512 1efd398b58dd60820cda605c4d43d18ebf5ff103d086fd901d8d189d9c310eb242599d74b12155b8f60318fe09cd65aff200ef833fb1d8406c2bd421a5dafe95
-EBUILD rspamd-9999.ebuild 2746 BLAKE2B 882abc5ea6b55c70fde959e3d2f130ee4292dafa410002211cc614c9df12e04b7a163eb3205ca51afdc72d5ce139d557d7c4952be4edf3801e91369ce720d6c2 SHA512 91f4436ef16115741acdaf17484408fedb28039f5915c156de4d96831d87a270137bc4532a98e0585a2bd7551b6aa5973ba7c0c48142549d5f7db453919198f3
+EBUILD rspamd-2.6-r100.ebuild 2684 BLAKE2B 54feff0525bf9f5372b31a841ec7aa7ef9bbf3dc9fd1edd05977bcecbb12e1157a7919c8856ae7eb19e6b083237876c92b565fcbd3fa2d110502117c91b3e6dc SHA512 a856e0d28f8d0a70b9982a622750088fe17e3407a14420a0ada875963ab8b9df1fa025b43c58fdfa88bb9d4033384c7ab2d448be193aa4d98906bcac2fae2f57
+EBUILD rspamd-2.7-r100.ebuild 2684 BLAKE2B 5127e58ec475a932564fd410526af4bcac2903b43eb31245399cd83b556bf955e5de73c437c9bb642b8a0f2abab66c5da3f0ee810ddb2a91859be96b28d44c28 SHA512 a93d789d88a46971b5b01a5681467e1c89af1f967848babee32987339f1ff575ed9b79811281e6a91ae52a8ecdd600202060273de1ee2594c1885e20ec801d07
+EBUILD rspamd-9999.ebuild 2686 BLAKE2B ee70e64b6694ad23e5f5840069a940862d6f786ea700210c3ebba3ae1bb038469cc778be6528dd909973a1517107ae086a3619a2e918ba7c9011af57d8848d34 SHA512 e7807b93797558cbd636c26cfc2073beff6ff97521fef79a5a76bba15043d639be317aad123f00722d1cc53ebc6587647b34de49dda05a6b57a9db48a01d0fd4
 MISC metadata.xml 683 BLAKE2B 88aae3128d411106650ed6fc0558c5b36419fffc01a6c09a0b23e85bdc6f4a02fa8f086f794dec814a78e40956f0ca3256de5700574ff4547309b868869fbb16 SHA512 a0367a901b8294cab8e725dce17ce5e9c9195aa9a62a1b5925b213875e5706509973d9d7bd2ee3057ee9892a05132f868f81cf2a0193f9fdc5eb9235c09093aa
diff --git a/mail-filter/rspamd/rspamd-2.6-r100.ebuild b/mail-filter/rspamd/rspamd-2.6-r100.ebuild
index d6a966d66b76..707adc9a3f4a 100644
--- a/mail-filter/rspamd/rspamd-2.6-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r100.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	jit? ( lua_single_target_luajit )"
@@ -45,8 +45,7 @@ RDEPEND="${LUA_DEPS}
 	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist]
 	pcre2? ( dev-libs/libpcre2[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/rspamd/rspamd-2.7-r100.ebuild b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
index f6efcf40a61a..80a28df9ec2b 100644
--- a/mail-filter/rspamd/rspamd-2.7-r100.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r100.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	jit? ( lua_single_target_luajit )"
@@ -45,8 +45,7 @@ RDEPEND="${LUA_DEPS}
 	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist]
 	pcre2? ( dev-libs/libpcre2[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 0ba250193310..5ff19a2efa70 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	jit? ( lua_single_target_luajit )"
@@ -45,8 +45,7 @@ RDEPEND="${LUA_DEPS}
 	)
 	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
 	jemalloc? ( dev-libs/jemalloc )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist]
 	pcre2? ( dev-libs/libpcre2[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 4efc7d11a7cb..d3cf6939ca3b 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -8,6 +8,6 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403621aad010100535cc1b3ef4b2e18592cad94762bb2e689a904befa319fe40ac2cbed8ab7592ca506134b71f5d5d9d43ed30 SHA512 cb2902fcdd37465b789abd4a45196787a90b90e90678b20a264799587134d992f7daa1a5bdd06261bf40dacb2c164a1fbc3a10986b6265f04e57ee42a3896bfe
 DIST Mail-SpamAssassin-3.4.5.tar.bz2 6167088 BLAKE2B d99c9e40f6735328b5300f010f248d35a8a8dcd3a3692a8db909234b8de3a5e432d004cf09f7ddb8b2ae82144525ce1ab25d89df92b621d8e119e2128e59cce6 SHA512 46096019ef3d2b6dadb7af0d076c22526786cccb669cd4bed131b64fa935863630ca9f3e78277bebba0ed75099be9fbce97a30a6478ed84093896a1ad3d8387a
 DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6da70c7b846737513bd4d6d2d410872c58ab7cbe7ade6a109a71bdbb6dbaf7aee8eb48520e7de929b27e83546401f3692aeb0c3 SHA512 bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593
-EBUILD spamassassin-3.4.5.ebuild 9849 BLAKE2B e2b647408448f49909bde4598302f90b822529fef9892eabfe7a1e9c6cbaead4a28b88918e7b58aeeb4c80442242adc0930d6ba750656e9b849c04b0db367a50 SHA512 f9263137075097325d173cfcc5aac3e6bdb174d7e6c04178a751503c682d55706819eebfa05e7f80c18b0c33be0d6bc36983f195bb95025323fd08a4fb37ecc0
-EBUILD spamassassin-3.4.6.ebuild 9856 BLAKE2B 131cd51392a558d7bc4dd53241f93a171e0301eec573ac00540468221feaad0ac4a45fb0a37709a667ca93924e8ff3691ee31e6b72534f0ce968d0f6f73195bc SHA512 c97246bf03dda5ac38836cdf693a8b7995e614fd1b3328ba6d09887e3ac2b81824ed18f729e929462e678c78bca850728e9c2022e4d6b64880b7707194e0723d
+EBUILD spamassassin-3.4.5.ebuild 9791 BLAKE2B 93a079f7325ce4e08a0628a2ee1922140fabdd0d435b5b44d15b7ad1a05801be6eeafa173a75cc732ade69190ebc9ebba81851ac160efc97e1a9b81f63514856 SHA512 4836602107901a744adcce03a8f4c47ba0397940ff2dd78696b4387ef51de51786db948fb57163d50833866fbc2b193193c33cabedced6f93478934f3088c57a
+EBUILD spamassassin-3.4.6.ebuild 9798 BLAKE2B b83f70d5cf4d0e8756a5faf4a77fded1623ecf81eaae565a687e274ec9c4b91f777bddf02f30b41e186d598f07f67269a429c41a34b653a51a205ed963689b4d SHA512 f0c68aa2ede16ee1ae3dfd8a65d1262b54d5f6078028b13bd94f95396e06df41a16301d490a70d301e9674fe6d836c7d4e325368da3d612c15be55e8a5fbb273
 MISC metadata.xml 609 BLAKE2B 81b169e5c10732a699a07de2aa6327aed5a0c1c8ef44eb6934bd7c37bfa5c80f2f433ade2998a3cd57da68c1b773229ed8aeb7b64c1ed2d58c7ab529d2649b72 SHA512 e0ad537ae894ca5ab2585d0b5dd20357325c409a4497fba096c6b6cbc88cd99fb937af1085c59e164d510a5d5033c6fa511fadc4ab77b1fa2a5bb6b2c514061d
diff --git a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
index 41d4874d323d..f8162b0b210a 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.5.ebuild
@@ -14,7 +14,7 @@ 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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
@@ -31,8 +31,7 @@ REQDEPEND="acct-user/spamd
 	virtual/perl-IO-Zlib
 	virtual/perl-Time-HiRes
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0=
 	)"
 
 # SpamAssassin doesn't use libwww-perl except as a fallback for when
diff --git a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
index 732579b87577..f052cccd1aea 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.6.ebuild
@@ -14,7 +14,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
@@ -31,8 +31,7 @@ REQDEPEND="acct-user/spamd
 	virtual/perl-IO-Zlib
 	virtual/perl-Time-HiRes
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
+		dev-libs/openssl:0=
 	)"
 
 # SpamAssassin doesn't use libwww-perl except as a fallback for when
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index 5d68c2ae3ee3..47a99ea5f876 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,3 +1,3 @@
 DIST spamdyke-5.0.1.tgz 383720 BLAKE2B 5128ef128af1b136e9a78df6e38f727d06e51bae82cb604513f80458265eee03d5966655ae70544d6ba24f0719c35dcc9a153e245a8c2c7ef1f7dab3ee90e561 SHA512 a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
-EBUILD spamdyke-5.0.1.ebuild 1987 BLAKE2B f3ee2cd38b11a4373480e029afccf72f1f1c4bb4a0d8d8f6e3a449c86c11647e7e0e7ac628ac9170e6324691a5a7ca0b6e043c017fa50812bf68968a3987b19f SHA512 333d3a2531797426b63dc270ee2e90baa354aceb047db29e416b297242f0e5c1ee9b99a5b550f09cab95c2f39fa17cd03e081c4cd75cfeb653a8fc3fbd0bbc9d
+EBUILD spamdyke-5.0.1.ebuild 1927 BLAKE2B 740d3d2d5f3378a96938d5b3438a0711f587b560bdfb00d20e303a09e67b6b59bbc194bd633a37cb05fcf23b2f8704c7f5503093c35fc1b58072b9c618e17a1f SHA512 0a8570c3123bbfc9f2b0acd4d2d8fd2a3bc739469a234860da30385d9fd4f704ddd571dd2ef9f4cdac2ea132ba9f2e8e15d261a647ab2296f8abe704f219fc7d
 MISC metadata.xml 699 BLAKE2B 1de53fdcbf9aaab78f797ea694ac050237d2b76de346684781caf994756abd8f6411c090737eb4da8aee3da6570545fa91811a77f3beae0592bb4fc61232a22e SHA512 2a154b87869e0b058be083c0930843ca3d8d524847dfede27f5499517867261756d056c114b864eaa545d3a5fac4e42180f2e4eb2242e825bbddf8effd11ff81
diff --git a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
index bf323d2e82e2..27c11ebaf741 100644
--- a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
+++ b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
@@ -12,12 +12,11 @@ SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl +ssl"
+IUSE="+ssl"
 
 DEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)"
 
 RDEPEND="