gentoo resync : 03.03.2019

49 files changed, 1077 insertions, 200 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index ce50ef0a9cce..27bb11120a3f 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/isatapd/Manifest b/net-vpn/isatapd/Manifest
index dc0c063cd60c..f60b598dace2 100644
--- a/net-vpn/isatapd/Manifest
+++ b/net-vpn/isatapd/Manifest
@@ -1,5 +1,6 @@
+AUX isatapd-linux-4.8.patch 650 BLAKE2B b45ccb0903be122c3561e3096933ec66642ff882848bbd4996dfb03292c1d8c435ad366b077382d4fc002a0f28ec3931a5c3b927cfdbf158c266224c9dab5cdc SHA512 6b4595b6e23d6dc318bc696e8bc271a22d5e0721a172ff1a6926f6f04338997c9b7d9e7abe0747581f259ec8616a1f39c0c98de9535cbdb2d9fb4514ac9da259
 AUX isatapd.service-r2 336 BLAKE2B 23cdfcc30f60a7276408c7f1545b8b1daff592a2bd122c395f6d46281810833db3005c42902b0096ac9788cbb9111342dd42d06fccfe26e3f7e9a6415ea83c09 SHA512 e7e002163ca6c780ec7f3df5cb60923ecb2631628d9ec65c97a60e0071145ce46c4bbef282ebdb322a82bc81cda15b7e256ae9122993df8b1f625c3fcd26c5f9
 AUX isatapd.service.conf 1026 BLAKE2B 345d8ba815b5007dd0901a9b8578f1bedac4005dac42c855a8dd14266624e297c61afc673f6c00c067df3ebe2f5ec7ea417e2019de3507b3a98a880d6f3fdab5 SHA512 d87ace4cb331d561e817c9dd7fce1ab4b9df60016bba40bfc53728f6c8ee418b17ae71753f6caa0e1647f569037b59d93a3a9778c4f7dcdf543eee702be95c76
 DIST isatapd-0.9.7.tar.gz 111524 BLAKE2B eba3a7489c673a0bc44061bb8151f10b3a62b3842c942511f7566212c340188a5fea15a3ac21cfde9009129d63639acfcb08568b5b18a31bacc15905384cf5c1 SHA512 3ddfc8385b666ec8c0552c7b46841f2b5e8ebb5d9aa3119a9a6d4cacea728cb81dced802d51b7c98da4bbb839de6fe68ef1bc5f62914b48638b6f168fc06100a
-EBUILD isatapd-0.9.7-r2.ebuild 802 BLAKE2B 394b7d85539fa2596eea68c31e789b276b59d50d962c3906717e5fd125b5987e4fcc48e39e3a65cb252461bbc6f2baeaa50ca6765e5f2caab8066e0757785ca0 SHA512 5b10c17c03d278d9c4b7eb5b043d8d5e7c8cce84757643be967902766a2f8908ad13c66abd55c944659eeee3358e7ca8c7cf500f86e5320db6d5bd93eb2f8cdc
+EBUILD isatapd-0.9.7-r2.ebuild 943 BLAKE2B 39d8149bf16955c80a0f1aca239df2e93b3ff66a495129e195ad39de89a75b93fd33b5f7b72ff921db28007e7877cc8bc3598894eb90467571af255856fb27c9 SHA512 ef6b10ece3f218e8c2a7a36e5d19049d38ae97178c5fc1554b6e19cf8652d4dae5fc2a3767c62e383beef5c6d7f862d75d4b8217c0d876d8804913e9a6683450
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/isatapd/files/isatapd-linux-4.8.patch b/net-vpn/isatapd/files/isatapd-linux-4.8.patch
new file mode 100644
index 000000000000..a95fe159d6d9
--- /dev/null
+++ b/net-vpn/isatapd/files/isatapd-linux-4.8.patch
@@ -0,0 +1,25 @@
+From: Bernhard Schmidt <berni@debian.org>
+Subject: Fix FTBFS with headers from Linux 4.8+
+Bug-Debian: https://bugs.debian.org/844869
+
+Linux 4.8+ adds a few includes to linux/if_tunnel.h, which conflict with
+concurrent use of netinet/ip.h. Drop the latter and manually define IP_DF
+which is not found anywhere else
+--- a/src/tunnel.c
++++ b/src/tunnel.c
+@@ -18,10 +18,13 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-#include <netinet/ip.h>
+ #include <net/if.h>
+ #include <linux/if_tunnel.h>
+ 
++#ifndef IP_DF
++	#define IP_DF	0x4000		/* dont fragment flag */
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ 	#include <config.h>
+ #endif
+
diff --git a/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
index 9474bf9461e8..210a012e9532 100644
--- a/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
+++ b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 inherit linux-info systemd
 
-DESCRIPTION="creates and maintains an ISATAP tunnel (rfc5214)"
+DESCRIPTION="Creates and maintains an ISATAP tunnel (rfc5214)"
 HOMEPAGE="http://www.saschahlusiak.de/linux/isatap.htm"
 SRC_URI="http://www.saschahlusiak.de/linux/${P}.tar.gz"
 
@@ -19,9 +19,14 @@ RDEPEND=""
 CONFIG_CHECK="~TUN"
 ERROR_TUN="CONFIG_TUN is needed for isatapd to work"
 
