gentoo (leap year) resync : 29.02.2020

23 files changed, 117 insertions, 71 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 7cd3934443d9..742dffed3958 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/iodine/Manifest b/net-vpn/iodine/Manifest
index b3bbe8e19f2d..48aea9e51424 100644
--- a/net-vpn/iodine/Manifest
+++ b/net-vpn/iodine/Manifest
@@ -3,5 +3,5 @@ AUX iodine-0.7.0-new-systemd.patch 440 BLAKE2B d4d0f2b24cfaaf743f84f4003d5213440
 AUX iodined-1.init 1422 BLAKE2B 50e39490f37d4e74ae9e768459e1011d232e9673d87091a41d0f7bbee8ef47a6b4c716e5dfcb169582ea7299fb33e3d8b238ead1af690f41630f6482f3635882 SHA512 c146c16f10574a16971d81010ab51f6fa68ebbd3275e50f18bfeb4dde5976ab97a9817d26bbe7d2b8cce3c4a8624a7627674528b30a4e958b4523cee03d6e1c9
 AUX iodined.conf 1547 BLAKE2B aed2f5ee21d513cec4602031a739735f3fc13cc4ebd5f273603a0a67e6bcdcc053c68df128fc167f7330d1848195584a8249a4b77f02e19bcf6e9e4d3e3d3bbf SHA512 3aab274be5670e4dc59fbf4fa9b5d6bfb1363ea081a8cf5c3d881007ca6d54a725038edd3b06f0aa24fb71756c4a54e96374867063ac1310ef9ce3a2ff25943d
 DIST iodine-0.7.0.tar.gz 96181 BLAKE2B bc7b634f4060d0a3be259f1a0797263de65d6ee6bc2c777c0b74d789c60877aae2895bfda11f5fdd7e064ab137607abfffe689e0a01b2505878e442d08e3555a SHA512 49fe4f0cf614d3400cbfdade84eb4f50430f8f92004f663a08acc1514e8ff342443a8c3f855828bbca1864a3fafe419b5256f8a80fc4024b364d4c8c953fc0ec
-EBUILD iodine-0.7.0-r2.ebuild 1134 BLAKE2B 0526514eac8b18acbc2ec9a141d7b6e1dc7d3c878b1e018494f9fc57d53b7c0cf5d7e878df8f881654dffddf4f214bf742e5985fa3f326c4248f86699985d565 SHA512 beedfdddcadc37eff29921501a8356ac29b01fdf79a801f8a8532af48f1736c47af8083d02ebf37d77ff2eabd6586fe63b7ad8f2871bf92af7da8675a76408a0
+EBUILD iodine-0.7.0-r2.ebuild 1135 BLAKE2B e46ebbf9a44fb904870be12d49cf4608bd892e617f95c690e47d09d8992588bd422b9914f881c19dd06c0ad17aabf950319d376c324d00837a04d760114dab25 SHA512 2c9861806269298e19a875d3875669ff893672c61d2e906a146ded180cacf8c06be3d70288a5a8ce971b4dae32d269f0756765abab24c2dc1aa36fc858abface
 MISC metadata.xml 449 BLAKE2B e2f21efe28a19ffcf9970085771089799435c63631bf34705fd6f2fa9ed86f0365b8a0fc13a8ea6a397aee3d4ffa5c5a46328bcf1652a1070540271a5a714cec SHA512 e39deb26277f544d1f152ed90dae637060560da8bce420f3c53f18bcdb7ca0225fa6147c5c99884153aa4687f44183f221e3f2695a7509d4b9946dafedc92248
