gentoo resync : 14.05.2020

33 files changed, 135 insertions, 178 deletions

diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 8b291d4a3413..66e239fc1c45 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.32 b/metadata/md5-cache/net-vpn/libreswan-3.32
new file mode 100644
index 000000000000..94fd579a71ba
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.32
@@ -0,0 +1,15 @@
+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 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare 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= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=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= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.32.tar.gz
+_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d3ecaa895f30ed0f60bbc65f8c4d4d29
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r1 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r1
deleted file mode 100644
index 5cbb602421aa..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 <net-misc/networkmanager-1.19 >=gnome-extra/nm-applet-1.7.0[gtk] >=x11-libs/gtk+-3.4:3 ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=NetworkManager OpenVPN plugin
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=gtk test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 <net-misc/networkmanager-1.19 >=gnome-extra/nm-applet-1.7.0[gtk] >=x11-libs/gtk+-3.4:3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=095903fb693a16dce478e835ced3337f
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r2 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r2
index 274cc6eca012..0c4dc6a49eda 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r2
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10-r2
@@ -4,11 +4,11 @@ DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d00cd2ee09944cd02c7916ef4a47274a
+_md5_=acddeacf42c9132aa8b69fd9178fd6ad
diff --git a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r1 b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r1
deleted file mode 100644
index 4e333031ea60..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 <net-misc/networkmanager-1.19 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=NetworkManager PPTP VPN plugin
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
-IUSE=gtk
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=app-crypt/libsecret-0.18 <net-misc/networkmanager-1.19 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bc41fef5eaca4c175db77d004529a31
diff --git a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2 b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
index ee33f94daadb..d28f66c532cf 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
+++ b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager PPTP VPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
 IUSE=gtk
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=net-libs/libnma-1.2.0 >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=609bcf52fd8129e9a3947a61064de511
+_md5_=8fc312b9865bf3ffe5be6dcc3fc97ef2
diff --git a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0 b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0
deleted file mode 100644
index 113d48ead94d..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/dbus-glib-0.74 net-misc/sstp-client >=net-misc/networkmanager-1.2.0 net-dialup/ppp:= gtk? ( x11-libs/gtk+:3 app-crypt/libsecret ) virtual/pkgconfig sys-devel/gettext dev-util/intltool
-DESCRIPTION=Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/sstp-client/
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.74 net-misc/sstp-client >=net-misc/networkmanager-1.2.0 net-dialup/ppp:= gtk? ( x11-libs/gtk+:3 app-crypt/libsecret )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/sstp-client/network-manager-sstp/1.2.0/NetworkManager-sstp-1.2.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16029d8876f49cbca5a39fe364d7fb84
diff --git a/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1 b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
new file mode 100644
index 000000000000..f980ee8ed531
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.1.0 app-crypt/libsecret ) dev-util/gdbus-codegen virtual/pkgconfig sys-devel/gettext dev-util/intltool
+DESCRIPTION=Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/sstp-client/
+IUSE=gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 net-misc/sstp-client >=net-misc/networkmanager-1.1.0 net-dialup/ppp:= gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.1.0 app-crypt/libsecret )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/sstp-client/network-manager-sstp/1.2.0/NetworkManager-sstp-1.2.0.tar.bz2
+_md5_=1bc4c5342c4e6f0a7ca66d53dc3e1fca
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r1 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r1
deleted file mode 100644
index 94a630ab32f4..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3 glib? ( gnome-extra/nm-applet[gtk] <net-misc/networkmanager-1.19 ) dev-util/intltool
-DESCRIPTION=NetworkManager StrongSwan plugin
-EAPI=7
-HOMEPAGE=https://www.strongswan.org/
-IUSE=+glib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret gnome-extra/nm-applet net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3 glib? ( gnome-extra/nm-applet[gtk] <net-misc/networkmanager-1.19 )
-SLOT=0
-SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.4.5.tar.bz2
-_md5_=2df3fb5eb5e3424f1bba2fb7b48f140a
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r2 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r2
index e3a4e45baef2..40495f9557be 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r2
+++ b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.4.5-r2
@@ -4,9 +4,9 @@ DEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager net-v
 DESCRIPTION=NetworkManager StrongSwan plugin
 EAPI=7
 HOMEPAGE=https://www.strongswan.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager net-vpn/strongswan[networkmanager] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.4.5.tar.bz2
