gentoo resync : 25.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
commit: 38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree: 04e2cf4bd43601b77daa79fe654e409187093c5e /net-vpn
parent: 623ee73d661e5ed8475cb264511f683407d87365 (diff)
52 files changed, 697 insertions, 367 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0e21f47ed6a3..27aff08a88f7 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index d552e7f99b07..637db51d15e7 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -5,10 +5,10 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.27.0.tar.gz 1073766 BLAKE2B 331407c6bed3ed49e2438590a814ce91301bfe318d45f0726568877a966fee217b94a37152206652672b221e62d41dc252b8cacdac3e96117c896f4de00c39d4 SHA512 260cef32503bb459f3e7e07940f303b542bead54c9b6faf63f61e8d76250155c375fa75ce80ce3862d8eb2445e106e3c99ed829c9acbc9eb728364082f938f96
-DIST i2pd-2.28.0.tar.gz 1079208 BLAKE2B 2cc84ff156c05395ce13fd0cbabb667d44d88df252c02775dee3af0ea2715487ea35614175a4dcd6f4af8a2f8fc071857beb67e85620d32e952341db04b3be7d SHA512 9bcae8dfb5a2c77b03e4c4d4816b1666f2a0d95e0c806f952a095182dfc62bdc142f5cde6a9643f7a3c6d385f906c00011b4d291fe53ab177d36d63b6a698599
 DIST i2pd-2.29.0.tar.gz 1079654 BLAKE2B 762f06908342c7e6508f47f7bd7479454f0a4594647aa9e0a9be5e7f6ae28140a1073e10138f3e210b7add943a31617260b475d9ee5915c367dc4f80b3036bb1 SHA512 dfa1c212c217eb2eae40f3f8151d35164c52df630e658dcb261cc9532623377dee376d1c493e8b8bdcae3245ae389e06adf5ef551951d4e139f1626b8432c15b
-EBUILD i2pd-2.27.0.ebuild 2748 BLAKE2B e8a5face9eba3fd7117818e6387c4e203e3febe5986b0fa3fe0be1adaf62690a405a1f884c65ba37a251006b6a82e88ef80559fc8e8cf0f084a978cbe5f6e174 SHA512 0fd96e06c96f10d4dca586b6125bd343fae713d18ecbc6fc35bf3b39ec32e90cc2dc736b16c5fe04246b361282056e8f18ec7bcecf4c1d7ca3e3f8eae0130c4a
-EBUILD i2pd-2.28.0.ebuild 2748 BLAKE2B e8a5face9eba3fd7117818e6387c4e203e3febe5986b0fa3fe0be1adaf62690a405a1f884c65ba37a251006b6a82e88ef80559fc8e8cf0f084a978cbe5f6e174 SHA512 0fd96e06c96f10d4dca586b6125bd343fae713d18ecbc6fc35bf3b39ec32e90cc2dc736b16c5fe04246b361282056e8f18ec7bcecf4c1d7ca3e3f8eae0130c4a
+DIST i2pd-2.30.0.tar.gz 1087411 BLAKE2B adfd6d2eebb2bbd0fe931a9a96110d0bf540ceff18231afc88ba4df7b428ec702297871ecafb812cd130e68eb8f6127e3f7a4645631df7ca2a723d0a45d8723c SHA512 d27c5e5b7ae7c78be14ad96ac458c0f3a45e31ee5fbdf59d5c6278d0195909badc5917a258b5de37d6a255c20a8c3cb0c0ddc3291a110444a96f475b662a119b
+DIST i2pd-2.31.0.tar.gz 1092238 BLAKE2B 61424b8d5796511a1bae4d0274b86fa198e0fb2e590312e7e5039533bca2ded494f9bdd7406951c82a99259772581ee716159f6500921f9fb8b5fd4aa217ce9a SHA512 af1583c6c2fb2073d6d3d32f0b394da3f1bc4a3d232aa47880f457447c6592801c48f6a05b1a7d2955c58d888c4c574e15082bf2583921797e24e5cda4c188e0
 EBUILD i2pd-2.29.0.ebuild 2647 BLAKE2B 95b39a0b23d2b90c71bcd2c1fe66d69c67d2311ba30efe4712a853327adaf0ed45cb63fbb66d45bec7d2f4ba546e35fc2fb7c49253d644e5dab3a7e98c20bdbc SHA512 b2ae95c09eadee724525e4562cf3dc978011e19d4d21063388ddefe1c5f008871bc5f0da670dfa0e8852cd4b470b23f712f9097a88cc1bd6b2b046f8e9e44c0a
+EBUILD i2pd-2.30.0.ebuild 2647 BLAKE2B ccad7ceaf795f8ef6fd2e6f1b12a849313a3d2b1dd22eaf7500cac5795a72dc46ff743e99c699966e3ff5e3a7e7c7c88202bc1fb2ddfd8311807c2b5e2a53d03 SHA512 9dc942c5aaa75a060e33fb947c451fd7408f39f695e125cc11d8fdb53b1a5c05510714cb19e4226e8150aba7d3e6099ea007e3587700af44d3269ccdbc66b5be
+EBUILD i2pd-2.31.0.ebuild 2437 BLAKE2B 8e7e6c41aee82040a0202e16b272e9a0e73f19837aad7116734b019cddcefd0dcf017eb39770b8cd64bf73e996133c51abaadaa07c263a8a336be6b04b9219e8 SHA512 b6ee8b144168f1fe97010f920a1f64351bba82f733a591a5ccf38dc553d774d07d94d3213d7442ba8e1d88e3e0b7552c311697ae01db2f4307c66dfb2139ccd9
 MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8
diff --git a/net-vpn/i2pd/i2pd-2.27.0.ebuild b/net-vpn/i2pd/i2pd-2.30.0.ebuild
index a24bc8dd650f..b305f25c71f5 100644
--- a/net-vpn/i2pd/i2pd-2.27.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.30.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
@@ -47,9 +48,6 @@ PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch"
 	"${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
 
 pkg_pretend() {
-	if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then
-		die "At least gcc 4.7 is required"
-	fi
 	if use i2p-hardening && ! tc-is-gcc; then
 		die "i2p-hardening requires gcc"
 	fi
diff --git a/net-vpn/i2pd/i2pd-2.28.0.ebuild b/net-vpn/i2pd/i2pd-2.31.0.ebuild
index a24bc8dd650f..a83bf4a4cdaa 100644
--- a/net-vpn/i2pd/i2pd-2.28.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.31.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
@@ -11,33 +12,25 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
 
-# if using libressl, require >=boost-1.65, see #597798
 RDEPEND="
 	acct-user/i2pd
 	acct-group/i2pd
 	!static? (
 		dev-libs/boost:=[threads]
 		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? (
-			dev-libs/libressl:0=
-			>=dev-libs/boost-1.65:=
-		)
+		libressl? ( dev-libs/libressl:0= )
 		upnp? ( net-libs/miniupnpc )
 	)"
 DEPEND="${RDEPEND}
 	static? (
 		dev-libs/boost:=[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0=[static-libs] )
-		libressl? (
-			dev-libs/libressl:0=[static-libs]
-			>=dev-libs/boost-1.65:=
-		)
+		libressl? ( dev-libs/libressl:0=[static-libs] )
 		sys-libs/zlib:=[static-libs]
 		upnp? ( net-libs/miniupnpc[static-libs] )
-	)
-	websocket? ( dev-cpp/websocketpp )"
+	)"
 
 CMAKE_USE_DIR="${S}/build"
 
