gentoo resync : 04.05.2021

30 files changed, 440 insertions, 157 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 80646951c5b7..3a89d350bb09 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 8699aeac02f3..a9003b26a1a6 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -4,6 +4,6 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.36.0.tar.gz 550451 BLAKE2B 28ed24121a241b63d929c225223ebfea994ce993d715393db89199da123050f51a7b056205ed5ef6dd570c3ea51e0c56aead156ec5ebaeea8aef6a23daca9937 SHA512 7a1dc13ea4adddc5777532d5d50a4e7d1a8f8466983d4fc8874a38779723e213da0e09c831998688227317602c7e23b4fee0035367150c5fe3f338c595e872ad
-EBUILD i2pd-2.36.0.ebuild 2342 BLAKE2B 0bf8d05ce0a35a4586e6ba4b81f10c2d292eb5690166996eacdb4877266566da865bba7690561ee386076a645915d67109d68965d52f727778c583f6f9da2e41 SHA512 0cc7d8749eeabc5e59980978ac4d94f01765956aee09b2fee1a1bfc436e812674296fefa0a9e7a827cb01dc777600c85f44f5f0445d7918412c1fdfb89089825
+DIST i2pd-2.37.0.tar.gz 551885 BLAKE2B 478c4b3088760643a79b12fe963d8edb3f0f98b9f3422195ce493477b338e875fd5e28f45cd9d29c7f1e536732c22ed6cb4144f1400c8c3c3ec9db5697d558e1 SHA512 2cf785941b58563a575511ad2ef8b94ec20bfed10f1a4a06e82603f85c9b9586cf10740fcee0d962cd94bf6059c3950f68f2a0b96b55f1c6de23a7d49014d3e6
+EBUILD i2pd-2.37.0.ebuild 2216 BLAKE2B 5d05293f353cf757f7d660ca19ecdae5474f44976671851e7bb82c68bd8ad5ee70130c0d1b9516649a3dbbd896b8697e107f61bdf4594993ac3033a1e0eccbe6 SHA512 a188db4c33f1f68b9788425dbd7cbd5fd3dac6f3cb034521041126814838f83388b6da309c9435165183b3d91e8fced5177a097f2ffb2d7276d1b0ae39346073
 MISC metadata.xml 727 BLAKE2B 2956a473062444342fb7436a09686b9774210105445288152df0e024fdf81b93b86782a1e3e5348ce8d4a2d71383db3ed63dd51dde00abadcfdce5f84819b37f SHA512 0362e22d09aa7735d12b66da01cc717704429750a57dc2cc625c2907525c935764ede0a83ef4908417542bc0afe24cb21ada71ee3100dffdb3d3b2ab3999da38
diff --git a/net-vpn/i2pd/i2pd-2.36.0.ebuild b/net-vpn/i2pd/i2pd-2.37.0.ebuild
index 0afeb4fffed2..2422eec0aa6c 100644
--- a/net-vpn/i2pd/i2pd-2.36.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.37.0.ebuild
@@ -12,23 +12,21 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening static +upnp"
 
 RDEPEND="
 	acct-user/i2pd
 	acct-group/i2pd
 	!static? (
 		dev-libs/boost:=[threads]
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[-bindist]
 		upnp? ( net-libs/miniupnpc:= )
 	)"
 DEPEND="${RDEPEND}
 	static? (
 		dev-libs/boost:=[static-libs,threads]
 		sys-libs/zlib[static-libs]
-		!libressl? ( dev-libs/openssl:0=[static-libs] )
-		libressl? ( dev-libs/libressl:0=[static-libs] )
+		dev-libs/openssl:0=[static-libs]
 		upnp? ( net-libs/miniupnpc:=[static-libs] )
 	)"
 
diff --git a/net-vpn/ipsec-tools/Manifest b/net-vpn/ipsec-tools/Manifest
index f195ad99e275..32a840ecf5ff 100644
--- a/net-vpn/ipsec-tools/Manifest
+++ b/net-vpn/ipsec-tools/Manifest
@@ -13,5 +13,5 @@ AUX racoon.pam.d 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af57697
 AUX racoon.service 244 BLAKE2B f7e268518787a67e9363c936b8a9e69763c41db1926f99f3f001fdf738b0b3a92cd62770ab6cc0189cea20ca22d3abe675c832363ad77974e3f531ffbf525e7b SHA512 56d84f36b307e1ea93f3cdc9fbb7b459f4b3b65ea2bb765f61def10d06a3ff09d61b8d53b21796a55022279e791d751f3bc1ccf0d0f85799a743371390930567
 DIST ipsec-tools-0.8.2.tar.bz2 866465 BLAKE2B cf8c9175d96326fc5c74e6b1921bc66911256e289e6fe9cef77f26c197546902be3ebd5696af39c749a2abaac3f42010c9e2a281fd208122cd59222044b9dd4c SHA512 2b7d0efa908d3a699be7ef8b2b126a3809956cb7add50e8efb1cfdfc2d9b70c39ef517379cb9a4fad9e5f0c25937e98535b06c32bd3e729f5129da4ab133e30f
 DIST ipsec-tools-add-openssl-1.1.x-support.patch 32066 BLAKE2B b8380408c90bb93f0b95938de2efc61c80d727ae61a1417134583a8c74055fcfe1f7f75893f1f701b0f301a16d8b4d14f1b8a09d1e81d238821bcc122dfe183f SHA512 f2bd85f1c51226da6fc50d3473129e4c2e3c0e46107337f8d676029b7072b98bf164b6813a16de7dd4481f80038453b55a5ff56e7f5ec08ab07641034258e778