+PATCHES=( "${FILESDIR}"/${PN}-linux-4.8.patch )
+
 src_prepare() {
+	default
 	sed -e '/^opts/s:opts:extra_started_commands:' \
 		-i openrc/isatapd.init.d || die
+	sed -e 's:#!/sbin/runscript:#!/sbin/openrc-run:' \
+		-i openrc/isatapd.init.d || die
 }
 
 src_install() {
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 3fbe8034c117..753bb74d9e32 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,10 +1,5 @@
-AUX libreswan-3.23-modern-kernels.patch 525 BLAKE2B 5c1353932dddd0febf60ae0b8c03e81e1c1397e6ea93619e5d02f60c4a735a0b63c8c1dfc6a3a79c55addf4af20e3e3f2b82b3f369b2c61d62c51c3c57f3d241 SHA512 e2a798d1bc8b089056a400bc0918b1037420a268e49e0183db99c565da9c8bce344e5fa9c3cdcc246a066450aceeec1af333f8b4c931e4e9414d6485db03bd13
 AUX libreswan-3.25-no-curl.patch 706 BLAKE2B 2d1f74b6b1d65f2e3ddad8646e2e5ea8a4aa98b4eee617521255c7bec35f53f1cde6254cd82f731e6ad5701f16cceaba907653e1c490ef97b2648f9d066e0328 SHA512 e03b17bc647f0d817cacfee2c96c37c50615d8ad53fdfb0be7095bf79fe3317d66092f006aeaf1ea4d67841ccdba29ab4a6e1ce181459b41d16dedcee5cb73d3
-AUX libreswan-3.26-nss-link.patch 719 BLAKE2B 80a98e3e4b4773245ebdb005535603879df9b54ed7f8cec8864059af0fed51379c6311f1f7f52a99467e989a9f56c6d80b8919f2e72ade32fab52d9dd241b861 SHA512 1b55612b634fdd48829854e0c7a4eba5b19080dc75d1f5b8e1c59c4988bd45cb043ef6669172bf0d8dd4ba914fd924d47ff3bb5712cde4c09fea5141933e01b3
-AUX libreswan-3.26-nss.patch 853 BLAKE2B 487afd48208223030aa5a4fc434f1bc5d817d9ed78392399ef98db09f22a2d975510134a9ae55875b7e15c0fef221393d6648fb00cd208b4aab140aa0c142318 SHA512 118609fd2ed7e9c35333106b6896ce3a9c463cd3dda7f0bce31e2cccf91f88080f34ec39f8f3b5f3453eedea520f2e1b031b6771502d8c74831e20883a162d6e
-DIST libreswan-3.25.tar.gz 3988630 BLAKE2B 8479b5b0d7d49055b7dcefa6c3b2f469b0aa60005e05446d5c1c6f73a32c904835422248c6ead2a1c2dc83b63794fd50f7461fd22c4206414b5890c01b99b722 SHA512 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
 DIST libreswan-3.27.tar.gz 3720103 BLAKE2B 51ee792cd3fb8330a9cfee0b1a27e48c9a8c8fd3346e8c06fe0a911c813c400ef62d68b1d06bb849695aad5f4d5a496dc444b2543aa9ffbc59d373081c0b85e5 SHA512 b92ecfd08b9d19dc801032176eff3dd07f625223d4f0dd07ff10f639644573430a55f7aebfcc8b9d2424e194ca9d06b17ad5a13dad5dc6f659d19bc5d32520f5
-EBUILD libreswan-3.25.ebuild 2856 BLAKE2B 0e2573d71d4f96d6cf271e6d71ad7efffd336877ede43f5ed2f7e35103d8cd67194df195c7bab7d9be513c2ee85c869af8778a8f9fefaf2087e0114b4d052a90 SHA512 be841c666376e6b410b9bd5f15d84c23f3bfa5848ea382b29108ce104cdb22627af145bdaa9b5d5447560705859cc5726643562a109b8b9d126967251c8e0db8
 EBUILD libreswan-3.27-r1.ebuild 2939 BLAKE2B bbceef07aaefbf8323a2342bf8479ae47ef9824581095d065a5d61ffc9e3c6434f8217b88221c421f2d1f377cf8f50c3e31661b7627abbc81a51ad7e2fc9a759 SHA512 6de7bbf1962589cfd1b4cdb4d9b3db2fec2d997a5e7c46dbfd35330521a3c42915adf36a6214736da5173f851fd3f659f89d23782a197d72a5d33be29e42b093
 EBUILD libreswan-3.27.ebuild 2811 BLAKE2B 04ac4dc887783fcadd8aaa444ec59c71b9221b4f968d6ab13305866d26f5025208c806307b63874607de8617ad64e69fce54b7a08d3e958b20e5331531048f94 SHA512 e3b7a8b50f17f426cdab73fc237ef555e8d0d89d06546a60d0c38d01001620e9b03ec4e8e933aa587561019057aa71ee80250b8c3ae6aac502a93e5c6a5cd77b
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch b/net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch
deleted file mode 100644
index 5dedfeb34c7d..000000000000
--- a/net-vpn/libreswan/files/libreswan-3.23-modern-kernels.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/programs/pluto/kernel_netlink.c
-b/programs/pluto/kernel_netlink.c
-index 8cec3a2..a2500f4 100644
---- a/programs/pluto/kernel_netlink.c
-+++ b/programs/pluto/kernel_netlink.c
-@@ -51,8 +51,8 @@
- #include <linux/if_addr.h>
- #include <linux/if_link.h>
-
--#include "libreswan.h" /* before xfrm.h otherwise break on F22 */
- #include "linux/xfrm.h" /* local (if configured) or system copy */
-+#include "libreswan.h" /* before xfrm.h otherwise break on F22 */
-
- #include "libreswan/pfkeyv2.h"
- #include "libreswan/pfkey.h"
diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch b/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch
deleted file mode 100644
index 267aa2120dbd..000000000000
--- a/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b3199806cc66de4888917ddc85b511b433e43d63 Mon Sep 17 00:00:00 2001
-From: Paul Wouters <pwouters@redhat.com>
-Date: Mon, 17 Sep 2018 11:23:11 -0400
-Subject: [PATCH] building: -lfreebl is no longer needed
-
----
- mk/config.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/config.mk b/mk/config.mk
-index 3bd2527497..d8497c2104 100644
---- a/mk/config.mk
-+++ b/mk/config.mk
-@@ -234,7 +234,7 @@ BISONOSFLAGS?=
- NSSFLAGS?=$(shell pkg-config --cflags nss)
- # We don't want to link against every library pkg-config --libs nss
- # returns
--NSS_LDFLAGS ?= -lnss3 -lfreebl -lnssutil3
-+NSS_LDFLAGS ?= -lnss3 -lnssutil3
- NSS_SMIME_LDFLAGS ?= -lsmime3
- NSS_UTIL_LDFLAGS ?= -lnssutil3
- NSPR_LDFLAGS ?= -lnspr4
diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss.patch b/net-vpn/libreswan/files/libreswan-3.26-nss.patch
deleted file mode 100644
index 89a6436a2a26..000000000000
--- a/net-vpn/libreswan/files/libreswan-3.26-nss.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 910f69119b491c6d7abcc85cf8911d2fa012a135 Mon Sep 17 00:00:00 2001
-From: Andrew Cagney <cagney@gnu.org>
-Date: Mon, 17 Sep 2018 11:56:56 -0400
-Subject: [PATCH] ecdsa: don't include NSS's "blapi.h", no longer needed and
- not on debian
-
-(not to be confused with "lbapit.h", which also looks suspect)
-
-Follow-up b3199806cc66de4888917ddc85b511b433e43d63 and
-2d093c9fb83c8104604e4b40defa4e41129577ea.  The latter
-relaced the call to ECDSA_VerifyDigest() with PK11_Verify().
----
- programs/pluto/keys.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/programs/pluto/keys.c b/programs/pluto/keys.c
-index b3df5802cf..bd9d8d8c6c 100644
---- a/programs/pluto/keys.c
-+++ b/programs/pluto/keys.c
-@@ -72,7 +72,6 @@
- #include <secerr.h>
- #include <secport.h>
- #include <time.h>
--#include <blapi.h>
- #include "lswconf.h"
- #include "lswnss.h"
- #include "secrets.h"
diff --git a/net-vpn/libreswan/libreswan-3.25.ebuild b/net-vpn/libreswan/libreswan-3.25.ebuild
deleted file mode 100644
index a8085009764a..000000000000
--- a/net-vpn/libreswan/libreswan-3.25.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs
-
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="amd64 ~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 pam seccomp selinux systemd test"
-
-COMMON_DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( net-dns/unbound:= net-libs/ldns )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	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="${COMMON_DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-misc/openswan
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-no-curl.patch"
-
-	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 INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	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_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
-		certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
-		eend $?
-	fi
-}
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
new file mode 100644
index 000000000000..1466760af78e
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -0,0 +1,7 @@
+AUX networkmanager-fortisslvpn-1.2.6-location-fix.diff 1257 BLAKE2B 1ea633c11ec59a634c570873cac3f6c9203cfeb66a60d1056613e794b7dfa9d21331a0abca7ef1f1aff4f8c1317808431a318042963153ee93c92d596fb5440c SHA512 586e408a65cc83cc3e0e8238eab673b484188eb7e7d62c8bc14abaf05a82acff24f9281a904624fe45aae08b0804e7516c393d7ef52f1c2dcbb4949f23873bca
+AUX networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff 747 BLAKE2B c12251887128e21f7025f6a111aa9d022899ace86000ba84e8e139ca02500e60c584b21d101f74c4326a422a299badd62647e1779059fe0425652eebb4b973b2 SHA512 a1701ddb5fcc49ceafd8d87c4a5e50dd7aeebfe32ba589f28c931dc93274531a16a0414db6e79fecfa4c03c182c7824cd3504d76234d544d488a5fdb3b34b9c4
+DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 BLAKE2B 1e3aeab2df0b91b09fba1678861215f164251dc1f51c12c0cdbb4c53c939849d75c5f70552e608a11a0c9c7890a15d5dd4b218c7c440c92bfa8df157ff20babf SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d
+DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
+EBUILD networkmanager-fortisslvpn-1.2.6.ebuild 1062 BLAKE2B 0dd5ce66bb75b9bc0924b3c61574fe74f28456c1f4b400fb99cc67f95352c5531c6fb3ce9119353b6d7140a5e1a352e33fb0bf3d15b6d61d3b4cba888c5a6c85 SHA512 90842eecb134600932468239e539350849c5c024021fc10b77a06f557fb71e6eecad349403d4b64185e7045d3f1944027641ab3a882984e1e3f07463e1fe8360
+EBUILD networkmanager-fortisslvpn-1.2.8.ebuild 868 BLAKE2B 66af3c3ee466686e9a24a321b64d0deb2ef5cee26429f3925ef4f9fe8fdb50ae5fccd8d8acaef03e92bfc82dc4dc0d5cd79078304ecda137cfd8af50605940bf SHA512 26677c7e7bd9d2fea1218218971fd7fb2043d10d2804811c5f3cea69df0ad4617cc46a77da55028d9539f843bcb493c8669370a9a4f5c80ea65850bf892bc6aa
+MISC metadata.xml 380 BLAKE2B 68402a902953176bf28ebc6521a06c109cbf2a448c184665cef3ab42ec6b1f7f426a31b7714275e215ae742ff79b2fc7b5c4d80046f8a15b5a73fa5d6a05ebf1 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
new file mode 100644
index 000000000000..c0439bf0e394
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index 59ba94121..6419e9f57 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -26,6 +26,8 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
+ nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
+ nmvpnservice_DATA = nm-fortisslvpn-service.name
+ 
++fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
++
+ BUILT_SOURCES =
+ 
+ ###############################################################################
+@@ -276,7 +278,7 @@ auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
+ if WITH_LIBNM_GLIB
+ # Install a file with full path to plugins for an old gnome-shell
+ # https://bugzilla.gnome.org/show_bug.cgi?id=693590
+-install-data-hook:
++install-compat-name-file:
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
+ 	sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
+ 	    -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+@@ -286,8 +288,14 @@ install-data-hook:
+ 
+ uninstall-hook:
+ 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-fortisslvpn-service.name
++else
++install-compat-name-file:
++	@:
+ endif
+ 
++install-data-hook: install-compat-name-file
++	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
++
+ appdatadir = $(datadir)/appdata
+ appdata_files = $(appdata_in_files:.xml.in=.xml)
+ if WITH_GNOME
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
new file mode 100644
index 000000000000..f882679954f7
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
@@ -0,0 +1,21 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6bef38ed5..951b829e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -95,6 +95,7 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
+ pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
+ 
+ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
++	shared/nm-utils/nm-shared-utils.c \
+ 	src/nm-fortisslvpn-pppd-plugin.c \
+ 	src/nm-ppp-status.h
+ src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
+@@ -102,7 +103,7 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
+ 	-module -avoid-version
+ src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
+ 	src/libnm-fortisslvpn-pppd-service-dbus.la \
+-	$(GLIB_LIBS)
++	$(GLIB_LIBS) \
+ 	$(LIBNM_LIBS)
+ 
+ ###############################################################################
diff --git a/net-vpn/networkmanager-fortisslvpn/metadata.xml b/net-vpn/networkmanager-fortisslvpn/metadata.xml
new file mode 100644
index 000000000000..b7fa921dff8f
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mathy@vanvoorden.be</email>
+    <name>Mathy Vanvoorden</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
new file mode 100644
index 000000000000..94074c6b078a
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	>=net-vpn/openfortivpn-1.2.0
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
+	"${FILESDIR}"/${P}-location-fix.diff
+	# Upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346
+	"${FILESDIR}"/${P}-nm-utils-dependency-fix.diff
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome)
+}
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
new file mode 100644
index 000000000000..0aadb4db8bb0
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	>=net-vpn/openfortivpn-1.2.0
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome)
+}
diff --git a/net-vpn/networkmanager-libreswan/Manifest b/net-vpn/networkmanager-libreswan/Manifest
new file mode 100644
index 000000000000..e808bf81fbc9
--- /dev/null
+++ b/net-vpn/networkmanager-libreswan/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 BLAKE2B e27180b94807db3bab7d41502674fb9e950fc8eb79447a901f2c69f9fdbbf99032e007cb1e631ef5f8eec5dbed40e74f1e0eadecef7fdfc3b618500447a3a9a8 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798
+EBUILD networkmanager-libreswan-1.2.6.ebuild 837 BLAKE2B d6683af55cc293b35cd492e6862b8958243b106b9e0d8742be124134b9e83251448dd9b74afc486cef1bc88df3026e4569e3c6fa089653586f0c4be6da7c4269 SHA512 5c046e22b2c49e4dac512de88f8dab8c578145865763bd6f5f3cb31c94d68ea28ddadffb5307624b2b193b9e0b36d33a191b5f057944706197dc9cd9f63784d0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-vpn/networkmanager-libreswan/metadata.xml b/net-vpn/networkmanager-libreswan/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/net-vpn/networkmanager-libreswan/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
new file mode 100644
index 000000000000..003f0f98b87a
--- /dev/null
+++ b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-libreswan"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager libreswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-1.2.0:=
+	net-vpn/libreswan
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+	!net-misc/networkmanager-openswan
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		$(use_with gtk gnome)
+	)
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
new file mode 100644
index 000000000000..91aa8e1a98c6
--- /dev/null
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-openconnect-1.2.4.tar.xz 647944 BLAKE2B a2a096224a42e5ab55743e46d9030eb036cb0d8d43a957c2b7f056f7de8763ec8d2de84701ac59951540aceefd0329614eb50aa5c57600b3e72fbce0118fe431 SHA512 203652a468525c3f6d374ce7fbf2f5b904a13b5e74fb3898dbfeec863c64a60fd9826fc5d9edb52c3e75b9871f49cb78580914e37a3522e4676ca1c29102d0a2
+EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1121 BLAKE2B a47eb36ad4953016c9e78cea3127a4012a508cd625423d23036c5b5f8888125dddb7126817714a7824bebcfc80d06860f42b51106d83780d7169c66f5f4459c6 SHA512 5ad925a1c60068aade726ad09e98b41c675a07931ce0671b70e6fc0749d59bdc47cb52fbb29b7391beee8a8a93ef70ce36cc463a61a729a7f8e909d2ace583d1
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/metadata.xml b/net-vpn/networkmanager-openconnect/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-vpn/networkmanager-openconnect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..22e99755b27e
--- /dev/null
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenConnect plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libxml2:2
+	>=net-vpn/openconnect-3.02:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=x11-libs/gtk+-3.4:3 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# We cannot drop libnm-glib support yet (--without-libnm-glib)
+	# because gnome-shell wasn't ported yet:
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1394977
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1398425
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		$(use_with gtk gnome) \
+		$(use_with gtk authdlg)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	enewgroup nm-openconnect
+	enewuser nm-openconnect -1 -1 -1 nm-openconnect
+}
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
new file mode 100644
index 000000000000..0fc7a5db730d
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -0,0 +1,5 @@
+DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
+DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
+EBUILD networkmanager-openvpn-1.8.10.ebuild 1258 BLAKE2B 334b88266da2b346eebfd686aa7424b4053af457cc8df1fba239b9dcaad9c6cb90e8c3f0f43903623483ab1f57fb2a4cba0639f3ac4a87ad68e883c6877b14bf SHA512 c5197fde17bf0c7b0ae8800b572924a6af6953413e17497337b076a6d9ea00b733c38ede20751231dd0657139962df4ef6e66f38060f9aeea74d5ce7245c004d
+EBUILD networkmanager-openvpn-1.8.8.ebuild 1256 BLAKE2B edd6d769382e025e7d94e15fb8ea95914b8876147579535dca3734f78789072b0ad9003b6129a92940f06ef3656aa62fa986cbf83b5804ac91b667d38bedde06 SHA512 8cb666f9966fdc926aed39483f3ae052dcb6151f2bbdb6861c4ac56804a1733b355ab2f73e9ba175129c0223324d5cd7a2471e70345bc83455513597ae5161aa
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/metadata.xml b/net-vpn/networkmanager-openvpn/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
new file mode 100644
index 000000000000..be8cb945aed3
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
new file mode 100644
index 000000000000..572c134026e6
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-vpn/networkmanager-pptp/Manifest b/net-vpn/networkmanager-pptp/Manifest
new file mode 100644
index 000000000000..24052dedc717
--- /dev/null
+++ b/net-vpn/networkmanager-pptp/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
+EBUILD networkmanager-pptp-1.2.8.ebuild 1259 BLAKE2B 1794c968d668c0b0079ef759c67394edf67cff321cbbfc52284ee7077c3bb61a309443852722735f9bfc3c553f2dfa9e8c63674280f8d9f8329e993daa7c1ace SHA512 1956fbe0f67c4ecd77154e5381652e6875fc63c2b769f08b06865c377b173accd47f688a0b477bb107ac64e6e3d3d96330ab377f4c2835ba7266f3813137b99b
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-pptp/metadata.xml b/net-vpn/networkmanager-pptp/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-vpn/networkmanager-pptp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
new file mode 100644
index 000000000000..a20000d7800e
--- /dev/null
+++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager PPTP VPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk"
+
+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
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+	myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		${myconf}
+}
diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest
new file mode 100644
index 000000000000..5c563984a459
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 BLAKE2B 170221842c25945da09f94364642be94993ac4ef7bbaffebefc463e18eeff78f3a58d95607a6f0be9fb5ecdabee244d64abb02eb56deb213ac089019089821f4 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776
+EBUILD networkmanager-sstp-1.2.0.ebuild 1162 BLAKE2B 28c0c74a69a179414c8a612b22672c87762e7e58b208e7b4b62b9984d7f294181fbed1057e461e1916f7b14aea7e787428ccb3dff0884ea8aa6f4cf400f62188 SHA512 f23af17221827fdd8e0a871489bcbca52cc706351520c74372e0f8415b502c1ec12b6392b5b34dffb98a838d06aa7074c9ae661a783172b875efc92eb4439570
+MISC metadata.xml 448 BLAKE2B 8f93290e5d04cfbab838f5d22296bcf197d3090c4edea9c024febda06a9425deec7fa9210d360e1fcf56fcc77139bc892aa1db61e9636e10f2e4988a070e1e8b SHA512 4fabcb6e7c561527917c496f22443b2efaaf6b758c86149594d9ceb31fcfd0041566c4a6a53c36976d85217222d437f2a1531b879b3094b8af1f870cd04303b7
diff --git a/net-vpn/networkmanager-sstp/metadata.xml b/net-vpn/networkmanager-sstp/metadata.xml
new file mode 100644
index 000000000000..8ca1d600ab1c
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>m.j.everitt@iee.org</email>
+		<name>Michael Everitt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sstp-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
new file mode 100644
index 000000000000..42e7b976ce88
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PN="NetworkManager-sstp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
+HOMEPAGE="https://sourceforge.net/projects/sstp-client/"
+SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	net-misc/sstp-client
+	>=net-misc/networkmanager-${PV}
+	net-dialup/ppp:=
+	gtk? (
+		x11-libs/gtk+:3
+		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
+	)
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PPPD_VERSION="$(echo $(best_version net-dialup/ppp) | sed -e 's:net-dialup/ppp-\(.*\):\1:' -e 's:-r.*$::')"
+	econf \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \
+		 $(use_with gtk gnome)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
new file mode 100644
index 000000000000..2aa58754ae99
--- /dev/null
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155
+EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 938 BLAKE2B 7d8115c26a8da345f61674c36aa51edba2884d3330325402ab8618e7d8142047b7c27adfb89347ef2dc5dd5c62f5203a1b9dc8ed09900d330caa7364ade52a11 SHA512 3645d9fc3505f0cd0790893b53eaa47fe39b4a4967260483dcdec36bef1d8bfd347dc68cac56e02eb3d5816676e7be3f3c621a1afce47636c44b3340f2249540
+MISC metadata.xml 444 BLAKE2B 99927d1d0c6beeab7cd31eb4ac9dcc7afa038b54ac270cfb671fdcd6543e828147a7220854aeccada6823c5b7d32dfc3bd37924366896014c0341908b4b890d7 SHA512 5dc220ebf57644553266caa7e83d4478b6c7c665199b2bd26943afcb5680a0ed7597e4565043a2098fbad20cd9f5f3991877a4c171288f9ed2572923a7913c73
diff --git a/net-vpn/networkmanager-strongswan/metadata.xml b/net-vpn/networkmanager-strongswan/metadata.xml
new file mode 100644
index 000000000000..0afa017bfd09
--- /dev/null
+++ b/net-vpn/networkmanager-strongswan/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="glib">Enable libnm-glib compatibility.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..de93d1d51007
--- /dev/null
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="NetworkManager"
+MY_P="${P/networkmanager/${MY_PN}}"
+
+DESCRIPTION="NetworkManager StrongSwan plugin"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+glib"
+
+RDEPEND="
+	app-crypt/libsecret
+	gnome-extra/nm-applet
+	net-misc/networkmanager
+	net-vpn/strongswan[networkmanager]
+	x11-libs/gtk+:3
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myeconfargs=(
+		# Don't	enable all warnings, as	some are treated as errors and the compilation will fail
+		--disable-more-warnings
+		--disable-static
+		$(usex glib '' --without-libnm-glib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-vpn/networkmanager-vpnc/Manifest b/net-vpn/networkmanager-vpnc/Manifest
new file mode 100644
index 000000000000..7fd507c4b1fb
--- /dev/null
+++ b/net-vpn/networkmanager-vpnc/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-vpnc-1.2.6.tar.xz 417412 BLAKE2B 00072e2f5449687a55ff4dc0382c4ef2bb2042f9b2a4437d1d6790084ff1b88210e45909808048498f315d59ed5408630ae15d09a1d22e4acbf840554e452546 SHA512 4f8adf58d73cef74a950d822c6f17cd813a1e74fcd3c0391f847541c279e448a6353b83984d593fe5e11138a37b7f1c21b9a24a6843c1d35e4cb68bc29bc3eb1
+EBUILD networkmanager-vpnc-1.2.6.ebuild 1067 BLAKE2B 447f985f9f4944dbec47dbc38114351feb842041b33452d9cac78386c0f7ed2882218806a1c57ee0a4700c5d76603b4f079323757fe76bd7b503b056308da48b SHA512 66c13585ffaed89bfcdd99770064973e34cd6d8e782ebe8def0f69fdbae652b734e59303719ec186863ecac44d6fcbe282fe02e6e1e560d5deea8f7570ef52ff
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-vpnc/metadata.xml b/net-vpn/networkmanager-vpnc/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-vpn/networkmanager-vpnc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild
new file mode 100644
index 000000000000..112ed09512d8
--- /dev/null
+++ b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager VPNC plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk test"
+
+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
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# https://bugzilla.gnome.org/show_bug.cgi?id=742708
+	sed '/test_non_utf8_import (plugin/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index e5c7198e457a..7e17ef6bab53 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -2,11 +2,15 @@ AUX down.sh 943 BLAKE2B 9853748aebd819c46cec0229971375d28922abe91ff6442a572090f3
 AUX openvpn-2.1.conf 892 BLAKE2B d0ce49ecc6275c9677e56de5d13afcc69169666441cb6d8eb958642786f0ee7ff6acb1830af0001fd1945b666daf5af1d9be211032817fc345e33242e1d86885 SHA512 982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37
 AUX openvpn-2.1.init 4187 BLAKE2B 9ab133bda1db2d94afbf1e35840515452029319c38bb796af90b117dcfcd8552da2ea236399c2708a4862de753a8f92cdff80a69cfdcc5d53e206f9f3ffc48d8 SHA512 2d97a41b3998c196c440dcaf43ad8992eae27c5356c94b24f4cc4b20169350f3d6c8d65bb9c2517415ee15637fa60298d9cd8252ad9aa3eec6ae3a847ede0611
 AUX openvpn-2.4.5-libressl-macro-fix.patch 2096 BLAKE2B d3d277c8bd800827ceabc01431c2ff22e78a89921ff2460460e9acdfbfb7466188456557031de2b0bf2c00703a573c05ba1fcbff96da4b5def596c82717ac81a SHA512 77026186911e852e8434b19662026fa5503a389ecc1a7a8fb3a395beeb2397bc75426ca310e7728ac24ec540b59e00fd623324e262276007c772f9a1cda16863
+AUX openvpn-2.4.7-libressl.patch 1929 BLAKE2B 175375bd8f233a0315ee99fb3ff6ca84f77cd850fabe8cf3f53033f56f99e0ce5ee9de4f4970011909a91e940c2665cc65004f5dce987c9545390b698b580676 SHA512 8fab84df8e268e1ec88bff3443e8e35c5228dfabff71b75f64ba29f6ff09523b36a1c8af9c9cbf20bff9d241d5de3136a1278b3f76675c28238d4c3a12ff535c
+AUX openvpn-2.5-external-cmocka.patch 2279 BLAKE2B a20cb45170590c332813fa6a0c539b8972ed329fec4ddb644996d5caa32f821dc4be75a9bc525917562e47588f8135b0def65aed9e747609b836d06a9f6ea666 SHA512 5f6d01b7051511e37a8822a0a514cfbdea3118cf52a86bec3addc2de713640842e972346ce598147e354353dd9483ecdbb13efc211e9b74c58598d6c11038f1e
 AUX openvpn-external-cmocka.patch 2083 BLAKE2B 4e9f0a2ca509a4c37d2efe061ed7a027ba7e069041d193a237d214c493b839fc36e87898aad160eb8198845306b7910f4d9da0e87671b9310425786fbe676bf4 SHA512 6c34518f626992031735f6433861fafd44e3cf35e95668cf5945aee7b341a049e3b6a73dd9937a0f287e4a750a2415532ae49aac11011767e0c7a3355f8ff6ca
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
+DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
 EBUILD openvpn-2.4.6-r1.ebuild 4586 BLAKE2B db7c3da2659728384d6bb78beb8ffa632c66dba467403d87250bdbaa4bdc008b6d4e73dda30c1bf747517927256e144ab0e49e2f419525937d293cc14f38082e SHA512 ba63e3d5cade6cae6ae13126aa974798caba94a2806d0f1da2610c891072b349af73f874f6374817d3d509e1e633cf2b1fd2afbf873c9fb5790059758dc6987d
 EBUILD openvpn-2.4.6.ebuild 4577 BLAKE2B e8828ba11b3d6026ebddd2f7c64aa351881b99f9bdc2ad480347db796eaf1fa139e1d3478135e53287439a97bd6904e6911b0ff361110b9d6e32e454ff76c6e6 SHA512 b906ae2d8281893d36ed87bf4b6a58c9d8dfd11dedc2f78bdbaf00f246a32a987b50347dd6142c9224e4744bb34146b154e31c9f68b9d938dc21c1bc12a4bf92
-EBUILD openvpn-9999.ebuild 4343 BLAKE2B 1da475ccc626cf4381fd58c78c028cc979894801962a8c5cdf55ff373cbab461ac7721052c384a4f506d0b2a70208069e576d3ce2c24e0c248f83a9ed704bd45 SHA512 2ad94c32bf75c559ecfa3ff93415c02774b266ef6c5ea0bcda8e4c4b1b7045ce782e63b32a23fab1afae34ba50a2185172e6ec8c36e6ff334b84d581630a4504
+EBUILD openvpn-2.4.7-r1.ebuild 4631 BLAKE2B 911f155893cedef53848906375d7ff6281496c797335852f64b0d9561b722c3293aeb45ae7d61bac5990791815624fef8b5f112b9321d29c8094435d6c27c065 SHA512 5568835996f6260ac3a2cc03c163b87178775c36c1fa2d53ba09f99f4a1be6c936adab153e7442757709bf28a6de4ac1bb92d2a3ac6183769dbbc542c7cb1702
+EBUILD openvpn-9999.ebuild 4291 BLAKE2B 0bd80862bf886f0ab5a859ac1894c8c786d8a861c3c87cbf70ce8000f1c842a9025c61382aca5e2c4361f626b460ab73cea5f265b7280e023d6d31d4d88860db SHA512 dbd5e8f80532d625c4403e461ed56ba87b1f36ad24c69d13e9c120298a08aa32a3993ee4283a7d436f890b9c284f0dd1c6c313c1ff334f4661d6c2017b7b3a14
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch b/net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch
new file mode 100644
index 000000000000..210189cd4d4d
--- /dev/null
+++ b/net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch
@@ -0,0 +1,49 @@
+From 4faf695e3c42a81131c2aae96c4a60228aa237a5 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Sat, 23 Feb 2019 20:13:41 +0200
+Subject: [PATCH] Fix compilation with LibreSSL
+
+TLS 1.3 is not ready yet in LibreSSL.
+Also SSL_get1_supported_ciphers() has been just added into master (not yet
+released).
+
+Upstream-Status: Submitted [https://github.com/OpenVPN/openvpn/pull/123]
+Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
+---
+ src/openvpn/ssl_openssl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
+index a78dae99..6a8fcef3 100644
+--- a/src/openvpn/ssl_openssl.c
++++ b/src/openvpn/ssl_openssl.c
+@@ -459,7 +459,7 @@ tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers)
+         return;
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x1010100fL)
++#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || defined(LIBRESSL_VERSION_NUMBER)
+         crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. "
+                        "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.",
+                         ciphers);
+@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const char *cipher_list,
+         crypto_msg(M_FATAL, "Cannot create SSL_CTX object");
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER))
+     if (tls13)
+     {
+         SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION);
+@@ -1867,7 +1867,7 @@ show_available_tls_ciphers_list(const char *cipher_list,
+         crypto_msg(M_FATAL, "Cannot create SSL object");
+     }
+ 
+-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL)
++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER)
+     STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl);
+ #else
+     STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl);
+-- 
+2.20.1
+
diff --git a/net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch b/net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch
new file mode 100644
index 000000000000..d339dcd558b1
--- /dev/null
+++ b/net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch
@@ -0,0 +1,65 @@
+diff --git a/configure.ac b/configure.ac
+index 1e6891b1..c801789c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1312,6 +1312,21 @@ if test "${enable_async_push}" = "yes"; then
+        )
+ fi
+
++AC_ARG_ENABLE(
++       [tests],
++       AS_HELP_STRING([--enable-tests], [enable unit tests @<:@default=no@:>@])
++)
++
++if test "${enable_tests}" = "yes"; then
++       PKG_CHECK_MODULES([CMOCKA], [cmocka])
++       TEST_CFLAGS="${CMOCKA_CFLAGS}"
++       TEST_LDFLAGS="${CMOCKA_LIBS}"
++       AC_SUBST([TEST_CFLAGS])
++       AC_SUBST([TEST_LDFLAGS])
++fi
++AM_CONDITIONAL([ENABLE_TESTS], [test "${enable_tests}" = "yes"])
++AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
++
+ CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`"
+ AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings])
+
+@@ -1360,27 +1375,6 @@ AC_SUBST([VENDOR_SRC_ROOT])
+ AC_SUBST([VENDOR_BUILD_ROOT])
+ AC_SUBST([VENDOR_DIST_ROOT])
+
+-TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
+-TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include"
+-
+-AC_SUBST([TEST_LDFLAGS])
+-AC_SUBST([TEST_CFLAGS])
+-
+-# Check if cmake is available and cmocka git submodule is initialized,
+-# needed for unit testing
+-AC_CHECK_PROGS([CMAKE], [cmake])
+-if test -n "${CMAKE}"; then
+-   if test -f "${srcdir}/vendor/cmocka/CMakeLists.txt"; then
+-      AM_CONDITIONAL([CMOCKA_INITIALIZED], [true])
+-   else
+-      AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
+-      AC_MSG_RESULT([!! WARNING !! The cmoka git submodule has not been initialized or updated.  Unit testing cannot be performed.])
+-   fi
+-else
+-   AC_MSG_RESULT([!! WARNING !! CMake is NOT available.  Unit testing cannot be performed.])
+-   AM_CONDITIONAL([CMOCKA_INITIALIZED], [false])
+-fi
+-
+
+ AC_CONFIG_FILES([
+        version.sh
+diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am
+index 31d37b89..4b7fb41d 100644
+--- a/tests/unit_tests/Makefile.am
++++ b/tests/unit_tests/Makefile.am
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+
+-if CMOCKA_INITIALIZED
++if ENABLE_TESTS
+ SUBDIRS = example_test openvpn plugins
+ endif
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..0ae13d41d8c6
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic user systemd linux-info
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="https://github.com/OpenVPN/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://raw.githubusercontent.com/OpenVPN/${PN}/v${PV}/tests/unit_tests/${PN}/mock_msg.h )"
+HOMEPAGE="https://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
+IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+	mbedtls? ( ssl !libressl )
+	pkcs11? ( ssl )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )"
+
+CDEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
+	)
+	pam? ( virtual/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 )"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-openvpn )"
+
+CONFIG_CHECK="~TUN"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-external-cmocka.patch"
+	"${FILESDIR}/${PN}-2.4.5-libressl-macro-fix.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
+pkg_setup()  {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	if use test; then
+		cp "${DISTDIR}/mock_msg.h" tests/unit_tests/${PN} || die
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -Xcompiler -static
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+	IFCONFIG=/bin/ifconfig \
+	ROUTE=/bin/route \
+	econf \
+		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
+		$(use_enable inotify async-push) \
+		$(use_enable ssl crypto) \
+		$(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) \
+		$(use_enable test tests) \
+		$(use_enable systemd)
+}
+
+src_test() {
+	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
+	# 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
+		insinto /usr/share/doc/${PF}/examples
+		doins -r sample contrib
+	fi
+}
+
+pkg_postinst() {
+	# Add openvpn user so openvpn servers can drop privs
+	# Clients should run as root so they can change ip addresses,
+	# dns information and other such things.
+	enewgroup openvpn
+	enewuser openvpn "" "" "" openvpn
+
+	if use x64-macos; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	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."
+
+	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 eb65ce756e96..8ad3d42ffc35 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,11 +17,8 @@ KEYWORDS=""
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
-REQUIRED_USE="static? ( !plugins !pkcs11 )
+REQUIRED_USE="static? ( !inotify !plugins !pkcs11 )
 	lzo? ( !lz4 )
-	pkcs11? ( ssl )
-	mbedtls? ( ssl !libressl )
-	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
 
@@ -50,7 +47,7 @@ RDEPEND="${CDEPEND}
 CONFIG_CHECK="~TUN"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-external-cmocka.patch"
+	"${FILESDIR}/${PN}-2.5-external-cmocka.patch"
 )
 
 pkg_setup()  {
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index e05f1e3fcf6a..2357d07457cc 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,5 +2,5 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.7.1.tar.bz2 4967533 BLAKE2B e438d1b44a997eb0e012586b18604bd35ac6f53cce1c34ff89192a760bbd0d6a9aaa7b90b389ff1a5e7c6d2356ff5cc74b40daad1d6579fa5026f4878489bf66 SHA512 43102814434bee7c27a5956be59099cc4ffb9bb5b0d6382ce4c6a80d1d82ed6639f698f5f5544b9ca563554a344638c953525b0e2d39bc6b71b19055c80e07fc
 DIST strongswan-5.7.2.tar.bz2 4997818 BLAKE2B e5a160ea8d31ae14c9731e414e42653ecb12f259fbe76ec7289f44afe5687f4123d89750a8f57c9ea006aec7f0be28e0f0c56d6c0a4bc96f0e1ba69c29da904f SHA512 e2169dbbc0c03737e34af90d7bc07e444408c5e2ac1f81764eeccbac8b142b984ce9ed512a89071075a930e0997632267f6912aa5b352eee2edbd551b5a64e7e
 EBUILD strongswan-5.7.1.ebuild 9426 BLAKE2B 48d770e14d7e08bd9baf7294fa3b8ffbdaff26347918a2b411dd2b958a71fdc20379d8659fee066d9d01a3680dbd040fa9421d9483a542b3c690792b12e70964 SHA512 412a269f27723601813d8145bbc2263bf627298197e8c50a76368e07530c04799c6149976c424ceddd6ccd48eee8b39ae845c8bec1100598c1a40b4bff9c478b
-EBUILD strongswan-5.7.2.ebuild 9453 BLAKE2B e8c8916604c542a697ba41169933c5b1c49d954915229ffb8b8cd1733b85b62e59af0d2085e86c8e541a580c1a6b42feb2a127a6e2ecf72de9fccc11f3857131 SHA512 966c38333a071bd7cf1d120095e3343c541faf46c27b3747fb41ece3ca9f6d5b03f60d7363a3e64c51a8533b6e7452793b8dfd5f1dac2da0a5a19050883c0ad3
+EBUILD strongswan-5.7.2.ebuild 9450 BLAKE2B 3432ff6c3931b530fd8a4d24d2b6a1e13dff3ea5ba8c1c481b96f5ac35a12cd27080d6ff5d75a49e730225d1a369ec0fcf0f03dcad22f71b1acab29f965d7877 SHA512 4989f058252234abf6ccd122bf84f651591810f87ed7a61713a9114ff3f8f89b3a6f92bc142a374ce16c94adff37d9058cbacb08b0e3874c8888666a6c29d171
 MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/strongswan-5.7.2.ebuild b/net-vpn/strongswan/strongswan-5.7.2.ebuild
index 39fbb0f18efd..8c74af44c996 100644
--- a/net-vpn/strongswan/strongswan-5.7.2.ebuild
+++ b/net-vpn/strongswan/strongswan-5.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 9e9b02b0340a..182f5412ff1a 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,8 +6,10 @@ AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.3.4.9.tar.gz 6695931 BLAKE2B ebfe0f49ae923e63b0bd8a7cafc453d7b0775cbfd167463b364490faf9bbf61decd28906d8f5bb08bfa9a5a10b371d9188a5019314c0de5ace15cc379347f88e SHA512 cc254a2cc2f21b4511e9cb215ba5f05fefc4dceffcf46a402efa2d3540872a4ed8e0095245df0802ea12c1367451bc16ca60c0aea6a77e2139580f3c5ba8c02f
 DIST tor-0.3.5.7.tar.gz 6934521 BLAKE2B 3af9a1a14fa5ea7ce0a5be08db3e2cbe4188d569bda92c7a24a66f94d79869acfd1ba9e1c51bfb0ac3f6399d79b907888d1546ba7898af9563d65f5288c09577 SHA512 e3a7be620c228c3bc73ea9350a19abecb0ac6dae2b309d6233151ab2377c754110a9854d8d221f380f80cffa2f723d266bd09b3432ae33c319c0fe9a7e538bc9
-DIST tor-0.4.0.1-alpha.tar.gz 7087989 BLAKE2B 757a478ac9619553b687144fa2c5e56cfa9324800f567fb66fd2d637f33f8886ec13cf96accc46bd8c93dd8adcdcf51f0ed3c50e377af6e198cdfc3734741425 SHA512 4c09837316921d170a8866116bbbd31603fd312e0e2282abcf13e52a656141d22e3d0dd91185c0429cf9ae080d06bd100f747d18795b1b606aec7178c19f5bac
+DIST tor-0.3.5.8.tar.gz 6994335 BLAKE2B d37006ee48f6ecb9205fe9ad1178f2375aec5a8f8c614a85af398e2114d13e4ef7dcfc501685f2f6d4dbb44cca2ab318be69ac37686a3ef1bb980adcdefcac11 SHA512 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132
+DIST tor-0.4.0.2-alpha.tar.gz 7156129 BLAKE2B 7262558ae96382b6b40e4f7122b2d73f9d9e5cf4695662d9a0289c0b3218dc835afaf18b326d2f074df7eb9496f7db0bf63fc60a0e5a89fb2b4d7d9f2620b593 SHA512 a69301e1f337c466e6fc064ff8d581d5328c84532fe902720252f3b055079b5dfb203489d1684b2e9055c737b17ad8ebdfaf96e4d0f7fdd83514ffbce22745f0
 EBUILD tor-0.3.4.9.ebuild 2198 BLAKE2B 6c350a8532cee3ffb1be3cbd33d1d98fc39b75c79772f8cff00b9a9db1bcc40003f47ac5f429ee4e616075c7138b46be29227970abbcc0ad1be77c464dc14597 SHA512 9d5600ebc92dd36acd25beb0eac0c709557b3709897afeb738461a21a82ab5dd82ac46e78d6cc0a32f8954b800584db42b3bc23fc79df80ee702d2a4b654bf40
 EBUILD tor-0.3.5.7.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
-EBUILD tor-0.4.0.1_alpha.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
+EBUILD tor-0.3.5.8.ebuild 2176 BLAKE2B dada372351cc5c34b3929c3a18ee9287728cd3b3c7285366213c056737ed2dfdfdc9887ec9b1cd9c8e352f4d953c927301ab1c2a86a648499ba9932006f7bae8 SHA512 a64cd8723241a6a8af8955b84db614ef6f7b868ee445289cdfc3962ad5daab59925768875cf2a25441455eaee1b3469aabbb9ab5916c5c7b700d867384f7960e
+EBUILD tor-0.4.0.2_alpha.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.5.8.ebuild b/net-vpn/tor/tor-0.3.5.8.ebuild
new file mode 100644
index 000000000000..f96f51fd642c
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.5.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic readme.gentoo-r1 systemd user
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r8 tor
+	systemd_dounit contrib/dist/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-vpn/tor/tor-0.4.0.1_alpha.ebuild b/net-vpn/tor/tor-0.4.0.2_alpha.ebuild
index 2e27b784b6bc..2e27b784b6bc 100644
--- a/net-vpn/tor/tor-0.4.0.1_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.0.2_alpha.ebuild
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index f37ecdb6ad5a..f0c7f18886c6 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20190123.tar.xz 323052 BLAKE2B f4ea04e72a276c495602da3d9c2feaf5e932ccf10e98503073650d1b7a1d5af3fad573959275e61b7c4b1f34937c0d0ac21d3e55ff0fa1a13345a6a311eca16b SHA512 8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59
-EBUILD wireguard-0.0.20190123.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
+DIST WireGuard-0.0.20190227.tar.xz 323788 BLAKE2B ec302b0ded5aa1afe477134a5d9ffc4354bfe70e10594a786d1fc74e75375fafa75be5efb300f0d18aa7d14c8bf07432c54bf66b30c83d19fcdbba0c23519798 SHA512 0c27353f27d7ae758cab84a02f63863681baa5eab2b64aa494be30c411b4dccc3af030b410dbfb72342fb5ea34be04f2d3b36ad0bb6a418d9f389ac34384eca3
+EBUILD wireguard-0.0.20190227.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20190123.ebuild b/net-vpn/wireguard/wireguard-0.0.20190227.ebuild
index e4113ef8fb96..e4113ef8fb96 100644
--- a/net-vpn/wireguard/wireguard-0.0.20190123.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20190227.ebuild