@@ -47,9 +40,6 @@ PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch"
 	"${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
 
 pkg_pretend() {
-	if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then
-		die "At least gcc 4.7 is required"
-	fi
 	if use i2p-hardening && ! tc-is-gcc; then
 		die "i2p-hardening requires gcc"
 	fi
@@ -63,7 +53,6 @@ src_configure() {
 		-DWITH_PCH=OFF
 		-DWITH_STATIC=$(usex static ON OFF)
 		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
 		-DWITH_LIBRARY=ON
 		-DWITH_BINARY=ON
 	)
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 08d85111f76a..b30326cc96bf 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,8 +1,6 @@
 AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d348896883942683682c8ac3b31de56d360460bc2ea2c26f579a6f36078101270167b775579fd2502c72dd680620c12a585 SHA512 a8a391386014cff3b867fb8c0ba8c83ecb93c11d35aea205877b66e3104712311e19f13eb9659ee158833512c199d0104b5a796ebef37a1bc210e254abc6f573
 DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535
-DIST libreswan-3.30.tar.gz 4119139 BLAKE2B 64c528b84bce10a01dceece473016a1836c47da0d1878c4fd413f859e6c5edc05bded1ac54d60e6979005f6654ab4819b8b05aba5b16658d493bb300bf773823 SHA512 1ea3505938231bacb762ec13c278b584239660e20994030423f0200ff32fcc0f0a0c74649b1470bbfc1165a762d3b60d0b1c5c56bff81a52415c7666736b5b99
 DIST libreswan-3.31.tar.gz 4127675 BLAKE2B 0b773e4cfda761a88e8cb6ed412ecdd50bb52df7a58029141d41c77f959ad06c6cd04625b9094efa8586328381e3c75050ff68c2d8dd6d832ed5dd6e747d9391 SHA512 edaddeb209c4fb974b16790ba843a41f4f1d269dd28333aa02b820801a222435c2ca5622e77558d1e95970b4ef24a663d9c44ef4ede7ff4e66e1f0d9b6e880d2
 EBUILD libreswan-3.29.ebuild 3062 BLAKE2B 5d6b9ef04607c52c292d0c509129cfb82dc2d8ed2d30b90ecbc81a76de048c45b0c945f22cafbdc3c4fb35511bb9cb5b7992968fccd041cfc06e48f5a3cafef9 SHA512 640827da7fc1e7acce3b53d555e782cf685f0937b1ddab1c89888533fa067b19a9a931fbeb62ece60b474e576401d7a06b1f8fa6893adb748a09260d62716704
-EBUILD libreswan-3.30.ebuild 3123 BLAKE2B 01a683f167efff93f2b2afd44a464ef7e33e09c57ca7f4c80a490016f35ddd3f62085905bb3ad12ad4527f82d3cafee594e224e9e7940b10d0f8a05bf49b8333 SHA512 9dbd057008e18b106d7ea71ef66af59661dd5ed953a9b3224a67706ed181ac7af659a56793db1250da326e27598f1477e3b09c1e7ad89ef64918dd2a4d5cf13b
-EBUILD libreswan-3.31.ebuild 3129 BLAKE2B 898c335ac5250ef25dbf1197799158bea2a8ee562f2dce91eff51086fc0149c49665689a5b27c65eca26cc80b2c35ab1c3c5ef8c403f5b54e48fa9ed9cc643b7 SHA512 b221c0dc62b3326072dd05fda6e6b3dacca223b2fba0f2db38fa1114716b800071f804365c0051653f2b7c24a39cfacb532095d75c8a02216470538715da659e
+EBUILD libreswan-3.31.ebuild 3127 BLAKE2B dfd79e648967070d3a2ae7018873647a03d162bf904f4f70fa7d2baf9969d7912407a56869986f0c83675e65e5f27e5622ffccf4c6b1b3bcecb3200472976372 SHA512 5937f4ee0eba31fa8cbfcb477e19e5d2f74b1fafba9be035cdb64e88e80d5bc0acfd6dd995de54e449be6a8ff01a893ad64d578d4eb7b5e72f42f748fc829333
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.30.ebuild b/net-vpn/libreswan/libreswan-3.30.ebuild
deleted file mode 100644
index b16d469b9d07..000000000000
--- a/net-vpn/libreswan/libreswan-3.30.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${P}-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export 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 SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	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 && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-3.31.ebuild b/net-vpn/libreswan/libreswan-3.31.ebuild
index f81f028d3f9b..88f6f4c6f123 100644
--- a/net-vpn/libreswan/libreswan-3.31.ebuild
+++ b/net-vpn/libreswan/libreswan-3.31.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit systemd toolchain-funcs
 
 SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
 HOMEPAGE="https://libreswan.org/"
diff --git a/net-vpn/mullvad-netns/Manifest b/net-vpn/mullvad-netns/Manifest
index b7af4ffa9636..7975d6841844 100644
--- a/net-vpn/mullvad-netns/Manifest
+++ b/net-vpn/mullvad-netns/Manifest
@@ -1,4 +1,4 @@
-DIST mullvad-netns-0.1.tar.gz 12068 BLAKE2B 658f3e050b66028712bc611f42a6b193d482e5d9a9d398d703dbd2e0cdef6a7f94dd614198cf36548d3b1f4eb0f70bc1c9beb34c96e6b4e2e04520fb5544b618 SHA512 de923d3d97fd5689022fea821aa93ee74e3057e50842804da84c8ab6962722ed0000bac61bdbd3c188c6eeda8960345fa6609da5f55e90ee5a49f50bbc7c4838
-EBUILD mullvad-netns-0.1.ebuild 721 BLAKE2B d6bb3df8b98c06e4ad6378b5b6a6b6c7b0d12f983fabdd62936159997ac5e3cfaf29a144317c500bd11bb09a76d7f3a4ee84e6823dc06404e310c26df972082a SHA512 67c57ee9207562d0132918dd36bb9f97e1dd54bb8d8c0336d0c37f25ba55df74cc92538f9bbf6120f7969348667e1ca7b74e0892370869b1195be97c8ec1b725
+DIST mullvad-netns-0.2.tar.gz 12087 BLAKE2B 43f578a8a2d7f0317de9c2c0bc19f49a37ad7754dfcb50a5d698313fe6470ec6f2580d2e7629ac95dbeeddd6c1ac6d660b142c5c801830624c14e6c0e781dc6e SHA512 6f0942841fce19b35adb38b73ae7d692f22e551cf6bccd9c67acf6d248fe7d2684a6a20b9b6459429caf333e68c4d6e460632068b5eebd6a29654a46fb2ab64e
+EBUILD mullvad-netns-0.2.ebuild 721 BLAKE2B d6bb3df8b98c06e4ad6378b5b6a6b6c7b0d12f983fabdd62936159997ac5e3cfaf29a144317c500bd11bb09a76d7f3a4ee84e6823dc06404e310c26df972082a SHA512 67c57ee9207562d0132918dd36bb9f97e1dd54bb8d8c0336d0c37f25ba55df74cc92538f9bbf6120f7969348667e1ca7b74e0892370869b1195be97c8ec1b725
 EBUILD mullvad-netns-9999.ebuild 655 BLAKE2B 2880596ffd1f58f80097361d5690700c002e2f3a2fb1556345abc83c482da08dc81438f2c526091d5a0bdd96c3552bdc43da3b565d8aa152e6bf95533471b31b SHA512 de20b3d8375974062752241c0842ae721936e7cc0e97debb4c9a309825906c1cac5150e6b6112713e7d93bef27d1de4d9475324d66a96fa01f838d09e1cd93d0
 MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/net-vpn/mullvad-netns/mullvad-netns-0.1.ebuild b/net-vpn/mullvad-netns/mullvad-netns-0.2.ebuild
index cefae0c6bc6e..cefae0c6bc6e 100644
--- a/net-vpn/mullvad-netns/mullvad-netns-0.1.ebuild
+++ b/net-vpn/mullvad-netns/mullvad-netns-0.2.ebuild
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index 53c9ecf9de36..5f513f09b6e1 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,7 +1,3 @@
-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-r1.ebuild 1064 BLAKE2B 774cafc5d2344ad1739f9fc64d97abf13bf081960a65c2c5549be6f287fb35712370bca93d47a8d97d6de4b2ee12114a60a09708a183ff8205b7a841f5e54907 SHA512 23809bbb17d53a081376797fcc6b5a0ec147b4434282a5df4eb87864313fb3c1a2dd14ab6ce1b181cef017b8e5070e40baa4a00c8b646e8b78169142c14b4e8a
-EBUILD networkmanager-fortisslvpn-1.2.8-r1.ebuild 870 BLAKE2B 52d052e48664566fe7fb774ee9f937a960193d2b9be5138cede344a2ae1fdad531e8cd5634d8c92c0f538e0390524021e05ae54ad07d32cc4823908a2f539efe SHA512 1b5eb9caaefb21a495a213e9007dd5889acd02c1e2c09960145eb3c89ec1dd5204eb5a2abb7b1e2afc567cb0796d116ed7ee240fd7696e56b473dd6e7091319c
+EBUILD networkmanager-fortisslvpn-1.2.8-r2.ebuild 884 BLAKE2B 52e053b236facdd5eb8ff392b40d7f90e95402b458d5eefacff9605dff8de252ac3a8d9cc6e7266e04a6e7f9588516da2cd8bb3e1cd6aef142a7d0380645e78a SHA512 1298ade8a40e7c0790b7682431f7895ad729c4bc94308a8851a6777f4b34d2691a1dbd52a3c9f804df918e60f5806da8177ff1a5f56aa298aed87293d2cc1c6a
 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
deleted file mode 100644
index c0439bf0e394..000000000000
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index f882679954f7..000000000000
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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/networkmanager-fortisslvpn-1.2.6-r1.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild
deleted file mode 100644
index a9f1c000252b..000000000000
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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[gtk]
-		>=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-r1.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r2.ebuild
index 5c9130e5118c..e66f115f32ca 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r1.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=net-vpn/openfortivpn-1.2.0
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0[gtk]
+		>=net-libs/libnma-1.2.0
 		>=x11-libs/gtk+-3.4:3
 	)
 "
@@ -39,5 +39,6 @@ src_configure() {
 		--disable-static \
 		--with-dist-version=Gentoo \
 		--localstatedir=/var \
-		$(use_with gtk gnome)
+		$(use_with gtk gnome) \
+		--without-libnm-glib
 }
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 51d0ddab3831..12f6130615d4 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,4 @@
 DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