-EBUILD ipsec-tools-0.8.2-r6.ebuild 8046 BLAKE2B 63176650a22f11f23c51fa90d33a2bf0ac386e2a080bd07e068cf9376247337601e7b6762a3df75f6dfaf3a33d0bbb12d1fd684b39c97bca3593800c10240726 SHA512 b0e743001104e5e2fb4e9e5ea064ef12442c35a3b9c3908e593d2d1361331b0f252666e41259f7d3cdde4aa732968394109eaefda48fbace06ee261bac74248c
+EBUILD ipsec-tools-0.8.2-r6.ebuild 7989 BLAKE2B 59296b9f7229c58d1379cb90edf321dd517f0372b85ebef8dbaab9d2508ab4920511e12157e5d2ec8dc54ff1d82beaa99457a7af6970de96942d8e9360452565 SHA512 bb4dc257f0b473360cb9ab53f1ca3fe3694cdd5bb615e2703270cca99ef6c90be2d63953907a5a009276927a372e9d47da16f74c1aa03182ccd1c035d3d71074
 MISC metadata.xml 632 BLAKE2B 705ccbcd150c7180f882207dd5e7a8b0765b58f8296be9bb299e982207d88031b770186b665ee936ca834b2b8601a78f7d2ade63b88d6aa09808b2fe3a89be87 SHA512 7636e9dd2ed9069933b2215829660c3d7c1b43d9c4ad3303cf8889618bd659f68a27994ae520ec7e327060337a196e8b720140e5b32fc6830158be0f0fff1eb8
diff --git a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
index e03b86b9037b..de5c6572394f 100644
--- a/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
+++ b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r6.ebuild
@@ -13,11 +13,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86"
-IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux stats"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
 
 CDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	dev-libs/openssl:0
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	pam? ( sys-libs/pam )
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 10abc122ad0e..168d236c4e0d 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -8,6 +8,7 @@ DIST libreswan-4.4.tar.gz 3503201 BLAKE2B c6c5cb2d7141afe52128e71051fd39b058a06f
 EBUILD libreswan-3.32-r1.ebuild 3165 BLAKE2B c0144e07373f076366d0baeb9c9c2472edc6c07f7fbb6ee37c7865ea37cdf4476e3f3119c51efeb1ac4ba54caad84a14727811387cf6eacd3be9724a5ede7b1d SHA512 1bd84beadae36e45f948b0c902e5ee4058c79a26a7d72b985bda62bfe3267e468f0c6ea970fe73f70e34332a286fe3c8da9f6e8b34b5f3c9d8eb742508b40344
 EBUILD libreswan-3.32.ebuild 3127 BLAKE2B dfd79e648967070d3a2ae7018873647a03d162bf904f4f70fa7d2baf9969d7912407a56869986f0c83675e65e5f27e5622ffccf4c6b1b3bcecb3200472976372 SHA512 5937f4ee0eba31fa8cbfcb477e19e5d2f74b1fafba9be035cdb64e88e80d5bc0acfd6dd995de54e449be6a8ff01a893ad64d578d4eb7b5e72f42f748fc829333
 EBUILD libreswan-4.2.ebuild 3235 BLAKE2B ede91ac9228feaa6214ff1dffea92cf16c648b29062a3fefa6e6d3b79959b9f48803083b3ba52a40ce4811885b4aae56d79358ef5f9bc701063a464f187084da SHA512 5e3c1d537cc97237bceb852fdf230b6f1136e8f8ebc83550558920a5c87a029c9cdd26f29e59284ec832997dd2dc1f12d25e9d0b6473e625e3d84b37bf3464e4
-EBUILD libreswan-4.3.ebuild 3234 BLAKE2B a9a2b4ccaa18299dd1a9ffd133498e7ee0d24eead2853b9ee7dae1d5c75c11d6829bb4eac1f8532240f9f93bc69f53b2f2f6cde1f45aed522f08c745fd3fd486 SHA512 54528a48d2ba8dc514d74bc12cf4b26aa4d2eca95dbd0a9c7c00ad1904753d8dc2994745d1e92cf03700240b2b54cf65c2981c420b787e51ecc9ab454a69c84b
+EBUILD libreswan-4.3.ebuild 3233 BLAKE2B 7d2fd3d94ab3ebac9e897dffb43b79505f8d5c7e3100e3dc2e820fe80bac5a417bbb23968f55c54feca0487c421516c4e1666980f3202688d793ad8f28a87774 SHA512 876cbeb37aa07e835cdeb0516cd1644a3e5c3e4cc99fd0705cba059a25ae031ca9ee89fcd5cc193a9fcd0c61197222fe91037eb5f24ad888a3544b6a035efbf7
+EBUILD libreswan-4.4-r1.ebuild 3258 BLAKE2B 72f63679f9d1843f353b0a7f9aae160f48225027db485cdfb2d1ae6a21de93e1413eb67fff8fcbaf9cf71cf328ccf166bc54ac5b8ce392981ab028667f6313a6 SHA512 b822898f3f4e5f59cd6a11f38cdeac706ce91aace2983f06e6f104a4dbe1b04779bc3d316a1fa05f627e713f546ad00ae62d76a6cb54a436ce23c6efd3abb56a
 EBUILD libreswan-4.4.ebuild 3234 BLAKE2B 143f40fec250b0881debe84cd3c0cb8d50ec34a11adac86219aed85fc2fee17fd06f8ff08b84d374b75cbf7d60c9fe3a1ac42b5e4139f989aac44271705a1b32 SHA512 9ef260303dc15516da39ebf0895d830b80c60d586b76de5c142f5ffd1f64435ffc576dae9a334264ed46aff160d15e73294b3643669f4d54f5cc12d8e0177100
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-4.3.ebuild b/net-vpn/libreswan/libreswan-4.3.ebuild
index 016408cd0ed3..5c4d8e551b72 100644
--- a/net-vpn/libreswan/libreswan-4.3.ebuild
+++ b/net-vpn/libreswan/libreswan-4.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit systemd toolchain-funcs
 
 SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
 HOMEPAGE="https://libreswan.org/"
