22 files changed, 73 insertions, 152 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 6db11a21e663..e5d3f00593d6 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index e3b9fa754b37..1c679317e598 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -4,5 +4,5 @@ AUX frox-0.7.18-config.patch 1960 BLAKE2B a6ca1b8bd15f39a3dc5b3b10cb4a578447ce30
 AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df6dd978f84490f48e102e9fcc3efbd77b3cbf09071ca7c1dcf15bb20cd149c576680d7705beb4c8814bc15e8afbc44 SHA512 99c2157206f1cf14bb5bef5b2fef656c4322077363d531c2798091d871e1931a81df8dd5a21f9b57ecba22c5379ad72ddf36c10d78e9efcdfee7e1e29fbf6108
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
-EBUILD frox-0.7.18-r6.ebuild 2006 BLAKE2B 56ebe1a0d7bc5b1b1304808a46c2ef07d295d332f01f621101fdb38d816352bd104a58d2b0b43eead8ca5ec89322bd2b7c8de6bd7bdc9485bda1f55ddd515c6f SHA512 9d2cc56744138ad30fecf70868f0c839f6b1f3f29288127e47d620a072ec894e62461b80df254c2cbec810d4abe8d919c20384143f5daa0acad1d3fea8d6eca3
+EBUILD frox-0.7.18-r6.ebuild 1946 BLAKE2B ba8d7bd6cf4ffa8153d64bddee6f582a6406d24f05a44a0d53edadfa2b5e8768f932388400880426fff76325e465f699b519b475bf0b8e13c992bc657b8918b1 SHA512 f2e0d2e56e0542d0cb8c8870c9800a2433f1a821849a09d147857972dbaebab15bbc145cf2aa9a2ec2d999c2a12b5235f06f08d81228e1ab5ab30c1d1173391a
 MISC metadata.xml 623 BLAKE2B fe1b6aaccdc85accf5b392e79b85e18233eee2e86c6f2c60284ca95805f107408ac9adc1e56900390b75583c86bccd322deb6cdd0bab773e35c896b4d3e04511 SHA512 62a239cfde0893981edef12942251ea54fd4260254e32b726ff9b424f57b37795cd3b188005f1bc1b4fa42c99c89c5eaa63b0239d34b32dd7270ea336f34e8b1
diff --git a/net-ftp/frox/frox-0.7.18-r6.ebuild b/net-ftp/frox/frox-0.7.18-r6.ebuild
index 972f0fdb1a21..680bcbd95232 100644
--- a/net-ftp/frox/frox-0.7.18-r6.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r6.ebuild
@@ -11,13 +11,13 @@ HOMEPAGE="http://frox.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="clamav libressl ssl transparent"
+IUSE="clamav ssl transparent"
 
 DEPEND="
 	clamav? ( >=app-antivirus/clamav-0.80 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl:0= ) )
+		dev-libs/openssl:0
+	)
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 "
 RDEPEND="${DEPEND}"
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index c9529c42db36..01ee3752d144 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,5 @@
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
-EBUILD ftp-0.17.23.0.2.1.ebuild 1555 BLAKE2B cf68fb465b8e2ca62bf6a3fbca7e7338ba1d6afa9ac69ae810fb2d70af1e5f8ca0622c76765f152aa3126fea3401f96eafa669ed6c6da1effd5a809cccaa009b SHA512 9d57ecf6f71164d18bca9c565e844ef7088ead5b36cd61384295297a9f2e89b9ddc1bfe62056d389ca59acd7acd9ed56c39d1cbef3510d96dc0b77ba46ea5c33
+EBUILD ftp-0.17.23.0.2.1.ebuild 1495 BLAKE2B aceff27473bba089c3cb5d92b3c98563bd40ce959e1be4f60b5558b212d4abea68faf37520e6a5f1b7c329e62d6c62b15d8fb94dfd50300c433822a64cd9b07a SHA512 dbb1dc09a22f6825c6d4bd354124084e2f6194b56aac60f7d3637d48a2280efd73fe8d2e1e932229d6cdb4a13ed5889086341419c5dbd188683952127a5dd98a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index fce7464edfdc..875892a83db6 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -20,14 +20,14 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6 libressl readline ssl"
+IUSE="ipv6 readline ssl"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.2:=
 	readline? ( sys-libs/readline:0= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
+		dev-libs/openssl:0=
+	)
 "
 DEPEND="${RDEPEND}"
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 7c8a5ddb43e8..c0ae7d01ebba 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -2,5 +2,5 @@ AUX gftp-2.0.19-desktop.patch 837 BLAKE2B a9199ab915aa43dfc9138066da05524020a443
 AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 BLAKE2B 4733b21dae4e801ac9b22c0bf460f0de23ffcc95ca184035cb19ca331e84a0deba9a8d22c8aa67b279cb3b92f9706a08bede3e374659b296598ad5297b3a0e47 SHA512 4ee09d50955fc91dea33bb71d8bd65a7c481f02c7bdf6dce53bbd630307c2ab898b533babe7597b1e434d0defdde3be6e145c0c5344d21e8a23c1537eb5f2bbf
 AUX gftp-2.0.19-glibc-2.30.patch 908 BLAKE2B 3bea073b519b2fe64571ef58a2bbb10b978ad7615ef7cbcce8448eff97db186f21153171e405181f275f73a0cfc274f9d048030da2ae18b9f5e535b93626444f SHA512 ec024c09e06874ac955b9fccae3fb95b05ecab6da186a9e28c4802dbc3f14d95d32d44dc60e7152b1560517a8971f61859aa715b7802ebe0884823112ab68fdc
 DIST gftp-2.0.19.tar.bz2 1687167 BLAKE2B b7cd5409c7dfe4672a383417554c39a848b9afa341de498eea76bd02a2099559f14d7d0ceebe13d52842c311a4b242a0d558aa017dd7062a3369a7c2c3af19a0 SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172