-EBUILD networkmanager-openvpn-1.8.10-r1.ebuild 1288 BLAKE2B 6965bf6d1d1f028d06fd115dab6741c5978f88a852bc39e7fd05aa21e812682250bcb16ccb259a6e3f422bf24f703f72ffe56b10541153cf6c3fc01eab5435e5 SHA512 f198de533df737f5fab4f509618fffd693131fdc54cd8624a429de5377108c09aa569f90cded57443b1ebf0f95a5fc5348e5e8f49300f0ed18583fb9ec6c4468
+EBUILD networkmanager-openvpn-1.8.10-r1.ebuild 1320 BLAKE2B cf2237f0372112b43d518f96be782b54e9c77a8c200fd27bc2ee6d9e4692ffc441732f5e798e56e6760b5f001f0c37f16a740bdb7a967e0be1a5a4a11ef2e629 SHA512 5d1b387f332881601f1e2a6b782504e3ad2fb0501b7aed85e7dd1c08372fe87caf3a768133f94b371145944b4ebaf4de16ab69087863a3b8c98299d8be494fa0
+EBUILD networkmanager-openvpn-1.8.10-r2.ebuild 1303 BLAKE2B 4edae669bf5d5dfe2ae6e477caa54cb2a00d9174c22cc708fa98ccb48057d1a9a914d91a88e179d2b8de96bea9eef8154ea1ad08b0c5f763cab39b9177717e44 SHA512 3a04136edd3a9cdec7a25f66cc60c4adb8921f6eb91cb0957f4d0de2f082c50fbf5e2bbacb8a8b2cf465283194e821e4286162a64c538ca5c8e71481e077faf0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r1.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r1.ebuild
index a8ed070e24c8..58c66c7c02ab 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r1.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	>=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
 	)
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r2.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r2.ebuild
new file mode 100644
index 000000000000..f8b8700353f5
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 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"
+RESTRICT="!test? ( 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
+		>=net-libs/libnma-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) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/networkmanager-pptp/Manifest b/net-vpn/networkmanager-pptp/Manifest
index f06362829fd1..5625fa07c76c 100644
--- a/net-vpn/networkmanager-pptp/Manifest
+++ b/net-vpn/networkmanager-pptp/Manifest
@@ -1,3 +1,4 @@
 DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
-EBUILD networkmanager-pptp-1.2.8-r1.ebuild 1264 BLAKE2B b1f5f9300ca6a16cfecc53be1e69976dba53302e18e94fc393ef9b3aec9769a2750318da399048b4007f1687f29d99325707d6baf48f849a660d026afce49a16 SHA512 549826222778c2ac48a8707e192fad7d4fa4ea72090434e5807d57b31d5d780f2bd417fea3854ffd4fa7bdc0c0d00ef906f00ec0a08372ff1cbcdae49747fafa
+EBUILD networkmanager-pptp-1.2.8-r1.ebuild 1296 BLAKE2B 3b76312220594f32ec8652edce5c4c80f8ef045d8170b05a5105926c7224483e2b905d13e89bc7a93d2f71a98afcb3b0994abeee9135e85d75426e1830a221ec SHA512 94c9a4ff66f7098e88e647c96b0c7824c017028154de0b09acf7ed1bb730094dba2af021841e489a8c1310c1911ab64ec16e244ac8ca62f5e2d844d0429c2cf0
+EBUILD networkmanager-pptp-1.2.8-r2.ebuild 1279 BLAKE2B cd1492ed7f97a1e0f7dca2849058eff09ceb00590f5b6a9bf9b6a28e6c881842ae7a32145b15498210b916c4e07d2a80d0c4e3f31324c9c241c6a2fe0e6d450c SHA512 4c3445bc13eea26cfab2735ac587f7578633508c315e56997f2cb8e9ea8fd32df8d82a4560c323dbbb81ed12b08b8521fdf20328c8ab509faee7d93d09a3e88e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
index 0a3a2b4956e6..f1715f8f01a7 100644
--- a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
+++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	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
 	)
diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..276b82f69612
--- /dev/null
+++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 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? (
+		>=net-libs/libnma-1.2.0
+		>=app-crypt/libsecret-0.18
+		>=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) \
+		--without-libnm-glib \
+		${myconf}
+}
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index 5da7eaf3ffb8..9d40b973dd4c 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,3 +1,4 @@
 DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86
-EBUILD networkmanager-strongswan-1.4.5-r1.ebuild 974 BLAKE2B abe965b9ac9c2e29b1d32b72020ac5ab09cbece735bb404f06bf44efb96fdd1e7a586544c9405cc516ebaa2a53a5162aa65010b6a54b8184c6e804ae413f0f6b SHA512 66665a744af5c1c34986e200d734f754fe90d24c48cce6c553830eca2e54143c9fc32656135fe7c9cf7e4dae8e3db2e2a9353bf9088edccb81d4413f380787be
+EBUILD networkmanager-strongswan-1.4.5-r1.ebuild 1006 BLAKE2B 0a2f15fd65e58d5cc9d6010f173fe522260cfee428a7cf8f45ad8a756c990b508e7fca85c56fb883cfc33a4421fc666d3fec12c96296bcc310fab4146d7a44e3 SHA512 36024d9b44be4eb9dc60470f271a14aa4717d4660af1a47eca1f7d178d63232ace708727811be1a3794aaa63fe1cbe87dd3758eed9d755d325b878930c522368
+EBUILD networkmanager-strongswan-1.4.5-r2.ebuild 918 BLAKE2B aa9fc33976555dcf368f4aac5b0a7bb2bee49bf7be09a4a0e4b91572565bc0950a1e65df0cfca8368bcb106a69edd9d6e526826b84cd80fc86d9bba601a9d095 SHA512 2a3f007fc4c95480deec9174c2e615ef4660a12e72bba3a70ebe5a89b3833c6eb9ee849be2bac6aa4a1bb2dc16276c35a5d66b3332c43523d4dddd5c4851aec3
 MISC metadata.xml 325 BLAKE2B da2fbfdaf5a51c3c6513f31b232b157bffe4864190935c363f54df5389d044b0ed0829db75703a297ef85dd123301e68296d868317d294f9356cd6e9dba94a66 SHA512 74543db61d0c4222e3e36d41d18b0da04b440b2b13e42d78cb202d36366842569c6af971c48d2b97043b4e7c9f37bf12e1d15e074f5b97f31e3a120c614233d9
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
index 40b060fd4cd9..9946b63c9bba 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	net-misc/networkmanager
 	net-vpn/strongswan[networkmanager]
 	x11-libs/gtk+:3
-	glib? ( gnome-extra/nm-applet[gtk] )
+	glib? ( gnome-extra/nm-applet[gtk]
+		<net-misc/networkmanager-1.19 )
 "
 
 DEPEND="
@@ -35,7 +36,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	local myeconfargs=(
-		# Don't	enable all warnings, as	some are treated as errors and the compilation will fail
+		# 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)
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
new file mode 100644
index 000000000000..186623723a20
--- /dev/null
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 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=""
+
+RDEPEND="
+	app-crypt/libsecret
+	>=net-libs/libnma-1.1.0
+	net-misc/networkmanager
+	net-vpn/strongswan[networkmanager]
+	x11-libs/gtk+:3
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-util/intltool
+	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
+		--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
index 6d71e703bca3..28642dd764d4 100644
--- a/net-vpn/networkmanager-vpnc/Manifest
+++ b/net-vpn/networkmanager-vpnc/Manifest
@@ -1,3 +1,4 @@
 DIST NetworkManager-vpnc-1.2.6.tar.xz 417412 BLAKE2B 00072e2f5449687a55ff4dc0382c4ef2bb2042f9b2a4437d1d6790084ff1b88210e45909808048498f315d59ed5408630ae15d09a1d22e4acbf840554e452546 SHA512 4f8adf58d73cef74a950d822c6f17cd813a1e74fcd3c0391f847541c279e448a6353b83984d593fe5e11138a37b7f1c21b9a24a6843c1d35e4cb68bc29bc3eb1
-EBUILD networkmanager-vpnc-1.2.6-r1.ebuild 1096 BLAKE2B 6c8f305adaa249fecd839d4f60b6e08062e3ae6aed79a4f561ad8f6dfa755a712bdf0013d8c168ae0fd7088520fee5b2824ae5fb83d9272052ca7acbe7685901 SHA512 5864bba122ac34b299b8d0c46755dae866ccab2794753539f38a30171d5873beabdaf0442bc2484309e6497210e5b06ad29056b690859e836f25694c5c67beee
+EBUILD networkmanager-vpnc-1.2.6-r1.ebuild 1128 BLAKE2B afc2a37cf8dd4d4c0064da45ed4cba3b88d63b22c1f153f577104e8a53018dd2f70c38a600cc6b87edb389dc8d9ca455b74def05dcfdc1770fac4f46807f1710 SHA512 5d2ee7a297c4c327e3a6b7c2344b951caa15727dc299b1870bfbac741a9fab53aba211a04b0a74aa9d91e38ab9d950d4cf4bdb82de161b0f44a51e1a9b2360d9
+EBUILD networkmanager-vpnc-1.2.6-r2.ebuild 1111 BLAKE2B ea495819c5873223aad927bb20a5ec025c71ce4d34e4acd939041dcb3f3afd41181cfd992993cb761f03caa57659d9fa1e237cfc189b44038876b509612ebd53 SHA512 b3eb4983d4cd41caf08a5402c6a180ecf94f0b3c1cf8da3ca935b90aad84932d43752062fb2be122d4faad83dea8ec4c2ce343a5dbd67649235eec708e45a1c4
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
index e5455535518c..1fe48859e722 100644
--- a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
+++ b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	>=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
 	)
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild
new file mode 100644
index 000000000000..bc252ba5f8d5
--- /dev/null
+++ b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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"
+RESTRICT="!test? ( 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? (
+		>=x11-libs/gtk+-3.4:3
+		>=net-libs/libnma-1.2.0
+		>=app-crypt/libsecret-0.18
+	)
+"
+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) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/networkmanager-wireguard/Manifest b/net-vpn/networkmanager-wireguard/Manifest
index 73b5e1567e7f..7f3d1bd0818c 100644
--- a/net-vpn/networkmanager-wireguard/Manifest
+++ b/net-vpn/networkmanager-wireguard/Manifest
@@ -1,4 +1,5 @@
+AUX networkmanager-wireguard-0_pre20191128-change-appdata-path.patch 945 BLAKE2B 2d235958175d6f62cb9032e88b0a7d8c1e3a0c859d6e233c687fa5aff65cd54b7d225008d150a4b1e6ab3115055d33b6cd07473aeb41e14aef6f1050a66d8fdf SHA512 8efa817767eb80752c862be1b4d1a1aa923d293f868dad880fd02a7af50cebbf1a6b3673a2f6598cb92cb0f38e50434414787b6b33644e3c90a6da13581e9d23
 DIST networkmanager-wireguard-0_pre20191128.tar.gz 238536 BLAKE2B e926c08c68df3e452a7ba25c66e7678969594002cb45a03ca26af32c86b021260c7836157fe9244c07223bf2e1c821ee64c3535c392f3636217c6ae67d8b800a SHA512 4ed9566a18be01b1be7d92da4663a292e17804a706045d58f08640e2fe81f9672880f20d1657b70eafc769b2688f72928c6fa601c0011bde91347902a222e670