diff --git a/net-vpn/libreswan/libreswan-4.4-r1.ebuild b/net-vpn/libreswan/libreswan-4.4-r1.ebuild
new file mode 100644
index 000000000000..6932991bf6a4
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.4-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=$(usex systemd systemd openrc)
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_AUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index a99233c34c52..cd2cdd6260c2 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,9 +1,7 @@
 DIST openfortivpn-1.13.2.tar.gz 82977 BLAKE2B 5daf2fdacaf2f9c3bc0a4bc3fc26543ed0ab424b70d2795e7b3d74b38cba53b1a8a9823564198ea5292b63f872c12f17ed3f65111a7024faee19640fff765cd7 SHA512 6be456784618d0af26190bad4af20a5f7163d3d984e3317fa3aac04b605ddd39f8973b192cf35fc8a371bf5ca4cbff8f644991b0cc031f558bf7881066fe8ec2
-DIST openfortivpn-1.13.3.tar.gz 150681 BLAKE2B 378837373f743c474233e5c7d0f8698a1bbaa5b2b84c89173547e4d0674e4ffe8949bf105462b7d355e603483577008d7ef99315e78a7511dca043426b668885 SHA512 57f87e1f1243b2eb1f4ef17dfacea203c8b11fd0e65440eef4c6b08af0b821c5a087a85d98423540114a7d977d12c4a99d0edcc348f0107fd230f573e3df0fbf
 DIST openfortivpn-1.15.0.tar.gz 157951 BLAKE2B 051dbc5ab5c003926fa4424b9c69e899bc9602aabab7749953743d1d81e0ebd90ebdf157921cabc016cf93263279eab111ed1b9763fb4ba50a11f463659be2dd SHA512 8ec6454c197925a031a454e3983ed98d93d48514d86ebb09483157872e299d9c6b36a966ac6c67cd85d203223460998cdc0e6af9d5389357d4a55789aa5e2083
 DIST openfortivpn-1.16.0.tar.gz 163878 BLAKE2B 003460ca6012b90ddea41b1fe533c3b6899fa8528ef656e6d1b4a200f01d3a476749405294fc2c3c4ba489a41d7e72738d540632922fe2ae2d2344f5fc5750e3 SHA512 bd57bc076f89604077c0c6f538090b33707e2534f83ae7e01ee0604b044b2f1083b65f7d0241fb4fc38eabe8462689137c66bf59dac12b21408b8453f5b2cc5a
-EBUILD openfortivpn-1.13.2.ebuild 761 BLAKE2B 8282264a7cba753bb9682a94c04e84781792f7ec69abb18262796eb2e7bee770d8fa8d6405e4f7a84e90d46eb815c883508c9d8c43b15c8bcd3d08a41f934466 SHA512 5ba0d44db4b9275be265a2fcd6cda3f7a8001c90b2bee335eeca98b6c70c054f39b91b61dcc6a5b80a49c873dd498fb0b27987cee581f07d8d62d54a5ddc310f
-EBUILD openfortivpn-1.13.3.ebuild 762 BLAKE2B ce26d3b3dc03a3e5ba10d5bd61ab2a360e48d8476f8b232c30b38c2b0977696cb8be99a4773bb3b113dc63c34641d9f710ad60d888937c7f93bea190f47a43ee SHA512 6086c741a67ddd90474724986be6b5687b1f84c7f6c6c62217038af6a1e769e8f26f6927097317a00f7cb8ca35c72874c6541fbdc348d9d7597e0f14157018c5
-EBUILD openfortivpn-1.15.0.ebuild 762 BLAKE2B ce26d3b3dc03a3e5ba10d5bd61ab2a360e48d8476f8b232c30b38c2b0977696cb8be99a4773bb3b113dc63c34641d9f710ad60d888937c7f93bea190f47a43ee SHA512 6086c741a67ddd90474724986be6b5687b1f84c7f6c6c62217038af6a1e769e8f26f6927097317a00f7cb8ca35c72874c6541fbdc348d9d7597e0f14157018c5
-EBUILD openfortivpn-1.16.0.ebuild 762 BLAKE2B 789d77ca6458ba7fb418c0b06e25b4f53170c46aeece09288b8b9e345acc8fd3982ec634cd5f9babca2f6dd96ac8799851059ec21ef6714e0d93aeeff3f7c492 SHA512 6569e002ad836c4931e903d15abcc269f296ff09aedb2bc0892d11a62e2dca4d2933760497024229d2e6bd8af5d7bf5e519bf2e9ac0a75dcd9cf00725c871b35
+EBUILD openfortivpn-1.13.2.ebuild 694 BLAKE2B f64b845c7ad2e3b71757e0ed2c0ec8dce68cf144e201979ac3a89cb9bf1267fc0e34277b1233c44ccd3e9f62e4f6c2189abf44815207c19c4bd98c15c858a80f SHA512 4d92182d916e1b732b9a973429a63d5dd66aa74dc43188da1795e4f80575adc286cf7b45af5401c8ed7d50f9f6dcaba036a4a31c42a086462378933601f6971f
+EBUILD openfortivpn-1.15.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
+EBUILD openfortivpn-1.16.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
 MISC metadata.xml 334 BLAKE2B 0ac69848f58fdaab21f61faa5787f4697af583d6d32d32892f0a7a4f1ff36de17e5d1a84c5bcd8e62840f056ba1d98f5b79663df5f70b29e229106c5876ad8ce SHA512 fd469e94226e0d5f087ab984ef89ba1a2c1e4939f174ae1a31dc7c53693b4bb8bbd3256273ee5ac04a6575e7177b4c802938c059f16c2228af5be7cac241f8a5
diff --git a/net-vpn/openfortivpn/openfortivpn-1.13.2.ebuild b/net-vpn/openfortivpn/openfortivpn-1.13.2.ebuild
index 6055fa16e3ca..db3015c68b85 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.13.2.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.13.2.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,12 +12,10 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="libressl"
 
 DEPEND="
 	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/net-vpn/openfortivpn/openfortivpn-1.13.3.ebuild b/net-vpn/openfortivpn/openfortivpn-1.13.3.ebuild