-EBUILD gftp-2.0.19-r3.ebuild 1002 BLAKE2B bea749f75d98f7a7f5db3b9b4f6a79aee89c4bfea076a9e9ded89f01a7dd1b8b3bd935c29a999918a965ad3aa3c443e9239274ccaf08bed574f30ac932f6fa5c SHA512 5f3c25ac0cac0e32a65b8c1f43ce0bd0780601a69a042b69577a95fde7a2f8f4cc7205d0345de1de6e0424382a44d17e39422c648e85cafd685bd079c3edef10
+EBUILD gftp-2.0.19-r3.ebuild 942 BLAKE2B 2c51f3293cea0ac7e91ac850aeaeec35f214ae69cc015d6562098b115e4405e03144c0640f2a56094564bead755a25aab828a5f29cd0b3b660adbf3804b17bd8 SHA512 db78026e23ec6ac0657c0a1fe7b754cea58cbc37a2844d1ed798883f9275239d4ebad476c501e737f5bdaa453468fa50f192b4184489cc8f1e2074d1133e661c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index a79b3a00b48c..dbc107fb71fc 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.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=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gftp.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk libressl ssl"
+IUSE="gtk ssl"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -20,8 +20,8 @@ RDEPEND="
 	sys-libs/readline:0
 	gtk? ( x11-libs/gtk+:2 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
+		dev-libs/openssl:0=
+	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 92a2b621572d..4392af3a802e 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -9,8 +9,7 @@ AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1
 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
-AUX lftp-4.9.2-libressl.patch 1393 BLAKE2B fb014efb50ceb0ad1b0f58c8ebc70c43b474552f3e9f084a8d40e178c4d5dbf2b830fa987ac52a7249b790dfe8f84ed39f7676eedc66612acb2a83e3599bf952 SHA512 f427059a2047d817a1b0eab03cc861d78538a5bde7686ff9bf6955f7965f27b15f6b8ff5299fe821298e716d440b16f0fb61b922badf233fa88ba725a0a48396
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2.ebuild 2684 BLAKE2B 5181ba9e9737f23ca780e180a65fb0b82e4c1610f1d4c6ea51abae92fae6cdc3a3d1c5fe42cb01baefddd924e921964d457109d3975ff62246ec7e4d42a95eb2 SHA512 228e327e4885e23e0185521e843a4e5648fd6570081e16f2b44fa3593a195ad7d0755d31146a4d09de0cba79e3eb2570fca0b382fd47e5ae12e9531868164965
-EBUILD lftp-9999.ebuild 2438 BLAKE2B e96329335ad785af88182d486ba295a750c565136c41ebaa83f59b5430bf70de4f40f80d4abc79e68dd0b5b8d60e0ad8152c0e6ed6f119f687f95cfc6db783a1 SHA512 3b5a771d1be09c8b010ddc47cf2aa791a2924c464272feb7183a6f7da457fb0d6b7e2667828d41c405a47b93a5eb69b03616579cf0c501354719de5b35ad8f5a
+EBUILD lftp-4.9.2.ebuild 2575 BLAKE2B 0b9a80e99149172fc5fb8f5fe5da36b55c93dd920ab0c876b896b82be66963b4c0bf10319055cb135aba79a9a9cb720ba1a9d784397ea1b1dafe4c0ea96a59d7 SHA512 3a5ff603d1a3fdc342eb15e456af1c363a2358867e460bab04343f08025b9f9c32f8603de746997a6650563db7b1843bf9c93d6b3b4eec4a294d9a74277bbd6d
+EBUILD lftp-9999.ebuild 2371 BLAKE2B 24a9bb29753bae1cfc704ba0708932f04f46ce543e90da7107f19eeca0efd76a1de5d25a050808f2ef659f95b64e66068c8f95dd1750dc1394c8721be7346fc0 SHA512 945ca3ae74adb6837d63f5bc4df57dff88a27bbefeb4f6e1fe8ccf3c06309c1d0b2c42f752dd56f4a4561055d9c5daef1d47507423c8f6a27c08b834153d7068
 MISC metadata.xml 592 BLAKE2B 87ed7484a2723b3f46c358e839930919c22b296c86e44b492136c553150b040b903da2361a71eeecd8f4a7b077389988b9f185fa222f6559ebf65c44609514f4 SHA512 86dc525bb6734b4bf7995df33ef4f8027b01263afa9f827916224abeff84a04079dc50a62aa8c93c55c588d94669fcd6eee17984ef4b8913aa777e9f03a6e1ed
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
deleted file mode 100644
index 51de51f780dd..000000000000
--- a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch
-
-From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Thu, 20 Aug 2020 12:29:05 +0200
-Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
-
----
- src/lftp_ssl.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/lftp_ssl.cc
-+++ b/src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
-@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance()
-    ssl_ctx=SSL_CTX_new();
-    X509_set_default_verify_paths(ssl_ctx->cert);
- #else
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-    SSLeay_add_ssl_algorithms();
- #endif
-    ssl_ctx=SSL_CTX_new(SSLv23_client_method());
-@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lftp_ssl_openssl *o)
- 
- const char *lftp_ssl_openssl::strerror()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-    SSL_load_error_strings();
- #endif
-    int error=ERR_get_error();
diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild
index 8acf412956ac..4dc03770f601 100644
--- a/net-ftp/lftp/lftp-4.9.2.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lftp.tech/ftp/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file"
 RESTRICT="test"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
 	)
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
+		!gnutls? ( dev-libs/openssl:0= )
 	)
 	verify-file? (
 		dev-perl/String-CRC32
@@ -59,7 +56,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch
 	"${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
-	"${FILESDIR}"/${PN}-4.9.2-libressl.patch
 	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
 )
 
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index 0f1f759f3377..f31213a5b6cf 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.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
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/lavv17/lftp"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls socks5 +ssl verify-file"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.1:=
@@ -26,10 +26,7 @@ RDEPEND="
 	)
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
+		!gnutls? ( dev-libs/openssl:0= )
 	)
 	verify-file? (
 		dev-perl/String-CRC32
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 47a668a4d319..d2418f1583e4 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,6 +4,7 @@ AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dca
 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d
 AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
 AUX proftpd-1.3.7a-no-ncurses.patch 7787 BLAKE2B 0122a91623bb9a3207a5eb9f53767e555f08810eaa9b0a97585725345dfe1798174c8534d72fbaab1aa8259a66e74bd972a38243064c2e5c7c4d9f986eb13a06 SHA512 061e1692304856136763478aea35d0668216dba07450b6b87af51d2464857f62df25e92173a9e889065b2f5f9e6b960433d591ecf1649735b36fd97be9de947d
+AUX proftpd-1.3.7a-slibtool.patch 1183 BLAKE2B 4ae52ed9cd0e3ed8a1627a06ac8d3f9cd098d2c1c2761da04888b7162b6df5250a55b7d83cfa7f643449f664706b9999b6734cabe776a106bb5f3bb4bf96175f SHA512 4d363488e12a0f691272303f09271c862d28eefe5189a9a8a0e9ec725fd788f0e40bbe021efa281eefcba351d08809b17d581b2868015d9e5a5b52292bb3972f
 AUX proftpd-1.3.7a-tinfow-segv.patch 5918 BLAKE2B 526e3e83c946e61445f32281054a768fe9eca5027c49d2f9e915810f15c4ac3a16b53de6e16886a52fc3d891fda4882ef74df1f0fc8c4774e8bac35f50ff6adb SHA512 688a0f4e79ff9089329e56f0dffffa346152f5508e1bc403ef11fb65c117403ab74660f5bc2719939f88df70518f34f7eb8f69735cb9a8a28ec0906b73a516d6
 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
 AUX proftpd-tmpfiles.d.conf-r1 30 BLAKE2B 0eb931370872ef78732d23179f20a3fe1289f8e601478c1b4709755748416f9283cdadcb2c43765019a9f6b5407e7c9db1aba8b1c1524db1e702b52898aa7602 SHA512 c85a6bc1375ebb44d88114c5c6f46d9c2e207e9d9555d9dc599f69a6485e2d5b2a161ac151f8b9e76f8e385f9dc3b811128db68f5d45648d960c8e8fbeb0050b
@@ -20,6 +21,6 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.7a-r1.ebuild 8694 BLAKE2B 12076f3e626c51edb25e29722a13726fa4fcf4437495210e4f9d4483afc829ee794a4db24f30178adfa4eb897dbad7cc43cca8c361ed57c673dbfc2141241c1f SHA512 812d17de61a5735e6cab1e344bc96dbf0c37da6b0f0ab8cc0a8a234fc2a11cb8c7f328f00cdc9c95970d678eff43ec15965f8290b7b5f30149a9c75a6c4d7506
-EBUILD proftpd-1.3.7a.ebuild 8619 BLAKE2B 86d5f5a14fbbc9392e5e5f92da7377c657e5edb2560717cad90a8e0d9e77354a34ecf8db16477e83fd3cf7c7fe6187f349d07bb9d0fcaf06d1b8c014dc185114 SHA512 a6b0a8e3d58bc35a25aeac2e2745f6e6dae3a8112cd138c1785f51329542f2cb95b2a247214e4e1fbb2b8f0a5798fefd78ff4861cbde5714d117e73ba806cbaf
+EBUILD proftpd-1.3.7a-r1.ebuild 8666 BLAKE2B 2167f808774a56c25a4330fb269360c54f14a5611625da1751419f25369a614f200c42cccce093644dbecc38f4212593ecec6d82b80e59678ef12a2955932f1d SHA512 5c89e2effc77566f6605b520b5454711c2bce5569a4493e039ba265f84795dcf4d8a28b4bd562408dda28d9827889c97e0ce7fae8777ae1d0b89c65fdb7e7729
+EBUILD proftpd-1.3.7a.ebuild 8556 BLAKE2B d0120478da71bfa4db0fbc8e9c42acd493c5087c594521ab5ad2dfe6f0865a6b67ecd1f66183ba2249b9a9ca219d8403b6d118fe64d7630769fac17d596c4983 SHA512 1224cfe188fb10657c8162be999f22f4fe04867dc7f86ae7f8c7fa0b55b7487eaa4182976c41145835f4d4476b073d672e1e5e13dc74c013dc274c8ea29abb2d
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch
new file mode 100644
index 000000000000..35676777da05
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/778332
+https://github.com/proftpd/proftpd/commit/4ffe04158840130e023ed3d3e558b8d70e28e20e
+
+From 2a15ce409f70c67ba9b1e09de67c3fca0b38eff8 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 21 Mar 2021 12:38:52 -0700
+Subject: [PATCH] build: Fix linking the static libsupp.a library.
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -88,7 +88,7 @@ if test $ac_cv_prog_gcc = no -a "$OSTYPE" = "-DHPUX10"; then
+   CFLAGS="$CFLAGS -Ae"
+ fi
+ 
+-LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
++LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS"
+ 
+ # AIX has issues with the -rdynamic linker flag.  How many different AIX
+ # versions should we support here?
+--- a/configure
++++ b/configure
+@@ -14932,7 +14944,7 @@ if test $ac_cv_c_compiler_gnu = no -a "$OSTYPE" = "-DHPUX10"; then
+   CFLAGS="$CFLAGS -Ae"
+ fi
+ 
+-LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
++LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS"
+ 
+ # AIX has issues with the -rdynamic linker flag.  How many different AIX
+ # versions should we support here?
diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 249498784d2c..6af77bfacde2 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -50,10 +50,7 @@ CDEPEND="acl? ( virtual/acl )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nls? ( virtual/libiconv )
 	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )
@@ -72,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${P}-tinfow-segv.patch
 	"${FILESDIR}"/${P}-no-ncurses.patch
+	"${FILESDIR}"/${P}-slibtool.patch
 )
 
 RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index d7a64183012d..c9477255fb61 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -50,10 +50,7 @@ CDEPEND="acl? ( virtual/acl )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nls? ( virtual/libiconv )
 	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index a9d79049c051..cabd9eaa2717 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -6,6 +6,6 @@ AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c5778
 AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
-EBUILD pure-ftpd-1.0.49-r2.ebuild 4342 BLAKE2B 19828950b0171e184565e682cf040de17ac9860df617c74e28a310f5957569f7aead1730c079af4b9826e2302b381d68f884746f3b38a627ac8546fc0aaf8a19 SHA512 3770e39569792fc46c90b6127ead85e298c2e73d68eb82f3bd1e202dada3aa6c8e662c012403387c1af2b7d635f86eb4e6fdbb2a6a89497e611ae1431a7b4759
-EBUILD pure-ftpd-9999.ebuild 4137 BLAKE2B 52af3b30fd5f3f3eb898614f345a8eb7d085d8acc8372ecfa629e442bc47c39b1356880939e5faa1eb7dcda77f61a8b92aec94f834e25ee1727a441d2b0f1efe SHA512 e2373fd608e3b1610e388580ac0eb2018ec0416cc1d479e748e332dd26214536e0d2f67fb241ffa33a7a669c9df0ce84682fdde35e8649816e855b4ac6658bd4
+EBUILD pure-ftpd-1.0.49-r2.ebuild 4282 BLAKE2B acc484e99fd3d775df66332c9e44c1573af8cda8087eb5358ce1685553ecb76a533e35b9271c99469fec30afd4227582a695dbe59094360798bed95edd5e454b SHA512 293d19fa115a626c670beaff3bc9c5c9b0f35143c228c20fc0e4cebe5830fcaaed5a3bf95685dda0a35e7f79bcc9c695237b5741bfb1617f731e55e0dab88abb
+EBUILD pure-ftpd-9999.ebuild 4077 BLAKE2B 91f1b8b27491dfd794997e1d935ce04a509088c8dfb029c7e73fa05baa1945da1d2fe92cdb2b985ddac6f90df69edac3b8d18349554653dd14c9134575cc5000 SHA512 0ec50e13f84e86b9d58cd84a0fc72d79360955383edccb8f7ac622dd72099353caa092f271f8140006eee63cacaa8e0af07d56adda7464acfd6f7cb3ee1490f0
 MISC metadata.xml 1176 BLAKE2B b11de08a23ff79546eaa18ea83dda697c855f2f4f636ef933737d31a11f225502121dd2138c9f015114484526378f2905892dcb709269c6df7fa78e3c0670957 SHA512 1e4c4bfc1adb2d9996e3bf9cdd2a4946b8314ffe2d1292d3313458d5cdf35824fe6e3af1ae9e66da824815dd16e3d0875daf55f613b3ac362bee0e48558d2161
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
index 983c8211370e..0346b591bd0d 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.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
@@ -19,7 +19,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
-IUSE="anondel anonperm anonren anonres caps implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
 
 REQUIRED_USE="implicittls? ( ssl )"
 