-EBUILD networkmanager-wireguard-0_pre20191128-r3.ebuild 1129 BLAKE2B b9d28d289a3a09a4303336c56857308275d43dc824e2a152f845f899da3c11edc1983ed22bc2c2ca81082bf0c50b048bcbf54fc4d4ea11f82a7adf54af97f7ea SHA512 9fa7d2b6b310dcad93df5931e8e50c59d6c6e298946779c5b7640bb68725777c558b9f19b2aa82385aa88c163b01fbf94bc8996d5b91a8d94072419674347c94
-EBUILD networkmanager-wireguard-9999.ebuild 975 BLAKE2B f7fcf780592c6431aa59e764bdf1413d18e41d9676affb230f88486f2eb91cab2d5e7affafa721820eee4017cff32d7c490fd475a564cbd9eece211e3a87e7c7 SHA512 6bb4264a97c9582eb5b6b2260d5dc2f777c3fd8fe31c0965557eb9ce97ff68de16c7c29a7793da3af26bcfd40485c1eb1339c60b6f43d39d3fee5d407e85d0a0
-MISC metadata.xml 554 BLAKE2B 17fea861188a788f83bea73820f206f479c834f9715687b379d098dcee78d94e056d64a2a659b86952010f8b064b8b3fad757f888866424ba709ea5200209bc1 SHA512 d3003837b1c0af95b0a55ce91661b07be14662e904508118712cc95ddf5250e929a31347041962edec1cd0d7c33b5e34e339381cf00df58b401c034c6f6388f6
+EBUILD networkmanager-wireguard-0_pre20191128-r5.ebuild 1173 BLAKE2B 66d8354573d0a40db3ddd77a0af637c633ab869f8443b273cfc9edef825c2af6ddfff5c8f7657ef43acfa443c4d4cc5d89f45f8f552f53d7eb84b5c68a6d1550 SHA512 3f60affe37bd1563b848e0365364ccfc356a3825a37c55b745647cb6e9355af743334124f2e93670f9797cdaada398047e9d19266cd8a34222eefde3c694344d
+EBUILD networkmanager-wireguard-9999.ebuild 1019 BLAKE2B 46b228e851771f0673c01212f40b784840d5faf74982fae7c3983fdf9b3d2306aff39c149e363ca48fae6196de08c63bdd75a4517764a55dfd039cb46436a639 SHA512 89123d77464e1064d49bb0c142483c3cb8bd9067a54eb67469906fa238ee176b6880dc6ef938b6ca35df370b3bb95ba998f07bb92258c730ebc96ac34c74a9c8
+MISC metadata.xml 479 BLAKE2B 2d974d5fe2bfd35934e2638959ea93f54e0bb0c574dc0da398a9521573de047ab091728cbc6583530cdc737bd1c00af16eb282b78aae39ae8d21c37a0ad3aabe SHA512 6f8889fee4242fb2ee7e11b9ff5b1c1e012b434d19ae909c719a12dd63ff30830adc71632fb31517ea24872f3450f54381e787b399391744f8a89dfd4de0e3c6
diff --git a/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch b/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch
new file mode 100644
index 000000000000..d774613a9176
--- /dev/null
+++ b/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch
@@ -0,0 +1,29 @@
+From f02a7863a13ad5da340b35648ae5cefc0789869e Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Mon, 20 Apr 2020 17:00:58 +0200
+Subject: [PATCH] Makefile.am: store appdata to /usr/share/metainfo
+
+The path '/usr/share/appdata' is deprecated and
+should be changed to '/usr/share/metainfo'.
+
+See section: 2.1.2. Filesystem locations
+https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 81c6923..53d6f1b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -266,7 +266,7 @@ uninstall-hook:
+ 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-wireguard-service.name
+ endif
+ 
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ appdata_files = $(appdata_in_files:.xml.in=.xml)
+ if WITH_GNOME
+ appdata_DATA = $(appdata_files)
diff --git a/net-vpn/networkmanager-wireguard/metadata.xml b/net-vpn/networkmanager-wireguard/metadata.xml
index 6aae708785ef..7c35c1d67d11 100644
--- a/net-vpn/networkmanager-wireguard/metadata.xml
+++ b/net-vpn/networkmanager-wireguard/metadata.xml
@@ -9,7 +9,4 @@
 		This project is a VPN Plugin for NetworkManager that handles client-side WireGuard connections.
 		It is based on the OpenVPN Plugin and was started as a Bachelor's Thesis at SBA Research.
 	</longdescription>
-	<use>
-		<flag name="glib">Enable libnm-glib compatibility.</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r3.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
index 5df9750c6f2e..9b37b3a8b4cf 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r3.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
@@ -15,17 +15,16 @@ SRC_URI="https://github.com/max-moser/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz ->
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+glib +gtk +nls"
-REQUIRED_USE="glib? ( gtk )"
+IUSE="+gtk +nls"
 
 RDEPEND="
-	net-misc/networkmanager
+	>=net-misc/networkmanager-1.7.0
 	net-vpn/wireguard-tools[wg-quick]
-	glib? ( dev-libs/glib )
+	>=dev-libs/glib-2.32:2
 	gtk? (
-		app-crypt/libsecret
-		gnome-extra/nm-applet[gtk]
-		x11-libs/gtk+:3
+		>=x11-libs/gtk+-3.4:3
+		>=net-libs/libnma-1.7.0
+		>=app-crypt/libsecret-0.18
 	)
 "
 
@@ -41,6 +40,8 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
 
+PATCHES="${FILESDIR}/${PN}-0_pre20191128-change-appdata-path.patch"
+
 src_prepare() {
 	default
 
@@ -52,8 +53,8 @@ src_configure() {
 		--disable-lto
 		--disable-more-warnings
 		--disable-static
-		$(use_with glib	libnm-glib)
 		$(use_with gtk gnome)
+		--without-libnm-glib
 		$(use_enable nls)
 		--with-dist-version="Gentoo"
 	)
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
index 5c5e32f83ad8..7f5d26e4d124 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,17 +12,16 @@ EGIT_REPO_URI="https://github.com/max-moser/network-manager-wireguard"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+glib +gtk +nls"
-REQUIRED_USE="glib? ( gtk )"
+IUSE="+gtk +nls"
 
 RDEPEND="
-	net-misc/networkmanager
+	>=net-misc/networkmanager-1.7.0
 	net-vpn/wireguard-tools[wg-quick]
-	glib? ( dev-libs/glib )
+	>=dev-libs/glib-2.32:2
 	gtk? (
-		app-crypt/libsecret
-		gnome-extra/nm-applet[gtk]
-		x11-libs/gtk+:3
+		>=x11-libs/gtk+-3.4:3
+		>=net-libs/libnma-1.7.0
+		>=app-crypt/libsecret-0.18
 	)
 "
 
@@ -36,6 +35,8 @@ BDEPEND="
 	)
 "
 