deleted file mode 100644
index 2cda60426dcc..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.13.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl"
-
-DEPEND="
-	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	keepdir /etc/openfortivpn
-}
diff --git a/net-vpn/openfortivpn/openfortivpn-1.15.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.15.0.ebuild
index 2cda60426dcc..0c64cdfd137f 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.15.0.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.15.0.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,12 +12,10 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl"
 
 DEPEND="
 	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild
index 07bc57683ad6..0c64cdfd137f 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.16.0.ebuild
@@ -12,12 +12,10 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl"
 
 DEPEND="
 	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}"
 
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index ac1e5551dd62..eb2407798d95 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -1,13 +1,16 @@
 AUX down.sh 943 BLAKE2B 9853748aebd819c46cec0229971375d28922abe91ff6442a572090f300cd901ccd80c04fc3df30a1251492a55e593a4783f7f5a4b380053f27bb387f5417444b SHA512 5defd61edf11cc63f3f8f60bef7fa730c4bcdd2545d664bd94666dd3aea80bd9d190263d8835a555e4287a594f6fce0f52426aed49c60233ff637a2a6164a997
 AUX openvpn-2.1.conf 892 BLAKE2B d0ce49ecc6275c9677e56de5d13afcc69169666441cb6d8eb958642786f0ee7ff6acb1830af0001fd1945b666daf5af1d9be211032817fc345e33242e1d86885 SHA512 982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37
-AUX openvpn-2.1.init 4187 BLAKE2B 9ab133bda1db2d94afbf1e35840515452029319c38bb796af90b117dcfcd8552da2ea236399c2708a4862de753a8f92cdff80a69cfdcc5d53e206f9f3ffc48d8 SHA512 2d97a41b3998c196c440dcaf43ad8992eae27c5356c94b24f4cc4b20169350f3d6c8d65bb9c2517415ee15637fa60298d9cd8252ad9aa3eec6ae3a847ede0611
+AUX openvpn-2.1.init 4176 BLAKE2B bcce4f9683c485acde0c909a2be77511b7f0576dcd2452c18042ebd414deb0a43c6885cf6d5e402f22bf0d64c79b70b29b66bbfd9517946053e39eb9d8706e15 SHA512 403314b8bb29b2112af46ff6a6760c6f746904d20f916b35ae08edcef979bb023e3c2c1c3493f784d14ce3fbb96744b5ad077b304841a0223fc46abfbf956b1d
 AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d8b14b7563744981f9fef15c5b217aba00d91469eda99cfa04b4a1e8ffbc92dccfc981290ec5aaf209041ed7790f05f2bcf51a06981bb SHA512 373e63417f829c3309cc3ec1e676559deaa7f19be438228d05ac4f47cd5d18f36be270cff1e6dad5b610afd77ff128c170a319263b903d6f221344e3b6be32bc
+AUX openvpn-2.5.2-detect-python-rst2man.patch 554 BLAKE2B e379af57dcc25766803043c40ac2128e2649acb4594ba6c4f55967e5d38dc6fd3190d519b6e9ea81656eb9e5344043e6cb84e155059337282913b60a58d09eca SHA512 e09307c2841a8836d12e1973baaa5e61fd9371e6628dcc858cfa9111b8907f8e6ad73073552655292f0f9d23b8850aa821d3a1520b4b11c312a8beb2225c6ae9
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST openvpn-2.4.9.tar.gz 1000602 BLAKE2B 4a10ec76d1a816f9184dd33e4384623e011a1af40ea38ad56cc06f70ab2c911b6fd92cf8ffcd2ec3ab4179fef87feb187fc9df61c5bea92b1c69ee4113093866 SHA512 7683dfb93592968459f080a07ea750992b7444708cdb1a5aafc0118ab8528fc488f2b9fbd7d042e57ad1811303208875237ae9decf0bb4977c45cd30da53751b
 DIST openvpn-2.5.0-r1.tar.gz 1815964 BLAKE2B cca1c1ec4fbfe0c337c14525cf706280c9d961c4bba992dfa0b13c9f96e00092864301138037485095716c746ef6ff3473a2085780b3ef77183bf4a6f1c602ae SHA512 3deb55973b87cc95c0437ab9ce6c43fdc246aa7e42e3e68bd6a5651deffa798b6750f625917cb2aaa2c82f0b3a0805bcf206a2aa8e2c735fd24e6bd38f736562
 DIST openvpn-2.5.1.tar.gz 1827517 BLAKE2B 068af9313c9b2b93dcaa06f82ad66489154ce04973e323af07f38f209b4be77b7b785046aa31559a9f744b4b8c6976acd3e644d5a573f3c5511dc11f5bab3dce SHA512 eb85d14eeb383bed09670941451328db38feacc0b8b7b960840a3f465de83a7527de7d183e66344011da3a3655d558483c569d096b36964209a23418f89052e2