diff --git a/net-vpn/iodine/iodine-0.7.0-r2.ebuild b/net-vpn/iodine/iodine-0.7.0-r2.ebuild
index 4acd6119657e..1b2ec7a257c9 100644
--- a/net-vpn/iodine/iodine-0.7.0-r2.ebuild
+++ b/net-vpn/iodine/iodine-0.7.0-r2.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=5
@@ -21,7 +21,7 @@ RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 
-src_prepare(){
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-TestMessage.patch
 	epatch "${FILESDIR}"/${P}-new-systemd.patch
 
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 728fa0dbceef..8411f09cbb73 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -2,5 +2,5 @@ AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d34889
 DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535
 DIST libreswan-3.30.tar.gz 4119139 BLAKE2B 64c528b84bce10a01dceece473016a1836c47da0d1878c4fd413f859e6c5edc05bded1ac54d60e6979005f6654ab4819b8b05aba5b16658d493bb300bf773823 SHA512 1ea3505938231bacb762ec13c278b584239660e20994030423f0200ff32fcc0f0a0c74649b1470bbfc1165a762d3b60d0b1c5c56bff81a52415c7666736b5b99
 EBUILD libreswan-3.29.ebuild 3062 BLAKE2B 5d6b9ef04607c52c292d0c509129cfb82dc2d8ed2d30b90ecbc81a76de048c45b0c945f22cafbdc3c4fb35511bb9cb5b7992968fccd041cfc06e48f5a3cafef9 SHA512 640827da7fc1e7acce3b53d555e782cf685f0937b1ddab1c89888533fa067b19a9a931fbeb62ece60b474e576401d7a06b1f8fa6893adb748a09260d62716704
-EBUILD libreswan-3.30.ebuild 3110 BLAKE2B 0f84dd7a505e68d0a6a41e9a18977af082e4193d7b0244a98f09f14b7f8959a6f72aa74a95c443bb567b28c9fe9d7ac7c67a46ab8fa747f1e1c2b1a53e86d821 SHA512 13008ceb610db80cc883eb54a413059fb85bcab15f19ad84b999edceb82fc1fa7bad94f53351d16664856ffa700465a9f4fa0a75f67b8565378e48754c09eb50
+EBUILD libreswan-3.30.ebuild 3143 BLAKE2B eb0ab4332f1f14e43022e6ca477ae07c031a2d1d801d96de0a6b20216a2ea3d3ad591490234f7b7807239bba8896b45c3af4132b418ceb1f80528b1b0c5dd37f SHA512 2e040ad807983db86e91542fc9ddce4c3e0168f2049d675d442577542d0febe001e6ecf69cb6f8162a240a4e60ad8a1020e4c22db25335b20815bc81d98bf7da
 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
index 430bcc8201af..bf8f6a939631 100644
--- a/net-vpn/libreswan/libreswan-3.30.ebuild
+++ b/net-vpn/libreswan/libreswan-3.30.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	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 )
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 4d9b1ed04ff6..9f171c381aff 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,5 +1,3 @@
-DIST openfortivpn-1.10.0.tar.gz 74872 BLAKE2B 98b6840aedb72592d95f12c011823119f1622154f1ebe20da867e6e0b8b2da666928a74d8712564d743d37b9c1ef24d9e1764cd11e86b53d4969594f549e68d6 SHA512 504cc489c298a59b958afe8278e3d7089fa2f5c21b0ce4c1c6e8bd99ccc670f86ba48812b844dffae04930d3398ac38e7a27768022e972f45b81f19e8400801e
 DIST openfortivpn-1.11.0.tar.gz 77325 BLAKE2B af899a0e096f439fd85bf65d5a6bf620fd970177ab2afbf4b4bcfec6fdd34179ec7e239ceadcf0fe326c8eb9d281e7c19756e2ea444e96c58a203f0c32795163 SHA512 09a1d2deea932be80306a2a394aae8553e23389668844dd16d69626bdf1e6c28f58c0d45483fbb994b046e4e4cce4bf6e1e79fcd3ebc2c4d93870f431a8553f4