+PATCHES="${FILESDIR}/${PN}-0_pre20191128-change-appdata-path.patch"
+
 src_prepare() {
 	default
 
@@ -47,8 +48,8 @@ src_configure() {
 		--disable-lto
 		--disable-more-warnings
 		--disable-static
-		$(use_with glib	libnm-glib)
 		$(use_with gtk gnome)
+		--without-libnm-glib
 		$(use_enable nls)
 		--with-dist-version="Gentoo"
 	)
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index c895e1c8c546..02c9069843b3 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -2,11 +2,10 @@ AUX README.OpenRC.txt 715 BLAKE2B 1f76faac7bf705fc3a4adbb8902e0fbd3354e654f0af59
 AUX openconnect.conf.in 941 BLAKE2B 8cfa197edfe3b3754e45281b33d51bee0dd80746ac129b071710ca9d6f5aa5da16a3c3ad5fa52c6bfdc0ae4a9b1e3cfea2c20909c6164e67e0dba880cf08fc8a SHA512 a689df7141621c80bca77fdd1e01397b98882c7fd8db79b2fe1495916656522234e3af739538002533c003e4243e9af4bf80cd73bae961e15568997ce89ef6d5
 AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa50487a0fd45c3c4d2e983fb8755bdf0de3eca44df740b286f4d353b03d71fcd2c2a27129f18031b2bd01989f738 SHA512 7b832550ef21ddb4b1c0eae7f3838b925745a5ebbdb74f1583fb8710b75175ebcbc7b1558ce95f59cd78542bec8bc01f7ab6d32ec4a5b168bb8a516a8907d362
 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
-DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15
 DIST openconnect-8.06.tar.gz 2030905 BLAKE2B d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5 SHA512 6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2
-DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a
+DIST openconnect-8.08.tar.gz 2038269 BLAKE2B 78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4 SHA512 3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8
 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
-EBUILD openconnect-8.05.ebuild 3526 BLAKE2B 275749496727f11b0081de08172e115e5fd98fd1d49911d005a658d6322ff088ad3ea7871202a9470862fec51663c43f14be495d9a26b3ad96d6b23be5370f23 SHA512 a2134380e7af33d8f4217ed3a21a1e8902b5cdb78ba819be06181f9c599d9f410d05f245d8c9ed9f5a954ea381129edc3038aecd85666f7027ed8721ec2e0456
-EBUILD openconnect-8.06.ebuild 2907 BLAKE2B 0faa06469102958596aa0ed08c2e6fb70d6ff57831f59c52c3d088b7c0d39745cdac9a452a625d9d12fed341f2ba81d5eec1fd9036b823efc3de94f0160e661d SHA512 571293b2e5c60a918943dc65d387b6845a01a6526ef7984b35a2e63ac9390f00697cead66d1a13b4ccc336c55e1a7edabddfb1ba27857f46990e7e579ffc3518
-EBUILD openconnect-9999.ebuild 2907 BLAKE2B 0faa06469102958596aa0ed08c2e6fb70d6ff57831f59c52c3d088b7c0d39745cdac9a452a625d9d12fed341f2ba81d5eec1fd9036b823efc3de94f0160e661d SHA512 571293b2e5c60a918943dc65d387b6845a01a6526ef7984b35a2e63ac9390f00697cead66d1a13b4ccc336c55e1a7edabddfb1ba27857f46990e7e579ffc3518
+EBUILD openconnect-8.06.ebuild 2902 BLAKE2B e35780d945d40094ab41e08aa27f026432561734b16bb705f5472e7c8ed20e26e3adfb4c7326aceb8b57244cb7a7c7a34f908e225bdab20b4d6596c921016bd5 SHA512 06960353039c6ae6827c4f661ea32848395ba12dcea7c3067a33ef9a492cfc639a8724cf2282b45a79c0040ac25098998239f5efd41b4d0edb384b90798b37ab
+EBUILD openconnect-8.08.ebuild 2993 BLAKE2B 15b25c5bfc81538da3d0107f8b5636a6485221bc9365b48d815c5843070130e35f406ff0f2cdf7b8dd02ef6f4172e27935a0e654d066f0a99b3aaeb5342e05d0 SHA512 a920129fb6bddd45ea4903720676f3536d398a1609818a29c721b96290a07573a1733a8b13b6dcdf6f5af67e6df93a58b9ff13d4ef633fae44ecca2e4365c9c2
+EBUILD openconnect-9999.ebuild 2993 BLAKE2B 15b25c5bfc81538da3d0107f8b5636a6485221bc9365b48d815c5843070130e35f406ff0f2cdf7b8dd02ef6f4172e27935a0e654d066f0a99b3aaeb5342e05d0 SHA512 a920129fb6bddd45ea4903720676f3536d398a1609818a29c721b96290a07573a1733a8b13b6dcdf6f5af67e6df93a58b9ff13d4ef633fae44ecca2e4365c9c2
 MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8
diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild
index 4442fa5bf4d3..dc435746805f 100644
--- a/net-vpn/openconnect/openconnect-8.06.ebuild
+++ b/net-vpn/openconnect/openconnect-8.06.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}
diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.08.ebuild
index 7ca60ca5159f..85ac062266be 100644
--- a/net-vpn/openconnect/openconnect-8.05.ebuild
+++ b/net-vpn/openconnect/openconnect-8.08.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils linux-info python-any-r1 readme.gentoo-r1
+inherit linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
+	KEYWORDS="~amd64"
 fi
-VPNC_VER=20190611
+VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}
 	ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
 
@@ -24,7 +24,8 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2
@@ -52,6 +53,11 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( ${PYTHON_DEPS} sys-apps/groff )
 	nls? ( sys-devel/gettext )
+	test? (
+		net-libs/socket_wrapper
+		net-vpn/ocserv
+		sys-libs/uid_wrapper
+	)
 "
 
 CONFIG_CHECK="~TUN"