-EBUILD openvpn-2.4.9.ebuild 4756 BLAKE2B 44efa8c170cab681304afe8694e06283dd60941e1ab90f5348e467df4ae5ffff3fae7d565fc81d3bc213d23856c213b8f9be3c810217b13be0da3417582f9b67 SHA512 877e8640b156e031268c928b9c8702869ae774586047f38b79a3bf9e2c5d684b35b2fd46c92eaa071d8cb3e9c9d930b9ba18104a86fd96032db5f5be7ee5b0de
-EBUILD openvpn-2.5.0-r1.ebuild 4775 BLAKE2B fb9868cc03e1325bf551557526a24ab02ad355b73171903deae94fc58bf28bad69464575a2f90a208b2f991a455edd569a4d7cea9dbc2d0cf7a7494d74327abe SHA512 96baa09524a98794d6604ef1f9918745fe4f3de23ef79c6225c2913bc11a2cc02fba52efafe623265ab9287c3438e43570447ea2d20262c80256dbe5c25436d2
-EBUILD openvpn-2.5.1-r1.ebuild 4759 BLAKE2B 6c1575a2fa70dc433fca5405cfa73f62485289554dcd3c37f3cff1a162fe088176652a77a8e12874ecaa4cd59bdb0ba428b1f0b75318b0c05c6cb729199aabea SHA512 0d6452e99166557148dce32a7862138ae8b455aa1cab7b1a7940dbf7be5312f3734bfe92f5a13aa8d34e97ba1d0daf8ec3670890b779216a463ed18e088ccd6b
-EBUILD openvpn-9999.ebuild 4763 BLAKE2B d16e734db362f6ef1c68a16f980ea35d6bbad0a59e9e48bfa039e1be46499e04ffdd48e49574155aec6e9ac1db274b437dacd09a5928a9ecd17670c39f9c6c91 SHA512 0b776162a07b746aed576694bbd75594172675a2cede06696d4f99957661284b9e8917c94c42ca9f7db6c8aeabbfa5d6ef7a8a83da2d294680de379f30ad9254
-MISC metadata.xml 1158 BLAKE2B 2d27c7254e0249fad84a5e676cb2c60f0edbb5cda6e66e44f380a39e835f4df72931c983d1989d03169e6003f497f39d928fdbe6548e3df799ffb62c8ba7cc45 SHA512 29af52059d7f381cf4956c116ba3d4ad420ae35af9a33ed97779f6b3cee291003def855e3b84bdafd60f30bdcad1baba70a639d2ad01c01af0a52ef18c50d9e5
+DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
+EBUILD openvpn-2.4.9.ebuild 4673 BLAKE2B 5c59d4d0745d7ea2efc85145acb06a101aac417f8a2f5a23e21b0939b9180d009b380db2064d7babf9335fddc866bd48fcf1c0a87f4094f1718315ad22e6f5cd SHA512 4c4880507b407549b42b9f58443f6031e0ac6aaa41c14426dcc792930c1fa45ad84e7e3934fa85c91599adfdd2dc019eefbfa3afefad518a30058c6a6489f0da
+EBUILD openvpn-2.5.0-r1.ebuild 4695 BLAKE2B dd947f38a6484cc69e8cccac511fb60ffc04ab3ab7e69d11192b274234f93c175d2f15f8567b5312281efe76ba568bdf168a9d6cf51f1c19d778c914921d228a SHA512 7d8d46b49fe36c2850c031c74a47a459b28bbc5e94bc9ba5862999b196f3ad8ba425cd30031d7e592a53c89e6926a9110baee8b3b4300ba44e629ba33ac5ee8c
+EBUILD openvpn-2.5.1-r1.ebuild 4679 BLAKE2B a823847503c964ff792b78ba44116dd9f257814d73e24965560cbcbc85235368be160892274579a60d26c77e31bda389a6b4122a0e1e344a4ee4fe2e0f29552d SHA512 1894deec5ca459b8de6cf58c5aed77b9987671a7bf7c052e15dd3ffa48a6e1b2a7ad14797ee9886ba6545f4a8f14d64de8b1715787880b5bc8880f4e23d8174e
+EBUILD openvpn-2.5.2.ebuild 5000 BLAKE2B 87806f8baa1589c14ec92972199068a774e4d30406466ce3611b0ec818e6dc99eabacd619ae72ca94988df5ff6047ca95e630838b14a9fca81828e4790449d8c SHA512 e414ef1ad5496dcb220aab5785a5343f2d1d40bad1e184d52c0aa2bea4772a9594b201fd91fd786a8c984c15e3b8da8b06c2a02f8a9cd39db95232a4d48d2c23
+EBUILD openvpn-9999.ebuild 5006 BLAKE2B 580199387ed1a7a35ada0566f030f4597bb78106fcc49a19473f15cd63581db3a0ddf3493bbe3935914ed9df687c4d26aaf84cba8f1a693e581a1fdaa8bf9881 SHA512 149e1cb8868a6133a061c9434fc13f12cf7b1ea90130f106adbf4d9e7fa25aa560d449f153cc3dbcbe067fc28f08ad287a9fe2465a377dc0b95a8e4a639d35ac
+MISC metadata.xml 1083 BLAKE2B 5642cd5be7d4d53f5cc3b1e501f3a22c875ceee114cc2c4d5fa45f96983593d8f2c5b60a30c396187ad7bb2adb36d6d5c03aef8530d450ab86df589a591ae95b SHA512 91a8c6eda7d21dbf7619b49b757d9016ac94ff6c9e87ef5684a01d5138d8f84cfcc525fd62729ceac85394e82cec3931716f6dfaae59cfc3eda804bd968ee428
diff --git a/net-vpn/openvpn/files/openvpn-2.1.init b/net-vpn/openvpn/files/openvpn-2.1.init
index b42aa13d20de..ba05689a1e09 100644
--- a/net-vpn/openvpn/files/openvpn-2.1.init
+++ b/net-vpn/openvpn/files/openvpn-2.1.init
@@ -1,13 +1,13 @@
 #!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 VPNDIR=${VPNDIR:-/etc/openvpn}
 VPN=${SVCNAME#*.}
 if [ -n "${VPN}" ] && [ ${SVCNAME} != "openvpn" ]; then
-	VPNPID="/var/run/openvpn.${VPN}.pid"
+	VPNPID="/run/openvpn.${VPN}.pid"
 else
-	VPNPID="/var/run/openvpn.pid"
+	VPNPID="/run/openvpn.pid"
 fi
 VPNCONF="${VPNDIR}/${VPN}.conf"
 
diff --git a/net-vpn/openvpn/files/openvpn-2.5.2-detect-python-rst2man.patch b/net-vpn/openvpn/files/openvpn-2.5.2-detect-python-rst2man.patch
new file mode 100644
index 000000000000..d2060bbff4b1
--- /dev/null
+++ b/net-vpn/openvpn/files/openvpn-2.5.2-detect-python-rst2man.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -376,8 +376,8 @@ AC_DEFINE_UNQUOTED([SYSTEMD_ASK_PASSWORD_PATH], ["$SYSTEMD_ASK_PASSWORD"], [Path
+ #
+ AC_ARG_VAR([RST2MAN], [path to rst2man utility])
+ AC_ARG_VAR([RST2HTML], [path to rst2html utility])
+-AC_CHECK_PROGS([RST2MAN], [rst2man])
+-AC_CHECK_PROGS([RST2HTML], [rst2html])
++AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py])
++AC_CHECK_PROGS([RST2HTML], [rst2html rst2html.py])
+ AM_CONDITIONAL([HAVE_PYDOCUTILS], [test "${RST2MAN}" -a "${RST2HTML}"])
+ 
+ # Set -std=c99 unless user already specified a -std=
+ 
diff --git a/net-vpn/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml
index caa9b97acdf9..699f7fa4ff84 100644
--- a/net-vpn/openvpn/metadata.xml
+++ b/net-vpn/openvpn/metadata.xml
@@ -17,7 +17,6 @@ networks using an encrypted tunnel.</longdescription>
     <flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
     <flag name="mbedtls">Use mbed TLS as the backend crypto library</flag>
     <flag name="openssl">Use OpenSSL as the backend crypto library</flag>
-    <flag name="libressl">Use OpenSSL as the backend crypto library</flag>
     <flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
     <flag name="plugins">Enable the OpenVPN plugin system</flag>
   </use>
diff --git a/net-vpn/openvpn/openvpn-2.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild
index 6d6d5d7a02da..fa2a4e2f0261 100644
--- a/net-vpn/openvpn/openvpn-2.4.9.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls pam"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -29,10 +29,7 @@ CDEPEND="
 	)
 	pam? ( sys-libs/pam )
 	ssl? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