-EBUILD openfortivpn-1.10.0.ebuild 761 BLAKE2B 486e22bbfc2a1541c99bf596b88bfaece6bb701a7d8fb31c2d245745c67ae687ab8abb6967a5129832bd9a511ed43c9782b7ef14b2df9e1016099ace4880b583 SHA512 ddfe172d12c5bd34e5458dee0f13a35934392f1f73858a14218ef10e657ab123eb6e09ecf7aef0a2f48416e7b7721c436d3a2612e149853a093652da8c84459d
-EBUILD openfortivpn-1.11.0.ebuild 762 BLAKE2B 2eeb69de1ae4095f5a1e8f3a37d543839c5aacbf68eae8ba200d084ac0de4d74c6b1afaf9321036ff77eb1689a799fa836fae13b45e66386c3f2badfb3a87fb3 SHA512 8bf74ff6e0879764089b4fdafef90bbe1737446ce3ac4dda9349031a32f4b6aab17a6f847feee314616f30a08ffe5395903726b99a28b93ed91f724551c05815
+EBUILD openfortivpn-1.11.0.ebuild 761 BLAKE2B 8282264a7cba753bb9682a94c04e84781792f7ec69abb18262796eb2e7bee770d8fa8d6405e4f7a84e90d46eb815c883508c9d8c43b15c8bcd3d08a41f934466 SHA512 5ba0d44db4b9275be265a2fcd6cda3f7a8001c90b2bee335eeca98b6c70c054f39b91b61dcc6a5b80a49c873dd498fb0b27987cee581f07d8d62d54a5ddc310f
 MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.10.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.10.0.ebuild
deleted file mode 100644
index 5e5d4af55cba..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libressl"
-
-DEPEND="
-	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	keepdir /etc/openfortivpn
-}
diff --git a/net-vpn/openfortivpn/openfortivpn-1.11.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.11.0.ebuild
index ceec9d12a8eb..6055fa16e3ca 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.11.0.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.11.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-3-with-openssl-exception openssl"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libressl"
 
 DEPEND="
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 216a83f79e87..f0a3c4b729f0 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -9,8 +9,8 @@ AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6
 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 4588 BLAKE2B c68c2dfb20f51f0a35bfee4209d1f432881544f75b5c538274f195f0b49261d62bfc6ce9e50866617770e01abb79b3d072eb65b7245094d9c02d54c6176ac658 SHA512 d7a71ebf1d3626863cb9e5d9fd30c3bf575074c6397ba286a18ad2e9007eed55b8883f1cb23a079f132f2b19d3b61022ff04f013ee4ae765c27a257b1cc13ed5
-EBUILD openvpn-2.4.6.ebuild 4580 BLAKE2B 1f01dc93f40004ac93b26de1741e52aac8dbc11a1990548311ce64c7ffd8d115456ea7cb86bb369e09e204fb07e11b3c4783eabe261f2124a7829162a8d250d1 SHA512 832b2d213ef9dc75093f1360fbbff93263c40eb14aa6996239dfe8b03a2b7a2350dd321b2e205282d9763ee4da9c7a67850727e5ec05d0d98edf4c827614d0f9
-EBUILD openvpn-2.4.7-r1.ebuild 4626 BLAKE2B 121b30bc325b5564a7ce79d8150113866dd64c7c78dbb89e3ef5bc7ee26178705a2522d4b91916ad568ee4efe2961060770f32028fbcf0810c89c1a763fbdc2b SHA512 96d3d993e57323e9cf01668902d6a5905262819421fe5f06fd82c7bcf3338a9551f6e357a2ba80196b26ff88597fc6a735a1cbecbc8c5952ea47b6861e24d547
-EBUILD openvpn-9999.ebuild 4331 BLAKE2B cdeb6248a8b28fc74cc90317af98ac26a99d23957e9178607908a8e132323034dfcdc2e4061c838e94e5bb7c785dff34a65ce25960600ec74ed1734dabceac46 SHA512 bc4c0b1e3f7aef764001624198f7316fa67476d9cdda3ff2a696b7463d8bdd2f04c66713cb3351a6296f570926c852c1f0f211df1c93f3be491cd7c09bb9f68b
+EBUILD openvpn-2.4.6-r1.ebuild 4587 BLAKE2B b30dd94c1e9f25375ca0cdbb464fefd709e78a43c2c860ad8cfd1912cf3eacfd3d08ce1058384118c32dc34432ac1b84c075d45240644dd5431d2ef52f267a6b SHA512 73f978a79b886d3c32d7500ee55909ec30a1c27939c357fee2b69f62cfac9bcd52425a970d66d6b8136621748c37a221516fbff56922e0d28b66e57217004d3e
+EBUILD openvpn-2.4.6.ebuild 4579 BLAKE2B 5ff104a78f994c99516b0770d1ca79cee4bd867fb6aa529afeae847f4ded5148a4ee8a3af0648d17647656db3b32ff3dc018c1a82092995a553b4da0f266dde1 SHA512 0930bed3eeccabf2e5a9a324354f8dbe54e59945d9b87fb2b62e9483553ed149673ac8c025af5417c7991a84bbe41e54ae9ee17cbc0b6cc0a2c3c979bba8e968
+EBUILD openvpn-2.4.7-r1.ebuild 4627 BLAKE2B aabe4ccc825dcf9988c0a0d4fb095e4eac6f6161dea4d83fedc0d86d6e05279b478dff548a2a20194fe23219024579f590d51daa619121894c65e05843912c50 SHA512 726a02b2d6de9e3a4040471716be4f122f639389ac426b74d46e99cd032c6ca815e2c0bc0110a157d16c94a22aef24ca35631f3aaa75c196fe82e4b92b24367c
+EBUILD openvpn-9999.ebuild 4332 BLAKE2B 707974b7705fa74520b8dd5807a1b9e9e9667e62583e9ffdc652a7ac179104e2b39112f118c10f90058ace4cdb6619dffa6205a4a31c107c4d4e7c6f5d5957f1 SHA512 f35f3204f022dc55ed6ea2d5414f97e7d690b1a4c31ad8d3a1d1265652d2dc0c75f5efbff7227f6021f5600336e5e8000c90782817c62d68e9e83990437d92cf
 MISC metadata.xml 998 BLAKE2B 800c147b67d26d0ae3856c3aebfd7bec9326aaa67ffcb16b57e00ad722b8154bcd4cd6daef741ebb0f12032ef986e0b3b5a4cf99014df1fbd54699a98ed13a0c SHA512 d7e07e98986611dc410a3ab1b0bf2bb3925fcc9f3388c9649ce7a01baa2fa076d7766b4e1b9749048aa1d1850cb9053e8822ce7a1870002805c176c6a60e6db8
diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
index 8f487942c24e..0c785a1bb8e7 100644
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.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=6
@@ -52,7 +52,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.4.5-libressl-macro-fix.patch"
 )
 
-pkg_setup()  {
+pkg_setup() {
 	linux-info_pkg_setup
 }
 
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index d8f71e2ee717..90fc9bfde654 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.4.5-libressl-macro-fix.patch"
 )
 
-pkg_setup()  {
+pkg_setup() {
 	linux-info_pkg_setup
 }
 
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index e4427e554f78..437d41a2b489 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -34,7 +34,7 @@ CDEPEND="
 			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
-		mbedtls? ( net-libs/mbedtls )
+		mbedtls? ( net-libs/mbedtls:= )
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
@@ -53,7 +53,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-libressl.patch"
 )
 
-pkg_setup()  {
+pkg_setup() {
 	linux-info_pkg_setup
 }
 
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index b2305248d442..bd0472901623 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-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=6
@@ -34,7 +34,7 @@ CDEPEND="
 			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
-		mbedtls? ( net-libs/mbedtls )
+		mbedtls? ( net-libs/mbedtls:= )
 	)
 	lz4? ( app-arch/lz4 )
 	lzo? ( >=dev-libs/lzo-1.07 )
@@ -51,7 +51,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.5-external-cmocka.patch"
 )
 