@@ -89,10 +95,9 @@ src_configure() {
 	addwrite /run/netns
 
 	local myconf=(
-		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
-		--without-openssl-version-check
-		$(use_enable static-libs static)
+		--disable-dsa-tests
 		$(use_enable nls)
+		$(use_enable static-libs static)
 		$(use_with !gnutls openssl)
 		$(use_with gnutls)
 		$(use_with libproxy)
@@ -100,61 +105,43 @@ src_configure() {
 		$(use_with gssapi)
 		$(use_with smartcard libpcsclite)
 		$(use_with stoken)
+		--with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
 		--without-java
 	)
 
 	econf "${myconf[@]}"
 }
 
-DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
-
-You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
-instead of calling it directly:
-
-ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
-
-You can then start the vpn tunnel like this:
-
-/etc/init.d/openconnect.vpn0 start
-
-If you would like to run preup, postup, predown, and/or postdown scripts,
-You need to create a directory in /etc/openconnect with the name of the vpn:
-
-mkdir /etc/openconnect/vpn0
-
-Then add executable shell files:
-
-mkdir /etc/openconnect/vpn0
-cd /etc/openconnect/vpn0
-echo '#!/bin/sh' > preup.sh
-cp preup.sh predown.sh
-cp preup.sh postup.sh
-cp preup.sh postdown.sh
-chmod 755 /etc/openconnect/vpn0/*
-"
+src_test() {
+	local charset
+	for charset in UTF-8 ISO8859-2; do
+		if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then
+			# If we don't have valid cs_CZ locale data, auth-nonascii will fail.
+			# Force a test skip by exiting with status 77.
+			sed -i -e '2i exit 77' tests/auth-nonascii || die
+			break
+		fi
+	done
+	default
+}
 
 src_install() {
 	default
 
+	find "${ED}" -name '*.la' -delete || die
+
+	dodoc "${FILESDIR}"/README.OpenRC.txt
+
 	newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
 	insinto /etc/openconnect
+
 	newconfd "${FILESDIR}"/openconnect.conf.in openconnect
+
 	exeinto /etc/openconnect
 	newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
+
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/openconnect.logrotate openconnect
-	keepdir /var/log/openconnect
-
-	find "${ED}" -name '*.la' -delete || die
 
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may want to consider installing the following optional packages."
-		optfeature "resolvconf support" virtual/resolvconf
-	fi
+	keepdir /var/log/openconnect
 }
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 4442fa5bf4d3..85ac062266be 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}
@@ -24,7 +24,8 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2
@@ -52,6 +53,11 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( ${PYTHON_DEPS} sys-apps/groff )
 	nls? ( sys-devel/gettext )
+	test? (
+		net-libs/socket_wrapper
+		net-vpn/ocserv
+		sys-libs/uid_wrapper
+	)
 "
 
 CONFIG_CHECK="~TUN"
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 19ae5892f26b..5a7b3a18f636 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -10,9 +10,11 @@ DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
 DIST openvpn-2.4.8.tar.gz 997417 BLAKE2B 1c56d25c125039b9f0723d8f498c9cc7233c9da940d961a430c82a3c41448c0c4fc64255adad59513d4e39b8e778cf58ced965e1501793c47bc73d211c339e4e SHA512 6a5f6f6a5cccc5011019e64ed452ad395942b751589893bd6fd3159b20577d734f2fe35d2f51f30303adee3a21e67da6d25369ea4421288ba7c2e09445e2c001
+DIST openvpn-2.4.9.tar.gz 1000602 BLAKE2B 4a10ec76d1a816f9184dd33e4384623e011a1af40ea38ad56cc06f70ab2c911b6fd92cf8ffcd2ec3ab4179fef87feb187fc9df61c5bea92b1c69ee4113093866 SHA512 7683dfb93592968459f080a07ea750992b7444708cdb1a5aafc0118ab8528fc488f2b9fbd7d042e57ad1811303208875237ae9decf0bb4977c45cd30da53751b
 EBUILD openvpn-2.4.6-r1.ebuild 4497 BLAKE2B 5ca911e21c950e34cb3b5f69a175690c443b6179c0b00afe0a6579c8fa4537b96153134ddfd14776076e324b2cc4be11a94e0ff56da42745f2673aa39431788c SHA512 f0500f9e54769d8bfed7a4e1bf657e7dfb5cad5600ce7de7165eadaf79e528f232595da55cd40fae6304ebd1eaf86a3484e3faa59963ded673d5caf41d0b2260
-EBUILD openvpn-2.4.6.ebuild 4490 BLAKE2B 8b62cf9f0762a73b0fef819d21da671be0ee2425026c4dd5adc04e6982a53d31b46f97c23deb139a993318d257f869bd6dee5ba7a84866117b10fe3b83bb1e1b SHA512 36f32742382390fe24032762aa7b9712c5fc055c7aea0b6a48d5cdc4add36fcb9ab8f94adaab840086840990c691ff5cc30b809d125b1f1681b8c9ac30a886c3
-EBUILD openvpn-2.4.7-r1.ebuild 4537 BLAKE2B 573863ab5f28016946c1aefb98f7b73459a1b3aa10ba393f47c626bbbf241acbd9e1d5aa46e0ac92c9aa6ac852d51880ccc3afb3b21ac51cd6697f0c03f2de54 SHA512 d1a57a650cc91515cdeeac20768bb83586da03b153e13e551449f37ba527c9ad20fc140343300cb18e31e9ed9704d4cbaf359c1afdca1aec5c32af2ee61df3a3
+EBUILD openvpn-2.4.6.ebuild 4491 BLAKE2B 120448a1525ed205a2ddfb1a0841cb4167cfd6ac7a3db2cdd6ff9d100028090d54c835908062ce6f08da0ff7fe6fce5a9ced21a5d1ba93cdc9f7fe397e651ed8 SHA512 88b5c883e041823672da5c4cd54594054832c4610f793eeb601e0b655b9a1eda0858aa11fe20ec5d5eb3ad2c50b97348ace5965360b79441fe8fbce96d491b58
+EBUILD openvpn-2.4.7-r1.ebuild 4538 BLAKE2B b0b02615e4c1f478078422dacda49f8d5832aa3d201097d245037245c00cd178062b125dd73d386d6a72b357a9ae2d46325d2e72292cf5c1986f22ebd5727b73 SHA512 0e311676afff67fe3da4d5b7a7df15e67af40b9100349b4aca3da9a427f0e414eda39056bd725abeea5504c905db3c80ec9533021cfb8765bb73afe7032a24ce
 EBUILD openvpn-2.4.8.ebuild 4013 BLAKE2B 6ce18ef028e85459815792bf315524a1ac71790829d86d6822e5273d93abb35a54813689298573a53a7bc9afdb57ded9002930e637531f86ff63372e3c48838a SHA512 f0c13bd66ac9976a894fabef51b496643ed351c8ca2dd8cb0a98c769918b8458a20cb7bce6909f1472a03dbc7eecfae6e60def81eaf51e8818bf337dabbdfa37
+EBUILD openvpn-2.4.9.ebuild 4008 BLAKE2B 0c0eb93b706fd2eaf22989240f0105f82648b67eb1914cc1e97a5eb407f79650771e8611c678796c8058e16f5f2fab8bb5e7cd71dff7283495afc16bf667a8ab SHA512 83043fca1cf8cfa04dfbef0dabf6f5945d0ee2602931fab1a02209e826e17342e4484438e7b09fb377e1bda4c5c380579bf41513b70a7d0c78b475b586bf6328
 EBUILD openvpn-9999.ebuild 4148 BLAKE2B d2942eb2659d5cc1cef40143b6cd84e4e869031cc23ac419865db1286c7bf3ec7c66433ed2c3149d654206f74b3db14b3cea17a5d90332e9bfa5cbb6b172fdf5 SHA512 0807ceb96db862c33e42c7b2eb1224cfdb01d32e09048250bb69a05244af9835e805a9a87fb47d8a0a2422c12088ab515389b180d93286093f2089eab2709c8d
 MISC metadata.xml 998 BLAKE2B 800c147b67d26d0ae3856c3aebfd7bec9326aaa67ffcb16b57e00ad722b8154bcd4cd6daef741ebb0f12032ef986e0b3b5a4cf99014df1fbd54699a98ed13a0c SHA512 d7e07e98986611dc410a3ab1b0bf2bb3925fcc9f3388c9649ce7a01baa2fa076d7766b4e1b9749048aa1d1850cb9053e8822ce7a1870002805c176c6a60e6db8
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 8e5698ea16ba..eb359996e004 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index afb115a1fda4..845ec4ad7b0f 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild
new file mode 100644
index 000000000000..684a4871fe82
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.4.9.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd linux-info
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="https://github.com/OpenVPN/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
+IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="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? ( 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 )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${CDEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+CONFIG_CHECK="~TUN"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+	IFCONFIG=/bin/ifconfig \
+	ROUTE=/bin/route \
+	econf \
+		$(use_enable inotify async-push) \
+		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
+		$(use_enable lz4) \
+		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
+		$(use_enable iproute2) \
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root) \
+		$(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
+		docinto /usr/share/doc/${PF}/examples
+		dodoc -r sample contrib
+	fi
+}
+
+pkg_postinst() {
+	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/tailscale/Manifest b/net-vpn/tailscale/Manifest
index e2c120e4fde3..014dfb548f48 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -5,5 +5,10 @@ DIST tailscale_0.97-45_386.tgz 11879684 BLAKE2B 690e707e499e6986bd9676875af818f9
 DIST tailscale_0.97-45_amd64.tgz 12233156 BLAKE2B 120781c003be7cd244dd8b3659e817aea6567d0c0d4e34f468f2fb584b62a34cadec4e37b5d96076e7b4c9ffc6611b4dd7d41375ce6e54812e89d974af70a558 SHA512 6ed0dc7d847c75b3597deff0febb5a72b07d027e8b4889151c00126d77dd1dc3fd878080a2d0d4737a3b9a5f3b11993e2ff6991fc7e5fde2eed7838239515338
 DIST tailscale_0.97-45_arm.tgz 11328113 BLAKE2B 1ca588dfd8bb2c6e2b79d323b39f919ad2aebbb4c1812330a2875752b102bc461a304fa9c9761bd090d6361a966e04a06128535885383cb5baca0a679013e5b4 SHA512 78d8f44a07365ebc226df9c0a808f8da2a3e1f102db7aae3c9612c5c7e6ed5a32fcf0d43b43f23c507bba7ca4049be7a33c52473cff53d3fd7e9f9ae6b4d84bb
 DIST tailscale_0.97-45_arm64.tgz 11321460 BLAKE2B bdaadbb8c384cab4d098b9aabab299767744bc0ada5b31f7510505e5dd83b507b369010ba4d9e96935fbe8cdd9fafe3fd9308d3ccd5aaf829c3aa85887bc144e SHA512 e6a68fe36219024fa01ce0bc5b2ab56614197dade1cdc131ef8f966684fa513e0e51589fc4e7740812f08f05a2b08127a8679de3005b925a613a1bef8675a48f
+DIST tailscale_0.98-0_386.tgz 11772623 BLAKE2B 085f798bb1aabc8f6e286184428cca84cc552037bb67b503227e7c56acc90b6b9b860d3147498bbdeb5dc39164d472ba4ea441b93a57dd37b5aa4a977f2f1702 SHA512 10bbdbc7da71e018189eb63fe126237bd978cad8169a824f8bf70c065e53bd3d0f2741ce0bf7f810f27f68a273d33caf4cd086acde51956109c0d5317862352e
+DIST tailscale_0.98-0_amd64.tgz 12080659 BLAKE2B f3935a51c0210930d93c1779022e0e11508a92899fab5ba50c2a14a8670bc03a601de18847c02428971188647b60ba0154b12027c5d4224d47735964fa031ef7 SHA512 119ffa7a7035327b388dbabc118b37cc4af5f0b2bc01a4a757719b37659fefc2363eb48ef68c8009a05bff3cf3caf92a5f918683f49cdb052fc6c618ad08ed45
+DIST tailscale_0.98-0_arm.tgz 11276678 BLAKE2B 06e176c8fcd68761b8c3a9399e189b7793d2284315187b77c5c36309d6e5d8ce3a4675531315a47cba54fb402b0f07e02bcf2f9cd4c502f99131d86a1b0e422b SHA512 95913a397d636188d9673d1eca37e3b4fcf87ade0fcf7b69d086b2d05e5d854aba786ace03a1b7f406d02140a0c9197c925a5666c8a3bc1d11e15479f6440deb
+DIST tailscale_0.98-0_arm64.tgz 11288963 BLAKE2B 4244bcb6ff79dfaece4c82917a39804b6d58ce6a5f0572d19f62d9ba4cd40a0031eb723aee5a12dedc1303fbb8e9926d1b6eb9964080c5f162149dd049f8322b SHA512 b81c90a5a4a999a03c7edeaf65a0a2900771ade17a888ee03c29762c491d9fce605ce77f812949cbc36ad113d8a5ce5d2e21d69e91a7b4b8a87a8fc93129aaf4
 EBUILD tailscale-0.97_p45.ebuild 1148 BLAKE2B 51bdffb3879948dbfa6874f15885d6471bf0f971a3872bf789d49df150458eeacd94b43578f78adb625ee060a1dbf47008fde1229ac90b2f70081e0c6ec3dce1 SHA512 f03e1f52a4cc8893603e9603f38d51bf03a31aa76076c0d521d0cc3e59dc636b2457222343851402283a3dc40ce2417ebc31a799df95f58da3bf11711eba60b1
+EBUILD tailscale-0.98_p0.ebuild 1144 BLAKE2B ab6207222e23e25b2b8a06f228da56d225745326f5435d663b63b02d7fe075988b71b90edff207b857d2997dcd486941f2897472f5372f4c4492d0ae05b40152 SHA512 fd64e1e33fcc11e7b1653f1811368b243fa4eb113e11e281df13118013a39d17380872809611cf75459a7fa08d4e336f628009781d6e07d2bfd1a696fcf1aeb9
 MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/net-vpn/tailscale/tailscale-0.98_p0.ebuild b/net-vpn/tailscale/tailscale-0.98_p0.ebuild
new file mode 100644
index 000000000000..1a9d74fe71a7
--- /dev/null
+++ b/net-vpn/tailscale/tailscale-0.98_p0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Tailscale vpn client"
+HOMEPAGE="https://tailscale.com"
+
+MY_PV="${PV//_p/-}"
+MY_P="${PN}_${MY_PV}"
+SRC_URI="
+	amd64? ( https://pkgs.tailscale.com/stable/${MY_P}_amd64.tgz )
+	arm? ( https://pkgs.tailscale.com/stable/${MY_P}_arm.tgz )
+	arm64? ( https://pkgs.tailscale.com/stable/${MY_P}_arm64.tgz )
+	x86? ( https://pkgs.tailscale.com/stable/${MY_P}_386.tgz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="net-firewall/iptables"
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	default
+	use amd64 && S="${WORKDIR}/${MY_P}_amd64"
+	use arm && S="${WORKDIR}/${MY_P}_arm"
+	use arm64 && S="${WORKDIR}/${MY_P}_arm64"
+	use x86 && S="${WORKDIR}/${MY_P}_386"
+}
+
+src_install() {
+	dosbin ${PN}d
+	dobin ${PN}
+
+	systemd_dounit systemd/*.service
+	insinto /etc/default
+	newins systemd/tailscaled.defaults ${PN}
+	keepdir /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
+}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 29a06cbdf2f1..81f8e6368d7f 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,7 +5,7 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.2.7.tar.gz 7604875 BLAKE2B d24f9bd5a3467c909cf95e7e06873817df1a11a86f002450058df7d2aa637b25441128ec57951e22681fdd9b0ef95808306d76b6485e060365f4fbf10e263ac8 SHA512 a23c7eec8f399372227433c62c97278563a63e4cf03e475307915d395fb0b7efc461b4c8a077149e7b6df955ec26d52cd833dfe37fb650d23b3fcb1a4163d64d
-DIST tor-0.4.3.3-alpha.tar.gz 7731305 BLAKE2B da3fb8186a5450b81d8eaa5d991319453d05c8ba829b94abadbd75420b098a77cb173f086bf650751af8e8054f1baa30ebb934ba7a5f8086a4c24cf138ece44a SHA512 77e84397578b6473c3608a6dbf3a76f1f638e7d432c505145bc7c64c9a21a4ab9e8f545133296bb6341a8088cdcd53f031a0ea0cba2c6f30ad248cdf075aaa5b
+DIST tor-0.4.3.4-rc.tar.gz 7733656 BLAKE2B 2d4aa113dd7b9a5416dad67d0d878dcd68c2e3894955b47edae17a9afb20e30489b7193d592639ee0a5cc00aa0d693a551aeed13a7c21f4078cb864234eda984 SHA512 f0685527a6d3b1a22f5d4c69353e3727e508f8f643117b87a44f50a8d0fafd1a25122dc4cab03b2f1fcc1d4fb6fb47548798ee34b712b99de42c9ca21105be50
 EBUILD tor-0.4.2.7.ebuild 2281 BLAKE2B feb38bdd43a223cdad0544ccb9c3b6bfa090070d7653fd01679b2a271237074715bf5da25f2d9304c66d03a69a274c9c9d2273d37e484ffc228a58c66634822a SHA512 f2801fd1f4b739df5ec280925b1a3f83ea2436d3afed1abbdce1e7750f5d6f3dfd647b865fba460524b3b18b1692a47c152b934fa750c60365592420587308ab
-EBUILD tor-0.4.3.3_alpha.ebuild 2369 BLAKE2B d9a1a3739242f704bb202937f37f6c81e2f4a6354098a60baf07767d50124a09acccf7770c4ae730881f7848fdb7e555671d03cb60ba2fceb1881b2755c1531e SHA512 a57fcf96fec12ebe15c963835eeceea9841d781faa894f06af874c670e397ffd2b9eff52a3ebb53c540fde737af58fad3373add0b57b8b8290ae495e4acb60ec
+EBUILD tor-0.4.3.4_rc.ebuild 2369 BLAKE2B d9a1a3739242f704bb202937f37f6c81e2f4a6354098a60baf07767d50124a09acccf7770c4ae730881f7848fdb7e555671d03cb60ba2fceb1881b2755c1531e SHA512 a57fcf96fec12ebe15c963835eeceea9841d781faa894f06af874c670e397ffd2b9eff52a3ebb53c540fde737af58fad3373add0b57b8b8290ae495e4acb60ec
 MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
diff --git a/net-vpn/tor/tor-0.4.3.3_alpha.ebuild b/net-vpn/tor/tor-0.4.3.4_rc.ebuild
index 36757c1c3d73..36757c1c3d73 100644
--- a/net-vpn/tor/tor-0.4.3.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.3.4_rc.ebuild
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 35ae73dbfffd..9b51d096d7ad 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -1,7 +1,10 @@
+AUX vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch 915 BLAKE2B e7611c54b57e2bfe0b6d9e56c4bdcc22de6f24a2af1752e30b1f41aa4e22ca721a0b665f36dc713e7b3264408df5b4a729ef421dff3df8a52336476444a6ba07 SHA512 ce5724db1778f390ddd2b601d2402f06549f81cd2ea0098868922bb03e1ecdf7d3aade40aface2710e471052484b795ce9b3437d136e4f04c02d81a900429148
 AUX vpnc-3.init 2197 BLAKE2B 8f88a7f27207e1ab4f2e9b4f31ceb06668f26fcace00dd169237766775ff72d9db1df0827f2ddea76144085270a85c801d1ffc14bbeb175dbbecdb21bb50c69f SHA512 d05a362606f314c0c275b2354308431c9aa53d8c83172fa86d34c28573f0ea527b1aa9e2dcb8341f212600bd3a50ba8ea3038a05b494ac008297b03e528abd97
 AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32cbda995a1fd2e90cd6b93f6b9b749b28a4f34aea417001b330ca53ed5a3291de9d7b2d99965342f603f SHA512 21635c67b89ca04880eca6c53e47b2b4ed27f992415d466d27a634af3393b1aa7a75cf09b8ad1a6a80cd2f93c508eb8cc6876ae20bfe3a1c66b7cd09f1e7661d
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
+DIST vpnc-0.5.3_p550-r1.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
 DIST vpnc-0.5.3_p550.tar.xz 101860 BLAKE2B 9800ab0704108cd70450dcfe314eba7c09ca1bb329fa6b9f2946dbb6ee6407e5f6bc3d17d8be782e9103d94a12895777125acdad070f39ea1b96a946ba7d2302 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55
+EBUILD vpnc-0.5.3_p550-r1.ebuild 2192 BLAKE2B b1c3788d1a970ac8bdec98de04583d181cd1beb4f4bdd4d731aae6646ddf7c4b5b2b2fcf9ea1691f2821d7960d0bc34e4574f2a5847d158e8fde10d4c3d9a86c SHA512 a66ac8a44ea9f1b94d850f9bd0e94ffe8f9668981feece54da94cc6c4e237116eec63c5df3b5f4be7eed7daf6472ffe8ae612ca17dd2661037aec4a525a25d03
 EBUILD vpnc-0.5.3_p550.ebuild 2206 BLAKE2B 73d66da98c0e2ed3c756e1409384915a471d817318b3f04765c4e488f2ceb75e92032ef4f4fea85b910d579ce63f818560eb53d716dc291957d690107108162a SHA512 a25a180d9a16507d2c490590f1f6f05dd59abcd2196d9673b0a88c659069c5fc9a2912ea816f6a90d5d20d2300a602df7417427413233be8a12e46cd0b30cadc
-MISC metadata.xml 501 BLAKE2B 31df31e209ccf8c590130748c6b8f800a143b81beba395b0ece4b73eefa5677928ca25dee2f3cba5eed014da2d9fb318b34407ebfd8138f383a035446b3e481d SHA512 68b6553d61bd272eee71187a3d3c547132b694b9258d20887a91b0429a50ea6b35644ec8305fbc67213a22bab10f18b4166dabaf9beef3088182facd461aea39
+MISC metadata.xml 364 BLAKE2B ad78bc77b84330fe5680966fa276e821746d7a950e326fde42fa8d330ed176fca5a7dc31831e9af97c28a243aabcb693ff0016d93fae1b702c10f968167b26fc SHA512 5d31b14522ea8c365ead3dd5bfa2370ed6347259f023b17bd19707628ce5e1d0141c340869846de508e3268f79ff298bb93026adc4a798e4774054ee06672174
diff --git a/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch
new file mode 100644
index 000000000000..e574b51fba63
--- /dev/null
+++ b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch
@@ -0,0 +1,33 @@
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -158,7 +158,7 @@
+      * treat passcode as password
+      * filter "metric10 64" and the like from ip route get output
+      * updated to libgcrypt-1.1.90
+-     * create /var/run/vpnc/ as necessary
++     * create /run/vpnc/ as necessary
+ 
+ * vpnc-0.2-rm+zomb-pre6.tar.gz Sun Nov 2 02:15:56 CET 2003
+ 
+--- a/src/config.c
++++ b/src/config.c
+@@ -390,7 +390,7 @@
+ 
+ static const char *config_def_pid_file(void)
+ {
+-	return "/var/run/vpnc.pid";
++	return "/run/vpnc.pid";
+ }
+ 
+ static const char *config_def_vendor(void)
+--- a/TODO
++++ b/TODO
+@@ -115,7 +115,7 @@
+ * DONE post link to http://www.liebchen-online.de/vpn-zaurus.html
+ * DONE passcode == password
+ * DONE support for new libgcrypt versions
+-* DONE make /var/run/vpnc as needed
++* DONE make /run/vpnc as needed
+ * DONE ignore "metric10 xx"
+ * DONE ignore attr 32136! (Cisco extension: XAUTH Vendor)
+ * DONE FreeBSD supported
diff --git a/net-vpn/vpnc/metadata.xml b/net-vpn/vpnc/metadata.xml
index 08b929631454..38a14e7a7e4e 100644
--- a/net-vpn/vpnc/metadata.xml
+++ b/net-vpn/vpnc/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mmokrejs@gmail.com</email>
-    <name>Martin Mokrejs</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
-  </use>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<use>
+		<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild
new file mode 100644
index 000000000000..4276d407ffab
--- /dev/null
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
+SRC_URI="https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="resolvconf +gnutls selinux"
+RESTRICT="!gnutls? ( bindist )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt:0=
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}
+	resolvconf? ( virtual/resolvconf )
+	selinux? ( sec-policy/selinux-vpn )
+"
+
+CONFIG_CHECK="~TUN"
+
+S="${WORKDIR}/${PF}"
+PATCHES=( "${FILESDIR}"/${PF}-var-run-fhs-3.0.patch )
+
+src_configure() {
+	tc-export CC
+	export OPENSSL_GPL_VIOLATION=$(usex !gnutls)
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" install
+	dodoc README.md TODO VERSION
+
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}"/vpnc-3.init vpnc
+	newconfd "${FILESDIR}"/vpnc.confd vpnc
+	sed -e "s:/usr/local:${EPREFIX}/usr:" -i "${ED}"/etc/vpnc/vpnc-script || die
+
+	systemd_dotmpfilesd "${FILESDIR}"/vpnc-tmpfiles.conf
+	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
+
+	# COPYING file resides here, should not be installed
+	rm -r "${ED}"/usr/share/doc/vpnc/ || die
+}
+
+pkg_postinst() {
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"
+
+	if use gnutls; then
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+}
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index d6aae41f903b..dd8fa42b1b4e 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,4 +1,5 @@
-DIST wireguard-linux-compat-1.0.20200401.tar.xz 261000 BLAKE2B 8f2d2b775707efd2611c2b956c96fcb3a14884b78716629a5f572ca179279cca698ea0dff2e7f332780d8f667d391b37553fa41b22cf71a47269b5a879202410 SHA512 894da609c7102eb1d076a4a7bdaa96c7d5f0d64b4b86fdf01068ac5f4af966652e7ad7f18b1295a7fc4447f53b55a9ec45f1b3f36f0f9df7fb08836dfdff89f0
-EBUILD wireguard-modules-1.0.20200401.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5
+AUX wireguard-modules-1.0.20200413-sch_generic-header.patch 860 BLAKE2B a3eb14274fd7c9a2d4e04aedb17f6fb87711b4c0d092651137f9b5a1c7aff43894a3a2de88ece6da18c8638a870128d9c61eb5f1fc5b7c9c40d150a95ff046d9 SHA512 2824c822f94c15644b990b1a8c7a9fbe6e752556736eb47e6330a11e7d4bdd1077d922dd41e0f63ef519f427653497014154c1074bd1bfb564fcaeb0ec0b4f6c
+DIST wireguard-linux-compat-1.0.20200413.tar.xz 261480 BLAKE2B 4a6e6571ba6e0285b08bb8b08b041cef02fdab99b516dd8717acf0f4cf86308382ed7b4f7333c5a97bd338aa973df83a7c8acd41c7022242700ec8db60f3aa64 SHA512 1df6802bf7bbae9292479b36a0ab54fc486ec0aa97e3c507634e4459b55f6755995ae73758ab169ed279e5d5dcf32bf3f38c18ce156d30f80be8ed77308fa8e8
+EBUILD wireguard-modules-1.0.20200413.ebuild 3499 BLAKE2B e7e3f05f8d854621fbf1ba6f19dbe5bc63c6c8c628b2ffa52594749bb149abc1fd0cc5b693df1422f0ef25a88511d1a203d897f8aa7ffd93b12d9f5d528d22cc SHA512 770a2d3d666560e022de710c0045f9057caa25989119417041d80e479a61628208b4adceb0534494f36ae9acf686b7334f48daca7816765e1e0e2e8acf090b66
 EBUILD wireguard-modules-9999.ebuild 3442 BLAKE2B 81c97ff68c71ce60d343266035852d2128246a3aa1c4ca95d0847904c021c5e4a7bb652d8c531e50be1dcc430fa34e54682462595101fded003af71e97e037e6 SHA512 1979d83d24156acf594edfc23c76e8e30e9a21ef9cd3fd45a06462ba20a30a9c90618852a611793af53424a52e0486a93d9198e18f89b7c57f9e8e06b434c9d5
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch b/net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch
new file mode 100644
index 000000000000..8e263e9622a9
--- /dev/null
+++ b/net-vpn/wireguard-modules/files/wireguard-modules-1.0.20200413-sch_generic-header.patch
@@ -0,0 +1,26 @@
+From bd388363a66d67f0e04f9c45b20a9f33dfcf79f6 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Thu, 16 Apr 2020 00:27:33 -0600
+Subject: compat: include sch_generic.h header for skb_reset_tc
+
+Reported-by: King DuckZ <dev00@gmx.it>
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ src/compat/compat.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/compat/compat.h b/src/compat/compat.h
+index 75bd3b7..bb996b8 100644
+--- a/src/compat/compat.h
++++ b/src/compat/compat.h
+@@ -1029,6 +1029,7 @@ out:
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14))
+ #include <linux/skbuff.h>
++#include <net/sch_generic.h>
+ static inline void skb_reset_redirect(struct sk_buff *skb)
+ {
+ #ifdef CONFIG_NET_SCHED
+-- 
+cgit v1.2.3-4-ga26e
+
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200401.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200413.ebuild
index 16df945c1ab1..8a425d4191e6 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200401.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200413.ebuild
@@ -30,6 +30,8 @@ MODULE_NAMES="wireguard(kernel/drivers/net:src)"
 BUILD_TARGETS="module"
 CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
 
+PATCHES=( "${FILESDIR}/${P}-sch_generic-header.patch" )
+
 pkg_setup() {
 	if use module; then
 		linux-mod_pkg_setup
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index f935a1f1dfe3..dcc4afd3a370 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,3 +1,3 @@
 DIST wireguard-tools-1.0.20200319.tar.xz 92324 BLAKE2B 9f514748708ef6a5b7f5b043c9054c954d17bb77de7a354b5a9a4e63cfb5f441237e98b16b288426441a7e709e1874d396cf67b04b38bb0ebbe7822bb32ada57 SHA512 d5bcd153f9b10f184b9a1bf9a81f33a9713ab4863ab5aa190eac60e92919756c8fecbb0d3cfb83bae20ac78fc43fdd7168f37294cdd7c5ee21f2a1b2db5fdf41
-EBUILD wireguard-tools-1.0.20200319.ebuild 3464 BLAKE2B 09892bb8d40a2746346f17f48895dbd69ceec61071cd09821a3075a55d94bf34469bcbd6874ef223a192902f57dd689a9e49e3bfbc48fd7afa92c1c5fea71ac1 SHA512 ab9b3030d249ec80f5a88338201592af044b5a30f3807be5aa05f29fc8ab19b1fdc21ab597a890768a1e7b7282e7807e640b7d632b7b294a6c6dd23f94f89cbb
+EBUILD wireguard-tools-1.0.20200319.ebuild 3457 BLAKE2B 13c8ba245677c71d0487b7e7752b2ea31d26644520227b5b2aea302b83e953152b9752a608d8b10d23ef1ade89a78b814a20c31136989b2a6ec0cd14d3b63515 SHA512 a50707ab26b9c81b435dbd0edbf08da7ab06674d332818b3f715142adfce4d1ca8f5deba9291ecda4c26e23bc6214cde38114238faee9295163bfa6625f82093
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
index 63594bbb2bef..6d3ad039ded4 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
commit	38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree	04e2cf4bd43601b77daa79fe654e409187093c5e /net-vpn
parent	623ee73d661e5ed8475cb264511f683407d87365 (diff)