@@ -34,8 +34,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.6g:0=[-bindist]
 	)
 	sysquota? ( sys-fs/quota[-rpc] )
 	xinetd? ( virtual/inetd )"
diff --git a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild b/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
index c2f0bce80899..d46c49f52542 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-9999.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
@@ -19,7 +19,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
-IUSE="anondel anonperm anonren anonres caps implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
+IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
 
 REQUIRED_USE="implicittls? ( ssl )"
 
@@ -34,8 +34,7 @@ DEPEND="caps? ( sys-libs/libcap )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.6g:0=[-bindist]
 	)
 	sysquota? ( sys-fs/quota[-rpc] )
 	xinetd? ( virtual/inetd )"
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index c37a9675c8bc..af514298adf6 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -5,6 +5,5 @@ AUX tftp.service 119 BLAKE2B a2d50dba1103fb7c868e070331c8a2000e65364801abc85d969
 AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e4209e83e7d6d273583b2cd9104ba611e3acca0018d915f4313860039a3b0003e556f49f82917ef1 SHA512 d49cdbb7e265aa98d989f8ae96e2c80bfd5887ae0efc6bfcd726d5fa4d83ffc480f5f374e30b8564b05d9690eb2a0c0ed0077982a74946edfbce5d19066d0564
 AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
 DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