-pkg_setup()  {
+pkg_setup() {
 	linux-info_pkg_setup
 }
 
diff --git a/net-vpn/pptpd/Manifest b/net-vpn/pptpd/Manifest
index cda4915a9928..4b6919d95516 100644
--- a/net-vpn/pptpd/Manifest
+++ b/net-vpn/pptpd/Manifest
@@ -4,5 +4,5 @@ AUX pptpd-1.4.0-sandbox-fix.patch 528 BLAKE2B 1b784cbf9eb1699a5c8e31a6ebb64035e9
 AUX pptpd-confd 131 BLAKE2B b1cf43035bb96859e3f69ad2ba8d161fd5e7c98370f407767a74ec9e87fd3187ec127155171bebf3e0655d076d2edb640993ec4445672abb40a9d87fb5a6b008 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488
 AUX pptpd-init-r2 325 BLAKE2B 492d4a17910fd45475337376570e23b2193f0b5471e82a575465eb139a9cf0f9296388962e3dc2584784a4be6aac17edf4da67410ca422498a2f3c39c9baba43 SHA512 5eb0839310b6897aeb5ef067f3bbccc3f302f9d5375fea9c2cf405a6e823560a776a96fa0189b4c9adf1744651a35a41d4fcafc3f9e1ebf5ddeb5d88bece9678
 DIST pptpd-1.4.0.tar.gz 252167 BLAKE2B c7fa9397c0a1b7c1ae5f22f9d7f85ba1bb60966984506f7b7c7b4f5dce69efa717f41e8d9a717e4c6f482d2d3e4052611709e0b825a2fcc63fabf19a53a550f0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484
-EBUILD pptpd-1.4.0-r2.ebuild 1933 BLAKE2B 3451439b708386b5944a3d400dd455e0e9c18963ef7361d4efe4aa661160feb16f798a3f0b404f09f3fc17273e4ea813e87c6bad011da97b7d4d8a3c48829ba7 SHA512 99b015ec0e9e06a7d61a1ec2085419a85521713575fd40033a315fc66b7dd1b9535329129de760892517e7294526dc3abf46d631209bfd5dacc7d10e9226abbe
+EBUILD pptpd-1.4.0-r2.ebuild 1932 BLAKE2B a1c098d914e159bfdde32613494d548039d7650e225851b7c5d534bf0d89b963ba19dd934d3632dd27d6a493da234cd7910876e81c50d4630c208a6e808fe8d7 SHA512 59df94fe86dcac6da782a134ae3af54958fbbd6887bdfddeae3b4982f9fc6e754635343128c221823550ab1c6e777f3305e07a2e8bcf38f2927cab193bc64ba3
 MISC metadata.xml 468 BLAKE2B e988e5026cb8d530a6930e69359587600af78e252ac37a2a7088d43f92c2241c8e3e67a33d79c5213747cf88d1264045ec4c7783a2929a732571b89c9c40f97e SHA512 bc1558cbea7a1a7157bb339f1285e141607182f21c53fa5f7da35a9ce43c12d508650f9f75058a2e1514ae67f3fe60ee77d8e99463b18e4bd108d3e8c9b6d4d5
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
index 1c96302f40d5..81d148bcf80d 100644
--- a/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
@@ -62,7 +62,7 @@ src_compile() {
 	emake COPTS="${CFLAGS}"
 }
 
-src_install () {
+src_install() {
 	default
 
 	insinto /etc
diff --git a/net-vpn/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest
new file mode 100644
index 000000000000..e0670489c15a
--- /dev/null
+++ b/net-vpn/protonvpn-cli/Manifest
@@ -0,0 +1,3 @@
+DIST protonvpn-cli-2.2.0.tar.gz 42694 BLAKE2B fb32401580090401cd6c2c3c692313992c62ed24b383c88e006f69f99a6b96e7081d6927778817245c604cb978b2157e88288ab5236211297258b02dc63a197a SHA512 9ff188ddba679187cf69ab2a18023bd030ff8e734cc5f8516cd93490e601cf21482573b2ab0b7586e371c1f83955db1ad66fa98203f3abdf848a0755484c079e
+EBUILD protonvpn-cli-2.2.0.ebuild 717 BLAKE2B f271545fd78cb810a52c500c852fab8965f2c559d6243f2bc4ee21d513be6c63fc0baecf0132d859c079d78f93ab803e3ff952fbf2bb211e998025095b8bc339 SHA512 6e3b3c46cf78deb803a7219fc64e1d07138fec166b27df5f3dd533f4b2be1ad4945c1620bd580e75ffec19d40bc775b5b74b9f4e3b24398085da0866eee970a0
+MISC metadata.xml 336 BLAKE2B bc23b58762a67e72e5a2080f20154f6e6b12903b856cfcc3cdc105246b66c41fc39dcec3d97267724f494cef84b7ae7ec446f2a4b8ee9ee0283abf5d7ceaf826 SHA512 ada3c3038cb84a38a4e2a0ae9371a19242f8d250297855769bbe1eeea05b5000415b946b963fd0fa8a12524caee5fe334ede05dd88ee024708755b5401dd5a16
diff --git a/net-vpn/protonvpn-cli/metadata.xml b/net-vpn/protonvpn-cli/metadata.xml
new file mode 100644
index 000000000000..6ad1720cb5cd
--- /dev/null
+++ b/net-vpn/protonvpn-cli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ilmostro7@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.0.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.0.ebuild
new file mode 100644
index 000000000000..d1f445f5b0e2
--- /dev/null
+++ b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A VPN command-line tool from protonvpn - python rewrite"
+HOMEPAGE="https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng"
+SRC_URI="https://github.com/ProtonVPN/${PN}-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/pythondialog:0[${PYTHON_USEDEP}]
+	net-vpn/openvpn"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+DOCS=( CHANGELOG.md README.md USAGE.md )
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index f7bb92d26530..0cc1777affef 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,6 +1,7 @@
 AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
+AUX strongswan-5.8.2-gcc-10.patch 1276 BLAKE2B 217fdbc9f858ce01ca13ccc3572d3ea7eae2d059ec6979e5263b919cee6da3eef2681a413265a1b78a267840d06341531d3676b9f5aa58717b577e976beeff5c SHA512 3762446b8bb0acce29882172afb826cc52be94187f28cbdb125be53a7b3c0f1229c1069194be7d96d7315ad056021d9271fe9f8b1d68980df6bc97ddc3d84aa7
 DIST strongswan-5.8.1.tar.bz2 4517921 BLAKE2B 07a82309515a054b267a063fc0e2f49fd03d16b221b1ee26a33c8d367df140797320e1ef7007a39074e40c472022d941656b3ae93d2eb860152cdc5a5d3dbc8a SHA512 630d24643b3d61e931bb25cdd083ad3c55f92fe41f3fcd3198012eee486fb3b1a16dc3f80936162afb7da9e471d45d92b7d183a00153a558babb2a79e5f6813f
 DIST strongswan-5.8.2.tar.bz2 4533402 BLAKE2B edbfa8dbe1ac00c140cfe9e906ac7aa1b6f3ddfd528dec84e7b1799e5ecdd0f6114679168ebcff9185c8abae78b46dfc43ddc4dabecd44f720285bd175d7a249 SHA512 423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d
 EBUILD strongswan-5.8.1.ebuild 9507 BLAKE2B 3912bd097b1c8f7d5b5aed00ff9396b2863ae3165f9f656e4dd6f0793f9b02d321115f23ad3c21558d6b2be13ebd6f14d28513209a703c61870b528cde566ec3 SHA512 17b8df9b5eab7c26425208e3d14d1b2596f3373d88314337cc2d397da574665d94bdca61a35ed6a143e5bc807f4b5514f7066841802a328b18f693c28e434fb9
-EBUILD strongswan-5.8.2.ebuild 9511 BLAKE2B f37d1e5df9fe27fd642cdcceab53d5f39a425f33cf1ea8c599845528f3539a0ab844386b82f5adeaef7003820423e708d967dd9a2335972a2af09afacb3d8b36 SHA512 6be26d31dcd7e9563116cf3d7e4298c82ce84ec2e53ef6358dcd408fbd09141861d6436322a4fbf6c6d855a2fe613c048e45dac50b0e46f0e35265638e381801
+EBUILD strongswan-5.8.2.ebuild 9554 BLAKE2B 973ba926d32ac8d506925b2cabc0bc131571a4dd49627420bf0b8a528fedad36e2d734db07d66a5e0a24cf01a262398988b1854ad56c494e803622a66be16cb7 SHA512 f1b8267dfd94967a10d159a04c8aa9e1f558be69c30d6f6ce851845b25f6e87e0f788b079409ac2efdad1311b8d4ae7472ef6a9bb09a7fe1fe66a6ef4e16ad52
 MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/files/strongswan-5.8.2-gcc-10.patch b/net-vpn/strongswan/files/strongswan-5.8.2-gcc-10.patch
new file mode 100644
index 000000000000..a7be11729c7f
--- /dev/null
+++ b/net-vpn/strongswan/files/strongswan-5.8.2-gcc-10.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/706408
+https://github.com/strongswan/strongswan/pull/163
+
+From a1f73a67aed56628c4655caa1ae50a6a2e4ec639 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 26 Jan 2020 11:03:27 +0000
+Subject: [PATCH] swanctl: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+libtool: link: gcc ... -o .libs/swanctl ...
+ld: commands/load_authorities.o:strongswan/src/swanctl/./swanctl.h:33:
+  multiple definition of `swanctl_dir'; commands/load_all.o:strongswan/src/swanctl/./swanctl.h:33: first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/706408
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/swanctl/swanctl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/swanctl/swanctl.h
++++ b/src/swanctl/swanctl.h
+@@ -30,7 +30,7 @@
+ /**
+  * Base directory for credentials and config
+  */
+-char *swanctl_dir;
++extern char *swanctl_dir;
+ 
+ /**
+  * Configuration file for connections, etc.
+-- 
+2.25.0
+
diff --git a/net-vpn/strongswan/strongswan-5.8.2.ebuild b/net-vpn/strongswan/strongswan-5.8.2.ebuild
index 2ab3a0ed5d3a..bfcd20769ca0 100644
--- a/net-vpn/strongswan/strongswan-5.8.2.ebuild
+++ b/net-vpn/strongswan/strongswan-5.8.2.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"
@@ -45,6 +45,8 @@ RDEPEND="${COMMON_DEPEND}
 	!net-vpn/libreswan
 	selinux? ( sec-policy/selinux-ipsec )"
 
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
 UGID="ipsec"
 
 pkg_setup() {
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 8641f3c7a26f..b783f41a3975 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -12,5 +12,5 @@ DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc10
 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
 EBUILD tinc-1.0.35-r2.ebuild 1349 BLAKE2B a082f910398173e5956af8fa52782557a263ca1877a7ea710afe0f11f1b82830e851efbf735d92e2e67b267d3bbe85ffb64c28337a59685f41b4355b955f842b SHA512 f765a2da03b5526bdef70fdb50c7efddc0b27d978b97526cb3e0048f1570c9a69ec8376768f462b8d79769eb1185b13b6b42881796471ccafbec246fae2ba41e
 EBUILD tinc-1.0.36.ebuild 1064 BLAKE2B d0f3f10c386ea9549d55c9b9bca434892ee16ceecc9b035e7e1f890c37198add7556ab5935743ae67b8d8437d0f559bc369ef8058d1d835e84dc123b95aba078 SHA512 a490dab876713a817d4bb32cdbdc8a4651bb26f1c96fc7e61ae7666d632430a22e29ea43778d9351051f9b21cbb7255e5cf029311dcad7fb4e537415dbc07db8
-EBUILD tinc-1.1_pre17.ebuild 2417 BLAKE2B fcbfdddaf5c5e80b9af691bc62e0dd59b297fdcedabe8258edc524306f34e1a1a317bb2e2ef13b6e28f053a5c87f683e99eaa74a7439feb653474ceb80abbff5 SHA512 47f0247a1f47c4cd14f6d9d014b33470276f67a0dcee0d7e81d3fec8d0fe48c2db6c8f6a633a87c108c7e399887fba5d2a6d1afc9304796bc6bd63302c4bb71b
+EBUILD tinc-1.1_pre17-r1.ebuild 2290 BLAKE2B 22fc027a87502a50c2e3b616661ff57d61c1c77310e96ad9e57d9d2fa2720b738228b2c292167f13f91518d81fa2526bbd8f9bb99221323f77d2212fbb913919 SHA512 2f4df288a4347ffe4696a61b23389d97d65283ab712d8ae1233a45bafa15ee59da585030a9d4b9ff2d9f41738ae1ce954835540ad44d0bc876ac0d1a5e8f81a8
 MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
diff --git a/net-vpn/tinc/tinc-1.1_pre17.ebuild b/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
index 6eb358d55d46..a98a080d9e83 100644
--- a/net-vpn/tinc/tinc-1.1_pre17.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre17-r1.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
@@ -6,9 +6,7 @@ EAPI=7
 MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
+inherit autotools systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
@@ -25,10 +23,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-	${PYTHON_DEPS}
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -66,7 +62,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--enable-jumbograms \
-		--disable-silent-rules \
 		--enable-legacy-protocol \
 		--disable-tunemu  \
 		--with-systemd="$(systemd_get_systemunitdir)" \