+		!mbedtls? ( >=dev-libs/openssl-0.9.8:0= )
 		mbedtls? ( net-libs/mbedtls:= )
 	)
 	lz4? ( app-arch/lz4 )
@@ -69,7 +66,7 @@ src_configure() {
 		myeconfargs+=(
 			$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl))
 		)
-		if use libressl || ! use mbedtls; then
+		if ! use mbedtls; then
 			myeconfargs+=(
 				$(use_enable pkcs11)
 			)
diff --git a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
index 2744ace92710..8ee40bcb156d 100644
--- a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls +openssl"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
 IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -31,10 +31,7 @@ CDEPEND="
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
 	mbedtls? ( net-libs/mbedtls:= )
-	openssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
 	systemd? ( sys-apps/systemd )
@@ -65,7 +62,7 @@ src_prepare() {
 src_configure() {
 	local -a myeconfargs
 
-	if use libressl || ! use mbedtls; then
+	if ! use mbedtls; then
 		myeconfargs+=(
 			$(use_enable pkcs11)
 		)
diff --git a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
index 5d4782a0359f..f6859b6c7e04 100644
--- a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls +openssl"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
 IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
@@ -31,10 +31,7 @@ CDEPEND="
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
 	mbedtls? ( net-libs/mbedtls:= )
-	openssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
 	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
 	systemd? ( sys-apps/systemd )
@@ -65,7 +62,7 @@ src_prepare() {
 src_configure() {
 	local -a myeconfargs
 
-	if use libressl || ! use mbedtls; then
+	if ! use mbedtls; then
 		myeconfargs+=(
 			$(use_enable pkcs11)
 		)
diff --git a/net-vpn/openvpn/openvpn-2.5.2.ebuild b/net-vpn/openvpn/openvpn-2.5.2.ebuild
new file mode 100644
index 000000000000..757421b60090
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.5.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd linux-info
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	EGIT_SUBMODULES=(-cmocka)
+
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+"
+
+CDEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${CDEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
+	"${FILESDIR}"/openvpn-2.5.2-detect-python-rst2man.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+	)
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	make check || die "top-level tests failed"
+	pushd tests/unit_tests &>/dev/null || die
+	make check || die "unit tests failed"
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# dodoc does not supportly support directory traversal, #15193
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	if use x64-macos; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted ||  has_version sys-apps/systemd; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index b2945c23a0f7..20cd58c60ee4 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -3,22 +3,31 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic systemd linux-info git-r3
+inherit autotools flag-o-matic systemd linux-info
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-EGIT_SUBMODULES=(-cmocka)
 HOMEPAGE="https://openvpn.net/"
 
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	EGIT_SUBMODULES=(-cmocka)
+
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls pam"
-IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="pkcs11? ( ssl )
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )
 "
@@ -26,21 +35,18 @@ REQUIRED_USE="pkcs11? ( ssl )
 CDEPEND="
 	kernel_linux? (
 		iproute2? ( sys-apps/iproute2[-minimal] )
-		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
-	)
-	pam? ( sys-libs/pam )
-	ssl? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		mbedtls? ( net-libs/mbedtls:= )
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( >=dev-libs/openssl-0.9.8:0= )
+	pam? ( sys-libs/pam )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
 	systemd? ( sys-apps/systemd )
 "
+
+BDEPEND="virtual/pkgconfig"
+
 DEPEND="${CDEPEND}
 	test? ( dev-util/cmocka )
 "
@@ -50,9 +56,17 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-openvpn )
 "
 
-CONFIG_CHECK="~TUN"
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/openvpn-2.5.0-auth-pam-missing-header.patch
+	"${FILESDIR}"/openvpn-2.5.2-detect-python-rst2man.patch
+)
 
 pkg_setup() {
+	local CONFIG_CHECK="~TUN"
 	linux-info_pkg_setup
 }
 
@@ -62,28 +76,37 @@ src_prepare() {
 }
 
 src_configure() {
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-	econf \
-		--with-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		$(use_enable inotify async-push) \
-		$(use_enable ssl crypto) \
-		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
-		$(use_enable lz4) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root) \
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
 		$(use_enable systemd)
+	)
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
 }
 
 src_test() {
+	local -x RUN_SUDO=false
+
 	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
+	pushd tests/unit_tests &>/dev/null || die
 	make check || die "unit tests failed"
-	popd > /dev/null || die
+	popd &>/dev/null || die
 }
 
 src_install() {
@@ -110,6 +133,9 @@ src_install() {
 		docinto /usr/share/doc/${PF}/examples
 		dodoc -r sample contrib
 	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
 }
 
 pkg_postinst() {
@@ -160,9 +186,4 @@ pkg_postinst() {
 		einfo ""
 		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
 	fi
-
-	ewarn ""
-	ewarn "You are using a live ebuild building from the sources of openvpn"
-	ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
-	ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net."
 }
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 1b26eef0ab9d..aef7eefa609b 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -10,7 +10,7 @@ DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529
 DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f SHA512 351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
-EBUILD tinc-1.0.35-r2.ebuild 1338 BLAKE2B 34c1caeb06d072fd41fd14632bcd2a1976ecff3477251e70a7ab5d611edb9157c37459221c26edf7d92dc4f8f233f708e8e84031ac925ffdca52a39b82304038 SHA512 b764f8dae06a6c0f92f31bb2ebd7b9ad72177ccd72b14530cc3ea1f55972f73bb73b4ef8e9e4e4c3b4f18075a29de62c1c41940f08e3e859c2c59d1277dae5e0
-EBUILD tinc-1.0.36.ebuild 1053 BLAKE2B 3cc5c85f8ef1f23e5feeba74db079e5aea40ce3a9f825f364fdfe3f1814fae016f6e448dfaba60b2378f77e60bea66a70818b00567860976ae15f0d37dfc6247 SHA512 1806afdf9c6dab6270179dcb6aade79862ade6b6fb1e2025c22f4c342a026334fbae69752232e5435b57e5b27ed9c9c5c25b4774b116a8c371db5dc766e6a016
-EBUILD tinc-1.1_pre17-r1.ebuild 2279 BLAKE2B 3a4bf5b301c825b4411095942d3497ac78f87e8376d523139cc385c238105b8af02f4cea65e91167d9f112b53d9a045f7a5bb90aa81cc89a01e06f4f47e130d5 SHA512 ea282b35b67e66959b285bf7f9852b8bfe4aaffc32382de4ede266ab2501491e5e7b3293ec5dd8bab5836ca7702359ea1141c7a5720939cd0ab62c3a44e029ce
+EBUILD tinc-1.0.35-r2.ebuild 1278 BLAKE2B e7139f6a9dcffca42f62768d0217cd6f4db531118579066e60d0ff570182b802f2ad28ee562cd473da3699ad7fb4001bce3e045b650001f55d8542112c1e1c4c SHA512 ce92300d4f99475f11f8951e0663b34c85dc222eb85e049222a1d8a2b90270f73079ee45b143d1b8ef86c237151e66b8f179b3909cb41826697226dfca502e80
+EBUILD tinc-1.0.36.ebuild 993 BLAKE2B af32d021acfb333af1344d79fb7f2b1ad8a6d582cebd9c97f88cdc3361b188b78ee26bdba8fe19f53a07e5f0d757fcf3f07b2316c1d9f925cfdf8a8986c552bf SHA512 3496cd6250ff6470049eaa0cf00f2ad1aee985de33c3ab2f533371e7387207ddff9893c4b227dbb4337665fe17b5337a1f537e9c6d131ec340aecf70ba244301
+EBUILD tinc-1.1_pre17-r1.ebuild 2218 BLAKE2B 41ec75ca47b4af40cf3113f1f83f34514f5e5ffdffcde61ce18bd752aeb8eac1b50a578509f176978a7e1520843444558d30d12e6bc331e874be81de3870dece SHA512 8f535824b6ac08a59a733c12778739573841a85305640748be114c204f0ee1a72cff22d485b53dd99eb91f84324123a93a33f8353dbd6fb02a6bb40d7875e819
 MISC metadata.xml 638 BLAKE2B 5aecfad9b7e648fce87e8f9f9713c0cc3c6042a7d67b68c67b58b85c681f41827c4d6bd72bc9b2f759d4ec1c6ad838aa3a6f328cf3394b2e77405b24e6f3dd47 SHA512 494ed9caf18ea348c6e8f80a597e1a45bbfa2c5a41a711539141d7e27ef83182c9593dcfc64b3b384036b989636962f10c4eee02e84011d77075d1a69951061f
diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
index 939a35de4cd3..be4c667f269a 100644
--- a/net-vpn/tinc/tinc-1.0.35-r2.ebuild
+++ b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
@@ -18,11 +18,10 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="libressl +lzo uml vde +zlib"
+IUSE="+lzo uml vde +zlib"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	lzo? ( dev-libs/lzo:2 )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index 1b6f632bb8ab..5094bc4d00f9 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -12,11 +12,10 @@ SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="libressl +lzo uml vde +zlib"
+IUSE="+lzo uml vde +zlib"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	lzo? ( dev-libs/lzo:2 )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
index aa515c1303bf..3d984145f798 100644
--- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
@@ -22,12 +22,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
+IUSE="+lzo +ncurses +readline +ssl uml vde upnp +zlib"
 
 DEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	lzo? ( dev-libs/lzo:2 )
 	ncurses? ( sys-libs/ncurses:= )
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index a3ca210a2931..fe9bde62b3e6 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -9,7 +9,7 @@ AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9
 DIST tor-0.4.4.8.tar.gz 7699461 BLAKE2B 4d314cefdcf49d41367764028ed38b5acb320dae73601632c7ed8275d65f84e98cd34cbb2c3ee9c89782473d380a3c9d196bd6283800d031812b8a0ed3b4f89c SHA512 5a0063afa7ab89e4b3a8ec281650e947c445fbad709fb79aa155ae6a487a8131b98ed6246f0a6c2902c8bb6749551c1e80016f710e3cb3d3a380d3f8b365d8c3
 DIST tor-0.4.5.7.tar.gz 7816158 BLAKE2B 839a81b237e29f12ace8be518d6aed87dce8cc162f8e0701480676996ebe76ad1093f785c8148484e3f14c6bae01499a1a3434d07c465aa6130c18fcbf66236c SHA512 1ca0e35eff5b344ee416de4cb958d7f04d4e5e9f2efff524576b1fc3c2882dbc068d35f25670e7efe5fcb51308b165393b1078fc46585ec6d40052daa0628a05
 DIST tor-0.4.6.2-alpha.tar.gz 7726760 BLAKE2B 01bd4b5b1b5f675b880b8ded422871a0f7538f3206ab86c6ddb12d99f6279c052d5b1d6f139231f9f9b989c18b0027854530e7a66a1a48ab5cbd5496747c23a3 SHA512 4a3d20389cc5516b45448a001d50488a30e959f256be45e91dafdadb0f13339099d183d3b1a7e4f5ca1f4861312151849f8ad8e360d5f07e8135ea7cfbb2ed5f
-EBUILD tor-0.4.4.8.ebuild 2402 BLAKE2B 73413ad692d0c74f51000ee1d52805046c116646741effc3cf86ee06347a671647e26142b0a5b0ae54196022e752fc125ab2d1b52b96db31750fdf5bdd82dd30 SHA512 64a6bea16d866f27d3b229463532a4f16864f16f41e7e2f750f6a0079fa24594b0f3d1b0834c6a8a09c85260f26d70a54f45bfc3b0e8d7710a1f60bd66af7ef5
-EBUILD tor-0.4.5.7.ebuild 2393 BLAKE2B 4f2353dbf166c8e6957353482ca3e9a00220aac6902f57adb9810d4bdc47430c3fc024e6f2c0b9dffa0a00a60fe737afa046f941b1bc0b95645af76d73967004 SHA512 2dd29cedcd161d11727691aa4531e7b81c3d2635e3559d88b423253a466e7cd3fdeb23c24ab478a0914377de84f83978984c3765aa88404d40866e59610fb3a8
-EBUILD tor-0.4.6.2_alpha.ebuild 2347 BLAKE2B 748c868fe10e2ba502f88fb2ed607c19334ce0d7a6b97e0e76ce52a6e51fcf9169bc6ccc3f6a06ba02f4a4011fc64525fe61ae95c0680eb21fddca0b945d7ae8 SHA512 6df906de9f7865ac6498f6d8aae0f6997b4c55310af0c8f47abb8f8ce8076670e14b174a3cb13b652b1b896dd2cde51482789c90e5bbf37f26e88e4b816faf98
+EBUILD tor-0.4.4.8.ebuild 2342 BLAKE2B 9ea3d509751c16da4534da202dd99ff53d5e1f3da18ce4444ad79325a62e9caa038c74dac4a478849074beb1f47632eef44319930287bba37007e48b143c260b SHA512 427048288889ad77d3d134842107d95eeedfe8f8851e11a7099dbcf597cf1bca3f34f13b7acab2f4882584b4dca127a10912d5ef01c7b127bbd1c7ba55d664c4
+EBUILD tor-0.4.5.7.ebuild 2333 BLAKE2B f981eb26e5b94060b5f79612f54f788963d2afaab3b25ffd039b300f586f154baab400abd105522bd721f432feb09c7b32bc22816a0d46afa01061385315294a SHA512 39a687cf9c0b3058778ab0c676da2b37cbe17b30ee9e7b412513c59c4a3b367c53271b7b268ea06b3ee7b8cf0b6a9529058a5a752eb09a2e3829cf82cf55bf45
+EBUILD tor-0.4.6.2_alpha.ebuild 2287 BLAKE2B 9209d22c7e8cdc6416e088353011f6ebd229c40496333e4abd12f777a5259e3607aab006e3bbee4891274d570b997df8c73c1b4a54bbc23b88088166bda67951 SHA512 2b21f3411ad24e874cb66b08c3a40ac7d493dc82f810dc25664f3c1413412e39bc2cd6fce630c26bbb225c8c641a61e2f38a72063796fe91ca86d9f583a34db3
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.4.8.ebuild b/net-vpn/tor/tor-0.4.4.8.ebuild
index 3ef4e3e4dd5e..87ab91dad673 100644
--- a/net-vpn/tor/tor-0.4.4.8.ebuild
+++ b/net-vpn/tor/tor-0.4.4.8.ebuild
@@ -16,15 +16,14 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist]
 	lzma? ( app-arch/xz-utils )
 	scrypt? ( app-crypt/libscrypt )
 	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
diff --git a/net-vpn/tor/tor-0.4.5.7.ebuild b/net-vpn/tor/tor-0.4.5.7.ebuild
index 1692b0d98370..c06dbc2d79e0 100644
--- a/net-vpn/tor/tor-0.4.5.7.ebuild
+++ b/net-vpn/tor/tor-0.4.5.7.ebuild
@@ -16,15 +16,14 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist]
 	lzma? ( app-arch/xz-utils )
 	scrypt? ( app-crypt/libscrypt )
 	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
diff --git a/net-vpn/tor/tor-0.4.6.2_alpha.ebuild b/net-vpn/tor/tor-0.4.6.2_alpha.ebuild
index 63ea086b109c..1ace955550cb 100644
--- a/net-vpn/tor/tor-0.4.6.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.6.2_alpha.ebuild
@@ -16,15 +16,14 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=[-bindist]
 	lzma? ( app-arch/xz-utils )
 	scrypt? ( app-crypt/libscrypt )
 	seccomp? ( >=sys-libs/libseccomp-2.4.1 )