-EBUILD tftp-hpa-5.2-r1.ebuild 1361 BLAKE2B 8366d6b63cf50038df4c6ff8ba3efec86d374e7a72d6d7cea3f616b854fab4f4842a00f45c35c944e0ac9cc781dd6e5fa53685d963efd731107d1740a99999f3 SHA512 4c5649c21bbf0846c79b5270d10bd6c5c0715b7f6db23c02d0d2074785ead8b07b0d6aa7e902053a618f206210307ab3c663f486691fd758f2b275cd44a72a2d
 EBUILD tftp-hpa-5.2-r2.ebuild 1616 BLAKE2B 54be8e1f41dd4423299af55f59b5765d8d9395aa5a36c6762725a010a1964f6ec7e73a3ebcea1ffcea458cde8ab1c5bf89e5e8d296edf6316893ae17ff2c02e2 SHA512 e117f3f1a6100fcb55d64af287dd276f16004c0e79f36460fff86d1371fc95e50c744dd6350848ec10066dd6fae936452919ef96038692730556cbd2a86437b2
 MISC metadata.xml 394 BLAKE2B 87202528ec85f2d4931e861cbb0ee6a69653502c2ab33ae5def46e32786cff1fa90b5102546254a03f71c84c970757591da6f883e49f63580ccca837f8c5181e SHA512 0a866135a65f2c41c97a5991a4f041989a5c9b13c74cf327a3a6ec66d1589da64f31f2d8ec2f3848ecd32faebb790092a39a33f1806335b2f267e41501209321
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
deleted file mode 100644
index b9c900575cf3..000000000000
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit systemd epatch toolchain-funcs
-
-DESCRIPTION="Port of the OpenBSD TFTP server"
-HOMEPAGE="https://www.kernel.org/pub/software/network/tftp/"
-SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
-IUSE="ipv6 readline selinux tcpd"
-
-CDEPEND="
-	readline? ( sys-libs/readline:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	!net-ftp/atftp
-	!net-ftp/netkit-tftp"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-tftp )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/tftp-hpa-5.2-gcc-10.patch
-	epatch_user
-
-	sed -i "/^AR/s:ar:$(tc-getAR):" MCONFIG.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_with ipv6) \
-		$(use_with tcpd tcpwrappers) \
-		$(use_with readline)
-}
-
-src_install() {
-	emake INSTALLROOT="${D}" install
-	dodoc README* CHANGES tftpd/sample.rules
-
-	# iputils installs this
-	rm "${ED}"/usr/share/man/man8/tftpd.8 || die
-
-	newconfd "${FILESDIR}"/in.tftpd.confd-0.44 in.tftpd
-	newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
-
-	systemd_dounit "${FILESDIR}"/tftp.service
-	systemd_dounit "${FILESDIR}"/tftp.socket
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/tftp.xinetd tftp
-}
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 69e38cc7e800..897b8477e0fa 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -16,5 +16,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba
 AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-EBUILD vsftpd-3.0.3-r3.ebuild 3694 BLAKE2B b98c886c622b8ad1557e6b24f8478d6fab924b5b74b57e44edf230aa4388d277588e05204e47bcb68eb659cfec4ffdca15ebedf9a68240cbccccfbfd1b9d7911 SHA512 42213f0d67da37b811e71400ac399b2629a7e5307850b4d64b8b20b5840b132ebfba2a8b63a5d69a6bc009f88ccaabe147cecfaa29672c8383e440a660175435
+EBUILD vsftpd-3.0.3-r3.ebuild 3633 BLAKE2B 08c7a3d97316b3e11f828c68cd45d93748b8d8bf152ff18b0209330ea12a4431202b5f0afdcd77ee05a7d4b40ebbed603b4171d6daaa7794455dbdaddfd1f02c SHA512 08c61ab1b145df8218af695eae82331a76f8609805175aa721183973554e1fb7ab2bbffbf37052c0db12afc47c4cfa2b71282d1ca327e973607b8bb8a6bafa73
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
index 1152c63c9016..bba34a41dd44 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -12,14 +12,13 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="caps libressl pam tcpd ssl selinux xinetd"
+IUSE="caps pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
 	pam? ( sys-libs/pam )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 RDEPEND="${DEPEND}
 	net-ftp/ftpbase