-_md5_=474b6acafa7d8043348cac652cd45721
+_md5_=08541ba9a9c904972053e47ff9e09724
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.1 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.1
new file mode 100644
index 000000000000..5ad899f2573f
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager >=net-vpn/strongswan-5.8.3[networkmanager] x11-libs/gtk+:3
+DESCRIPTION=NetworkManager StrongSwan plugin
+EAPI=7
+HOMEPAGE=https://www.strongswan.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager >=net-vpn/strongswan-5.8.3[networkmanager] x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.5.1.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b4febe94177d8c2a713e43b3c77c8901
diff --git a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r1 b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r1
deleted file mode 100644
index 9fe675f2ff5b..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 <net-misc/networkmanager-1.19 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=NetworkManager VPNC plugin
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=gtk test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 <net-misc/networkmanager-1.19 >=gnome-extra/nm-applet-1.2.0[gtk] >=x11-libs/gtk+-3.4:3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c3e6b9502d988ba80c42179d51cb139
diff --git a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2 b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2
index 5ce7695c2136..edb3b456ca3f 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2
+++ b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=NetworkManager VPNC plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.2.0 >=app-crypt/libsecret-0.18 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d5e91b15f3e16ff63d1581e63b2c88d
+_md5_=14df9bb3e4ba23342046c2626a20be87
diff --git a/metadata/md5-cache/net-vpn/ocserv-1.0.0 b/metadata/md5-cache/net-vpn/ocserv-1.0.1
index 6568623b31c1..5a1f6e5fa5c9 100644
--- a/metadata/md5-cache/net-vpn/ocserv-1.0.0
+++ b/metadata/md5-cache/net-vpn/ocserv-1.0.1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig test? ( net-libs/gnutls[tools(+)] net-libs/socket_wrapper sys-libs/nss_wrapper sys-libs/uid_wrapper ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig test? ( net-libs/gnutls[tools(+)] net-libs/socket_wrapper net-vpn/openconnect sys-libs/nss_wrapper sys-libs/uid_wrapper ) virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
 DESCRIPTION=Openconnect SSL VPN server
 EAPI=7
 HOMEPAGE=https://ocserv.gitlab.io/www/index.html
 IUSE=geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=ftp://ftp.infradead.org/pub/ocserv/ocserv-1.0.0.tar.xz
+SRC_URI=ftp://ftp.infradead.org/pub/ocserv/ocserv-1.0.1.tar.xz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5ec7fc1e732dabea6654aa16058330a8
+_md5_=2876113b39b7cf29c8f56a470c859dd5
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.06 b/metadata/md5-cache/net-vpn/openconnect-8.06
index 6a4370c70d69..7ffba0497543 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.06
+++ b/metadata/md5-cache/net-vpn/openconnect-8.06
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( >=dev-lang/python-3.7.7-r1:3.7[xml] >=dev-lang/python-3.6.10:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext )
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install prepare pretend setup test unpack
 DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
 DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f48f274fe8d99ef00a52357b7064b0a3
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.08 b/metadata/md5-cache/net-vpn/openconnect-8.08
index f389a0cfde68..b483687587e0 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.08
+++ b/metadata/md5-cache/net-vpn/openconnect-8.08
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( >=dev-lang/python-3.7.7-r1:3.7[xml] >=dev-lang/python-3.6.10:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
 DEFINED_PHASES=configure install prepare pretend setup test unpack
 DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
 DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
 EAPI=7
 HOMEPAGE=http://www.infradead.org/openconnect.html
 IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.08.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4dfc444100da6cb15cf307b6e1863bd0
+_eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c2a1364dda0dad5f6fb87139e94b15aa
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.09-r1 b/metadata/md5-cache/net-vpn/openconnect-8.09-r1
new file mode 100644
index 000000000000..dde537cf5a43
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openconnect-8.09-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
+DEFINED_PHASES=configure install prepare pretend setup test unpack
+DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
+DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
+EAPI=7
+HOMEPAGE=http://www.infradead.org/openconnect.html
+IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test kernel_linux
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
+_eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3b460a4d715c68dbdbe593d16b16c620
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index ebbfb995029c..ebc149b3c99f 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( >=dev-lang/python-3.7.7-r1:3.7[xml] >=dev-lang/python-3.6.10:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
+DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
 DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
 EAPI=7
 HOMEPAGE=http://www.infradead.org/openconnect.html
 IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test kernel_linux
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
+RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4dfc444100da6cb15cf307b6e1863bd0
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-any-r1	c26f95a5042de003dc58bef955e41c88	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2188aaa93e68eb61d7cf71e3d487bdc7
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.13.3 b/metadata/md5-cache/net-vpn/openfortivpn-1.13.3
new file mode 100644
index 000000000000..8b7dc4c18a55
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.13.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Fortinet compatible VPN client
+EAPI=7
+HOMEPAGE=https://github.com/adrienverge/openfortivpn
+IUSE=libressl kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-3-with-openssl-exception openssl
+RDEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.13.3.tar.gz -> openfortivpn-1.13.3.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=99878fa4ec24dc6d80891d61f7f62963
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6 b/metadata/md5-cache/net-vpn/openvpn-2.4.6
deleted file mode 100644
index dd6b587bb6f3..000000000000
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
-EAPI=6
-HOMEPAGE=https://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl systemd test userland_BSD kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3004a2499aa152737d29574789de8b4d
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
deleted file mode 100644
index bdbc6cab6ee0..000000000000
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
-EAPI=6
-HOMEPAGE=https://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl systemd test userland_BSD kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://swupdate.openvpn.net/community/releases/openvpn-2.4.6.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.6/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dd4b87372265280c32f0338d236ff6a
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
deleted file mode 100644
index 51640e4e43cc..000000000000
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
-EAPI=6
-HOMEPAGE=https://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl systemd test userland_BSD kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenVPN/openvpn/archive/v2.4.7.tar.gz -> openvpn-2.4.7.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.7/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35ef4f1f161918aba5a2a1d4a5aa095b
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.8 b/metadata/md5-cache/net-vpn/openvpn-2.4.8
deleted file mode 100644
index 41d05a11364e..000000000000
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) test? ( dev-util/cmocka )
-DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
-EAPI=7
-HOMEPAGE=https://openvpn.net/
-IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl systemd test userland_BSD kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn )
-REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenVPN/openvpn/archive/v2.4.8.tar.gz -> openvpn-2.4.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=50211dddeed616e4b29622046cd58e47
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.9 b/metadata/md5-cache/net-vpn/openvpn-2.4.9
index 26e531211189..8521c88b050a 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.9
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.9
@@ -5,7 +5,7 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=7
 HOMEPAGE=https://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl systemd test userland_BSD kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=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 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/openvpn/archive/v2.4.9.tar.gz -> openvpn-2.4.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f2c5dbb9791f03632898f188b809781f
+_md5_=85e2656a3ab969c832520974c76b07f1
diff --git a/metadata/md5-cache/net-vpn/peervpn-0.044-r4 b/metadata/md5-cache/net-vpn/peervpn-0.044-r5
index b4dbac9b06c7..0f9451a9f399 100644
--- a/metadata/md5-cache/net-vpn/peervpn-0.044-r4
+++ b/metadata/md5-cache/net-vpn/peervpn-0.044-r5
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( <dev-libs/openssl-1.1:0= ) virtual/pkgconfig
+DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( <dev-libs/openssl-1.1:0= )
 DESCRIPTION=P2P mesh VPN
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/peervpn/peervpn
 IUSE=libressl
 KEYWORDS=~amd64 ~x86
@@ -10,4 +11,4 @@ RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( <dev-libs/openssl-1.1:0=
 SLOT=0
 SRC_URI=https://github.com/peervpn/peervpn/archive/eb35174277fbf745c5ee0d5875d659dad819adfc.tar.gz -> peervpn-0.044.tar.gz
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=192ae30f8849554b1a80795fee3a6edb
+_md5_=69386c0f533e7a711913645c511ca278
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
index a999c51ad636..f162a35609e4 100644
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
+++ b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pythondialog:0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-vpn/openvpn
 DESCRIPTION=A VPN command-line tool from protonvpn - python rewrite
@@ -7,9 +7,9 @@ HOMEPAGE=https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng
 IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pythondialog:0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-vpn/openvpn python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pythondialog:0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-vpn/openvpn python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ProtonVPN/protonvpn-cli-ng/archive/v2.2.0.tar.gz -> protonvpn-cli-2.2.0.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=93f2af654601084589e3a9227282726e
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
index 39dc2ddd726c..006e5c72121e 100644
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
+++ b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pythondialog:0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-vpn/openvpn
 DESCRIPTION=A VPN command-line tool from protonvpn - python rewrite
@@ -7,9 +7,9 @@ HOMEPAGE=https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng
 IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pythondialog:0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-vpn/openvpn python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pythondialog:0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-vpn/openvpn python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ProtonVPN/protonvpn-cli-ng/archive/v2.2.2.tar.gz -> protonvpn-cli-2.2.2.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	054fa5f0442c7ccb4d4a05410d92123b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=93f2af654601084589e3a9227282726e
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.8.4 b/metadata/md5-cache/net-vpn/strongswan-5.8.4
new file mode 100644
index 000000000000..d2c9c6843a23
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.8.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=7
+HOMEPAGE=https://www.strongswan.org/
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.8.4.tar.bz2
+_eclasses_=linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=10c833068a52fd64c3fee89387a8e9c6
diff --git a/metadata/md5-cache/net-vpn/tailscale-0.97_p45 b/metadata/md5-cache/net-vpn/tailscale-0.97_p45
deleted file mode 100644
index 8b25ab7204cb..000000000000
--- a/metadata/md5-cache/net-vpn/tailscale-0.97_p45
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DESCRIPTION=Tailscale vpn client
-EAPI=7
-HOMEPAGE=https://tailscale.com
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=net-firewall/iptables virtual/tmpfiles
-SLOT=0
-SRC_URI=amd64? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_amd64.tgz ) arm? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_arm.tgz ) arm64? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_arm64.tgz ) x86? ( https://pkgs.tailscale.com/stable/tailscale_0.97-45_386.tgz )
-_eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34e1630abf68f6aa0a4f0b13dadc201c
diff --git a/metadata/md5-cache/net-vpn/tailscale-0.98_p0 b/metadata/md5-cache/net-vpn/tailscale-0.98_p0
index 9fd47b8fd958..25f561481b03 100644
--- a/metadata/md5-cache/net-vpn/tailscale-0.98_p0
+++ b/metadata/md5-cache/net-vpn/tailscale-0.98_p0
@@ -9,4 +9,4 @@ RDEPEND=net-firewall/iptables virtual/tmpfiles
 SLOT=0
 SRC_URI=amd64? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_amd64.tgz ) arm? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_arm.tgz ) arm64? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_arm64.tgz ) x86? ( https://pkgs.tailscale.com/stable/tailscale_0.98-0_386.tgz )
 _eclasses_=multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b4ae4129b3945fedd06b3b9f87acada
+_md5_=f383a42f538ddf4038f19fb6258d1201
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200413 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200506
index 8fe0938b7bc4..f8d46aefcb39 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200413
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200506
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200413.tar.xz
+SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200506.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	ed97304af323c7b2f6934f229982cb7d	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7ef498692c0e6be553328e2d03eceb72
+_md5_=8391cea5b78183e4ac3f15ff571923ba
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
index 5265efcc3720..eb370115fe71 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200319
@@ -10,4 +10,4 @@ RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/r
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200319.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c422b1fc211135bf1b4475bbca61e5c
+_md5_=8e8de9696981b20a52e27d838a5aeb69
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
new file mode 100644
index 000000000000..996f94255777
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
+EAPI=7
+HOMEPAGE=https://www.wireguard.com/
+IUSE=+wg-quick kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) !<virtual/wireguard-1
+SLOT=0
+SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200513.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	ed97304af323c7b2f6934f229982cb7d	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aa9f1f91ac78d697f19de24f1857e31d