gentoo resync : 03.03.2021

21 files changed, 448 insertions, 164 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 01ba8df014fb..c33be2bd8dd3 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/badvpn/Manifest b/net-vpn/badvpn/Manifest
index ba6cd8eefbf6..a2555d1874ff 100644
--- a/net-vpn/badvpn/Manifest
+++ b/net-vpn/badvpn/Manifest
@@ -1,6 +1,5 @@
 AUX badvpn-1.999.127-ncd.init 592 BLAKE2B b38f17eafc225f57808493e330441d58cf0028b482f2790e086d30ad8ef92c5c09740a9e1b9b76b420c0ebc0d72cc80e46e41f1f3d95bd17884b1fdcbcab8264 SHA512 d82803b5042c0f450c20023be601860e751ef5d32d0174cb71c903e4d57ebab14e36cdbe7a268e322cd88e49824071659703f71e0e5fa92f0f70ce8c1412ef05
 AUX badvpn-ncd.conf 182 BLAKE2B ad8e285d0b423e09db3495a42e0d98fc043c3f54d3d5158b6df4f5ba834ed674c813075995db80e9949cc3038f20393cd465ccadf04547a76cff3cbb554224d2 SHA512 4b113e3630de4b679d3c74cd4154d0353c6ea8791a77b302c867f5007e889502cf4e6bd1c45d6151e1ea6843bc13ac3e6458790eb4e646daf17d0126b996492f
-AUX badvpn-ncd.init 1146 BLAKE2B b75f582d7402ee2f586438c58240b290f156153ffdfa4b3dd7e91634a591b77ad95a48757f9333792ab4087d552c70f9a48a6af4ee1baa932050aaa8963de8ba SHA512 5bed2372af376241f86037baba383ba7ac28aabe7b05d791345c69fbc23df453a4caca8d9680e3f16c9352c537b369dd04d73234aed4ee711af7d66d1a076ddd
 AUX badvpn-ncd.service 266 BLAKE2B 70faf47cab74ccd6201cfb94bbf275d701f9f856490753b7a6a95e2a7ab0dcb5fe282d6cb0e5cb8bfff86d091cf660f30057bc2c9809f202bc92e7b9982d8711 SHA512 5087d35a4d8c0d17202fe71d2bd2c881292720b550811d99d711623307e32515938464cb885be6c02a784cfc24311aef0b76576fbffeeadcad9b59c3a05e3fc9
 AUX badvpn-server.conf 227 BLAKE2B 5a3e070d3b875563ba20782ac325cfd76760082c6c217f0e3d606c2ba6b37fb731f03c082af9dd3cff852657a8ca4327e3fe3893e3c21a47a47354eb65592542 SHA512 c5628f1380434884d297846a1c49a31f369a17f97ab9914a741cfde9a21df52926b247c0b9544605c2438f47110c9f548b9161c5975be91e70dacfdf993839c8
 AUX badvpn-server.init 1136 BLAKE2B 37d255f56fb1aeb84b63ee22b82c8b7810bb0acbc7c60654060748e6ec1d9d949f40d712c24a5ff30627c053e72abf7b6ed472d3a653b1f81a0c2e4d43829473 SHA512 12326aa9ee4966786bb49dcc8184bceefaa0c02bf4ed00ca6437d58b64178762b75ec137846401493ca8a8d0cee313339915df49e44870bc9745176ca9edffd5
@@ -8,6 +7,6 @@ DIST badvpn-1.999.127.tar.bz2 962224 BLAKE2B c0fc22aa56f59d9273797df9a1687509d15
 DIST badvpn-1.999.129.tar.gz 1327123 BLAKE2B 640b4bc3252d0aadaf9a8ce42da7bbead7c0d371a1f536e994a4d26897d8fbee9a0c9738b31b1ce308b3b08b6a661d9dad0ea012ff08ec6349ee67063e402084 SHA512 7a305198d7b4aaa31e567ff1f1bf23e0a65070d8eae78e7ed6be1a3a3b7bce7fcba32c0eb8ae549ef1851a61675afc1770f52dedf131658036b7b6414fdd4e4e
 DIST badvpn-1.999.130.tar.gz 1340372 BLAKE2B d13d5fdda487418ba8d93ba49736f2b68c1b5054636b5cf9120f32f6de5b9d0240502d68824a194c18074b5de86227ad6412c969d91b0ff1ee0ff016bb4c1fb4 SHA512 958d6f3b7a8074fa7ba2f26812c9b2c39272b75d762a12a821ad2d0db9cdc9b9307338d77ca0dcadcf57b81fa4632362e67524de4246d01829951e8924a89770
 EBUILD badvpn-1.999.127.ebuild 1934 BLAKE2B 4eaa7ab82ec068138606fcc876b15869c8b211aae6b6e9f3fce2827c8f619298670e93164efd847df2b6b3343d16d6445ff940659cba3007746953acf13b5f14 SHA512 5385fa40849092fa11b90ce503bdbe1f2cc175a7e7dc993f35bc683d1c83f057025092fc224c92304631884e0bfca407a00aa4dc5c1d7ee55c5175b511fb2ecd
-EBUILD badvpn-1.999.129.ebuild 2000 BLAKE2B 3285e06320b50827a80e36c6abc97bc7ffc9547fb857b8814871768b64f3e2c5d211bd2201627f532fc12be347ca3fe04770a24b69195a19c39f91a33309b59b SHA512 8c81d8708059bb1717edb69d0d2fae782e672b8e769e392a7fe262d2f4395a7f28ae420979e8493482d68280a6477552e5815a029ffb4c71a928fbd242354e1e
+EBUILD badvpn-1.999.129.ebuild 1996 BLAKE2B 8f3fffa076ef1c6d79412873b3989e06b9dacb786cf71e1bd4b7e3469d23fe6c4c4125395070132703b1087424a68feabb781e400edb445f9ec74269230b62e3 SHA512 8abbfc3d4612fce789387555c808f53c9a95db4ec91746cf0681eee556832a50d87ac9e595968ba52c64d1489ba5212a3778e4364c052e19a3635864357f58d3
 EBUILD badvpn-1.999.130.ebuild 1976 BLAKE2B fca6b518a9a4f8cd61a89da6541ec1211f48fa9b722d31edc2e90ce5340384ad080c78994642303759d217ec68c29383315080ba605d28c44f9d2a160eb0b090 SHA512 ba1c2e0362eaa4aec4b9b4f2cf782d5a5bca50c821cd95c2b6e7077390459bb047f5d59f31b0fcfc752d4a15d5327dd2dc68d23c24f14e7a90c587f3571d6548
 MISC metadata.xml 1728 BLAKE2B 4ba1c50234447e72c340aa8bbd67ec8bd9b5c53f970faecc9473e9e7b790156257590c89df6e78eeed7b7ad42efda154e513baeef48d278291d972a6a74bb929 SHA512 52a2c3b1d9e1f46c71bc151b46d13a6158e0f844228f584a69932fef3370a5407d8e6abaa491a11087802e75e03cb578936abb11c1ece34a0859168ff4e949b7
diff --git a/net-vpn/badvpn/badvpn-1.999.129.ebuild b/net-vpn/badvpn/badvpn-1.999.129.ebuild
index 07ce92beede8..72be95d0304a 100644
--- a/net-vpn/badvpn/badvpn-1.999.129.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/"
 SRC_URI="https://github.com/ambrop72/badvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 SLOT="0"
 TARGETS="+client +ncd +server +tun2socks +udpgw"
 IUSE="${TARGETS} debug"
diff --git a/net-vpn/badvpn/files/badvpn-ncd.init b/net-vpn/badvpn/files/badvpn-ncd.init
deleted file mode 100644
index e408075128a4..000000000000
--- a/net-vpn/badvpn/files/badvpn-ncd.init
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Released under the 3-clause BSD license.
-
-command="${ncd_exec:-"/usr/bin/badvpn-ncd"}"
-command_args="${ncd_args} --config-file ${ncd_config:-/etc/ncd.conf}"
-command_background="YES"
-description="Network Configuration Daemon"
-pidfile="/var/run/${RC_SVCNAME}.pid"
-
-depend() {
-	need localmount
-	after bootmisc
-	before netmount
-	if yesno "${ncd_syslog:-NO}"; then
-		use logger
-	fi
-}
-
-start_pre() {
-	if yesno "${ncd_syslog:-NO}"; then
-		command_args="${command_args}
-			--logger syslog
-		--syslog-ident \"${ncd_syslog_ident:-${RC_SVCNAME}}\""
-	fi
-}
-
-start()
-{
-	[ -n "$command" ] || return 0
-	local _background=
-	ebegin "Starting ${name:-$RC_SVCNAME}"
-	if yesno "${command_background}"; then
-		if [ -z "${pidfile}" ]; then
-			eend 1 "command_background option used but no pidfile specified"
-			return 1
-		fi
-		_background="--background --make-pidfile"
-	fi
-	eval start-stop-daemon --start \
-		--exec $command \
-		${procname:+--name} $procname \
-		${pidfile:+--pidfile} $pidfile \
-		$_background $start_stop_daemon_args \
-		-- $command_args
-	eend $? "Failed to start $RC_SVCNAME"
-	return $?
-}
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 39ed102e89e0..0158fec9fbef 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.33.0.tar.gz 1101578 BLAKE2B d569a7900bda1fecc19f6ec966cd004d04599993193de9bcda89620dff9909889c14165aca457e6a5fa0539614304af11be573329b9a54596684d3232ee28833 SHA512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910
 DIST i2pd-2.34.0.tar.gz 1103199 BLAKE2B 16e16a0e396b22f5de797455a97322e51bc2289e770617106d4daa9a7cd6d1d94d4d84955e182493f3c11dbacd527fbb3f127bd4e2e555a7b04f7eb697213dcb SHA512 74c8234b850159c6e680fa61b20e2c22a0f04ca8397b4aa68f92fa20520fb74a63e442ac75c2fbb17dc1e5a193011b9b38085cee08746de4496620778aa7f027
 DIST i2pd-2.35.0.tar.gz 1105837 BLAKE2B 4480b3b4922d2a51d158366674ad7880b7710d3c2bc45d3e403330d3a8ea04a7803a1a7826b0d60c4f9837e84c2900b9635024846d0fce7d585e30ad658fbd27 SHA512 cffc41484a63eba7c7091957cd4d8b8584bb02580d70c69132f1447018be5b3cde7893ae4a0bcb914d53e95c089d4253ece6e20442c9da7810e7800a2b99b117
-EBUILD i2pd-2.33.0.ebuild 2387 BLAKE2B e196864e0e52c694af51a72573dff6b670ca8babd00fd1bb47ad9ad39be97f7e4f0df16b41b69f3657437bc3074b40f5df76372a8c8aac6cd8b633de32437e4a SHA512 e47b0bb709174825dd6ca3d28e48589a00fc2eeb9a681f9c46aef379996965e2812bca136ffe7ea0e763dd0d6b88e53afa19d7fb2e22890b8e2e0cd35d048f0f
+DIST i2pd-2.36.0.tar.gz 550451 BLAKE2B 28ed24121a241b63d929c225223ebfea994ce993d715393db89199da123050f51a7b056205ed5ef6dd570c3ea51e0c56aead156ec5ebaeea8aef6a23daca9937 SHA512 7a1dc13ea4adddc5777532d5d50a4e7d1a8f8466983d4fc8874a38779723e213da0e09c831998688227317602c7e23b4fee0035367150c5fe3f338c595e872ad
 EBUILD i2pd-2.34.0.ebuild 2387 BLAKE2B e196864e0e52c694af51a72573dff6b670ca8babd00fd1bb47ad9ad39be97f7e4f0df16b41b69f3657437bc3074b40f5df76372a8c8aac6cd8b633de32437e4a SHA512 e47b0bb709174825dd6ca3d28e48589a00fc2eeb9a681f9c46aef379996965e2812bca136ffe7ea0e763dd0d6b88e53afa19d7fb2e22890b8e2e0cd35d048f0f
 EBUILD i2pd-2.35.0.ebuild 2389 BLAKE2B 8086ee44474a9b860277a1dce84e427e52f78f6145254ea2bca27c91b105b4f6655c791ac5dbe9d3041d05b291a6c6837fc85ddcb1c34ec2671373a265069667 SHA512 571b5f8966512c01eec2db167b4da80d45f4dfaae8b4b8f6827933a39a5b2b3a1c9fe2fb81f2d16fa42401953af070e5c062792d896a7f851f53f3f2ceabba17
+EBUILD i2pd-2.36.0.ebuild 2342 BLAKE2B 0bf8d05ce0a35a4586e6ba4b81f10c2d292eb5690166996eacdb4877266566da865bba7690561ee386076a645915d67109d68965d52f727778c583f6f9da2e41 SHA512 0cc7d8749eeabc5e59980978ac4d94f01765956aee09b2fee1a1bfc436e812674296fefa0a9e7a827cb01dc777600c85f44f5f0445d7918412c1fdfb89089825
 MISC metadata.xml 683 BLAKE2B 85b4a13c13c88a69ecbfbb10e60881bc583b6539a42cf4ac8d061537bb6c0ed55dd2d15ced732f69ce46afe4b0381d7d7233fef9ad8dad4a9eb51e49aa904706 SHA512 5c6c84f95f4264eb3a33cc6c0de0f0890063ba2ca3cb56852303f919e1c4a152d7a3b1c593c0ba066e5485ee9e843ffc2836ea89ed8ee42aa56c1b602d5a2a62
diff --git a/net-vpn/i2pd/i2pd-2.33.0.ebuild b/net-vpn/i2pd/i2pd-2.36.0.ebuild
index acc70c57b412..0afeb4fffed2 100644
--- a/net-vpn/i2pd/i2pd-2.33.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,9 @@ CMAKE_USE_DIR="${S}/build"
 
 DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
 
-PATCHES=( "${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
+PATCHES=(
+	"${FILESDIR}/i2pd-2.25.0-lib-path.patch"
+)
 
 pkg_pretend() {
 	if use i2p-hardening && ! tc-is-gcc; then
@@ -47,7 +49,6 @@ pkg_pretend() {
 src_configure() {
 	mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
 		-DWITH_PCH=OFF
 		-DWITH_STATIC=$(usex static ON OFF)
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index ffb721a7acd1..88b9dddec568 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,9 +1,14 @@
 AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d348896883942683682c8ac3b31de56d360460bc2ea2c26f579a6f36078101270167b775579fd2502c72dd680620c12a585 SHA512 a8a391386014cff3b867fb8c0ba8c83ecb93c11d35aea205877b66e3104712311e19f13eb9659ee158833512c199d0104b5a796ebef37a1bc210e254abc6f573
 AUX libreswan-3.32-nss-compat.patch 680 BLAKE2B 5eb1f43e95d2f0801e0725ae1186e96ccf529200b0f1e4c8aa8d6d09248114f45a61468ad88a247a85c2f97b019ab0a022c6ce8a6ed263097c8d42c0008cfa43 SHA512 231b3985f333cc4a6f588b6854a217847136dd67305152dd14be96db8c0d7e043b885c47382276387e44939e26d046753d16853f3f0f17b43f966e3c3213c8e1
+AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f
 DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f5567914a453ab875185110aeda4d33ecdaacfc83e361f153860a1db66faec70e0ad06af65e310af28ae72ce68fc6a SHA512 bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3
 DIST libreswan-4.1.tar.gz 3427012 BLAKE2B 2ec58a53756efd2dc8e6a9e305c1efd1e3b8b1aaa089d783e86cf19d747b99838de451a2f94965981e0e2342d5866c16f36c4cf07e7ab971f3e689f8616c28f6 SHA512 c98dfdf6bff17eda6f028e35653b822941665989e37974266bcc54fda20e05f71b86c1dfee858a8ba9a544f86e9217e8e08fa2dfe03ab011f6c2d039b4ee05fe
+DIST libreswan-4.2.tar.gz 3467095 BLAKE2B 0630e9f7cf7ce6182712b4837688fd6b7a1ad1644f167f7ded4e63c7a0aac960a38d903cefbf0189da22b6ddb8c15f217ff3134f220b64020812789c1a196d29 SHA512 290be2e36fb41959c9889597aad8ab5df1edc1999ed7315e8f2e50213de073732c91ad497a2b5634f7bc83bca84089ef9f711420a77309c6cce243f1419a2d0f
+DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045
 EBUILD libreswan-3.32-r1.ebuild 3165 BLAKE2B c0144e07373f076366d0baeb9c9c2472edc6c07f7fbb6ee37c7865ea37cdf4476e3f3119c51efeb1ac4ba54caad84a14727811387cf6eacd3be9724a5ede7b1d SHA512 1bd84beadae36e45f948b0c902e5ee4058c79a26a7d72b985bda62bfe3267e468f0c6ea970fe73f70e34332a286fe3c8da9f6e8b34b5f3c9d8eb742508b40344
 EBUILD libreswan-3.32.ebuild 3127 BLAKE2B dfd79e648967070d3a2ae7018873647a03d162bf904f4f70fa7d2baf9969d7912407a56869986f0c83675e65e5f27e5622ffccf4c6b1b3bcecb3200472976372 SHA512 5937f4ee0eba31fa8cbfcb477e19e5d2f74b1fafba9be035cdb64e88e80d5bc0acfd6dd995de54e449be6a8ff01a893ad64d578d4eb7b5e72f42f748fc829333
 EBUILD libreswan-4.1-r1.ebuild 3236 BLAKE2B cee2764473852cb447748a71b0294a47bebdb0962109748a089ac471d58a4fce00f4485f0bd7ebb99a10411356945c46aa29d9ca1984bdef0f98fc7bd3995336 SHA512 6f4e7b3df6bd703c4e81950772478de4b73ebc6635307ac304480d1f89e96f99677c86dbdc28f1e063e51eb1305c7ca9c68bbfc852d733efd24ed76b285504b9
 EBUILD libreswan-4.1.ebuild 3169 BLAKE2B 48d18e851be46585a86c2f26068da3bdcc000f79f5f7318a560c7b47c688a0ff6a0be260b453cb503d65189000e6449020d469e534d939a8e937803063a48059 SHA512 e03c9d576ffc51a4c471b2cf8d063221911fbf7cae2434034466a8d85e131d24e375f9fe8457a8a5002923a5b0c3a49ca42f97d307798f415b373225da60580a
+EBUILD libreswan-4.2.ebuild 3235 BLAKE2B ede91ac9228feaa6214ff1dffea92cf16c648b29062a3fefa6e6d3b79959b9f48803083b3ba52a40ce4811885b4aae56d79358ef5f9bc701063a464f187084da SHA512 5e3c1d537cc97237bceb852fdf230b6f1136e8f8ebc83550558920a5c87a029c9cdd26f29e59284ec832997dd2dc1f12d25e9d0b6473e625e3d84b37bf3464e4
+EBUILD libreswan-4.3.ebuild 3235 BLAKE2B ede91ac9228feaa6214ff1dffea92cf16c648b29062a3fefa6e6d3b79959b9f48803083b3ba52a40ce4811885b4aae56d79358ef5f9bc701063a464f187084da SHA512 5e3c1d537cc97237bceb852fdf230b6f1136e8f8ebc83550558920a5c87a029c9cdd26f29e59284ec832997dd2dc1f12d25e9d0b6473e625e3d84b37bf3464e4
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/files/libreswan-4.2-ip-path.patch b/net-vpn/libreswan/files/libreswan-4.2-ip-path.patch
new file mode 100644
index 000000000000..b31071ffcd61
--- /dev/null
+++ b/net-vpn/libreswan/files/libreswan-4.2-ip-path.patch
@@ -0,0 +1,11 @@
+--- a/initsystems/systemd/ipsec.service.in.~1~	2021-02-03 02:36:01.000000000 +0100
++++ b/initsystems/systemd/ipsec.service.in	2021-02-21 07:37:50.841582048 +0100
+@@ -33,7 +33,7 @@
+ # ExecStartPost=@FINALLIBEXECDIR@/portexcludes
+ ExecStop=@FINALLIBEXECDIR@/whack --shutdown
+ # 12 is the exit code of pluto for shutting down "leaving state"
+-ExecStopPost=/bin/bash -c 'if test "$EXIT_STATUS" != "12"; then /sbin/ip xfrm policy flush; /sbin/ip xfrm state flush; fi'
++ExecStopPost=/bin/bash -c 'if test "$EXIT_STATUS" != "12"; then /bin/ip xfrm policy flush; /bin/ip xfrm state flush; fi'
+ ExecStopPost=@FINALSBINDIR@/ipsec --stopnflog
+ ExecReload=@FINALLIBEXECDIR@/whack --listen
+ 
diff --git a/net-vpn/libreswan/libreswan-4.2.ebuild b/net-vpn/libreswan/libreswan-4.2.ebuild
new file mode 100644
index 000000000000..a9a0951d564c
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_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
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/libreswan/libreswan-4.3.ebuild b/net-vpn/libreswan/libreswan-4.3.ebuild
new file mode 100644
index 000000000000..a9a0951d564c
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_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
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest
index f11078931757..a93a2546bd42 100644
--- a/net-vpn/protonvpn-cli/Manifest
+++ b/net-vpn/protonvpn-cli/Manifest
@@ -1,5 +1,7 @@
 DIST protonvpn-cli-2.2.2.tar.gz 42989 BLAKE2B 4d96d193405a30e53b9a1204facfb797c946039ca093b7e5af69443e75d3e0e98d541956c9a54ddc5a6917c0d62f512ee0740c3d893b0779290ccef4b6276206 SHA512 892aad9e509eef978bb3d4c044f00f04d87ce35cb3d5c3a69129b7a99d50a46af84c9931d6d7249690ef60d7ea63ff01e09c4dd24c0a57eb8497bfc1371bd2d7
 DIST protonvpn-cli-2.2.4.tar.gz 640297 BLAKE2B a45642448e541d4c19a052480cdd0de2d9163a092cff36d3971f5b1c13d49fc0f23445e17ca71435b7aac5bb83efc17ec1f2dff19f481d552e81baec69228163 SHA512 8bdf7b0d13ea7c2c6172dde43d8008905e36792247a6c281dd1accf2b394f8117b50d18cba8652962984cf9c7e422cc4378b2c8fc57c24d0da353ca0a93a4f5b
+DIST protonvpn-cli-2.2.6.tar.gz 640528 BLAKE2B 546fbea204b9809035dae7c8e29094ad09ab70aea7eeb3e80c5c554c642a48d2823ff9aef04a5253ded9d131e560e5216d4f3985abd8f55d0a1a453760aaa296 SHA512 553cc6fa1ddadb50318b4430de6fb743d44078ca0b64b8c3ef86ed43d5b274fc527d0dd94eee882157dc7823611d305047df62ba8ea1c415affc5a0abf581ed3
 EBUILD protonvpn-cli-2.2.2.ebuild 721 BLAKE2B c80defd0642df86b32b2bd6b9173d5d875542faf44070637c1e55c0466fa067c6aa0f799f11db8e381fa523838780b0c39871f463de275dac678f7b9946547a3 SHA512 066577b0fb8e0f5dc014567a57d86ea8498d3ca0e80abfc4f5a02ae4c241b7bd41eacdad3c53d5ed622fcbef4ada3de9ab56e758250b494f43f05320f7fcf257
 EBUILD protonvpn-cli-2.2.4.ebuild 723 BLAKE2B daadf729bddb3dc0d5ab755d39040a828a93531a3677d1357a6fec4c61815e8f4823f11502d0699ea0ec89237c9cc0c52505cd898aac24b053acbcf79805cd59 SHA512 38275a7a0331aea7d20135d722aaa512f6a1f425f0c7ad4b4c033760cfeab459e5c5d2cc699b2fbe864ae3bd8a530bb15348e81a5f59bb433deb2f78b556bc0d
+EBUILD protonvpn-cli-2.2.6.ebuild 725 BLAKE2B 1f8954c156b802ab37bc6abb0222688cf5f225dbfc2e87d3e965a2b236951f8ca7321995712dd80252a01665446357cf4566767552e22fa15621c0398d6a5a24 SHA512 97b62a78bef8ad5ffbfae05a8bf10d6eecbc1b174d9bf4710e7d7917aef6a1bc94b818a59483affc4e0aacd6e04b5efb0576f9a151dae1961df310752d1ddaa8
 MISC metadata.xml 336 BLAKE2B bc23b58762a67e72e5a2080f20154f6e6b12903b856cfcc3cdc105246b66c41fc39dcec3d97267724f494cef84b7ae7ec446f2a4b8ee9ee0283abf5d7ceaf826 SHA512 ada3c3038cb84a38a4e2a0ae9371a19242f8d250297855769bbe1eeea05b5000415b946b963fd0fa8a12524caee5fe334ede05dd88ee024708755b5401dd5a16
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
new file mode 100644
index 000000000000..94370134e8e6
--- /dev/null
+++ b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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/linux-cli/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}/linux-cli-${PV}"
+
+DOCS=( CHANGELOG.md README.md USAGE.md )
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 1a21ad2b56be..2ae629f80a63 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,14 +1,15 @@
 AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd6bee43755be89d52c970cbf7e5aae62c0adfb33ff7ad072578b88a40857bffb359a3d2c8571947 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660
 AUX tor-0.2.7.4-torrc.sample.patch 1341 BLAKE2B c6b398d6fd417e9029196046529109ed52c7c5dd6bd38505261116e15d1516a6e200583b480fe50b6e971d2ab4336673f9e75effa9dc8d3858c6248fbe31a69b SHA512 4a6b855734717416b6615fbd76bb75a54731767a74d3ade8c58fe52f4a42ee51c93ff8d591943343f319018e18d65b768bbe8fe936200ad829ab1e262c5e9b0f
 AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e9114c69ba738a5849e28b886cb7326bb4f0e8b40861407f40ca21988ac188280a4eb8031cba699eda63e66b968013a9796713a5468 SHA512 ef4023423cd96c85106d0dcd3f381ffa1adcfab8c4ae49046c3dc4a45c61401e0db205483144421f620279f6a989c821c581f202561e5c24da7ccdc61a267521
+AUX tor-0.4.5.5_rc1-LDFLAGS-typo.patch 1442 BLAKE2B 611f74b92cb4eac81847684346026952b395552cd5541bf55d929b67893f23f8aa9ea99eaf79304d42eaf3f78b88464ec904258ad818736b1b4e50464a449396 SHA512 9cda0e29dfef5a1a6704a28daad93ed65c0deb4bd64ba6811311a986d2bced84591003d15daf128a94fe68d7977edcbcf90267d1fa4cfa1fee3881c8e54f60ce
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.4.6.tar.gz 7806477 BLAKE2B 8eb5f22825193a61be42105ad32bd82e662c1859971fb2248fe05da2f80d1a3a9cbc96ee4f47f4127da56c328f5c60a6f57d5641cfa90b79becc8bf622f56f3f SHA512 84f981bed6d8c89d3de437e35dd2ad2ca3ee5efd7ce6b78e3e00bf40f644f495b960a7a741be5dd7ba096d73d5f941974722a44e9d3ef4fbcd02b20274d565fb
 DIST tor-0.4.4.7.tar.gz 7812645 BLAKE2B 8e35c56c0dc94c01de556ae3a02e2d465776dbe9cb2db35d4513dbe83b5e3b0b3641570ddeee1f43aedc34edba245591d4457debc13fa43111780cd4cff739f2 SHA512 356e9569eb79d81bccba1360d10af7d78f3824d5a4827fc95272a952fc8e5bebdfa9ec99fa82992c025625d6da963c15803acbabd66cd59c587c1e042af16acc
-DIST tor-0.4.5.5-rc.tar.gz 7918239 BLAKE2B 8db4d4edbfa8a3298bd5269dfa6c38797cb217a6e5e1bffbee7a007847f8ea0c2fa87dc9343597af500fb9a51dacc7685d66a309b7bdffaabcdf271018b3bc84 SHA512 e7ca955387a7e985488d9af8a51703251af990e7fe790377caa8e349b48ccc6286e73fdb2f042d74323af2f9a82ecf3766adf3c2dd499bfc46d7ad7f578815a8
+DIST tor-0.4.5.6.tar.gz 7926711 BLAKE2B fe7e2c0020f4c2bbfbcbdfb666413d19e4b58ec90c4e44324ab0e2a96871a4ce2ccf63cffaaa229f6d91948babde83c3ebd4600ebfd6c63694f2afde9ccff21c SHA512 3759657a997f4aabdfef6ad3f5da16085a1dd3353015db8283a21fcb1d658ca390bc3c36387a89c99baf2069c6e1d392a1fef4b3eba24ee1f2b408acbc103f9d
 EBUILD tor-0.4.4.6.ebuild 2396 BLAKE2B 222e94672d20bc9b073b668a84ee446c9c2ea3161da990e2599119046d3586c1e781f75f4f8617c2f224072c3f8b50ff8b4fd3a6529535eceff072cbd12d4104 SHA512 d5e477251f5d13f48c4f46adebde4c24ebb89fb80547ee1719f534fa091f65f3444da25d4ebd717e24b37fe63387d5ea3af261949822482f45bb8b2205ac84aa
 EBUILD tor-0.4.4.7.ebuild 2402 BLAKE2B 73413ad692d0c74f51000ee1d52805046c116646741effc3cf86ee06347a671647e26142b0a5b0ae54196022e752fc125ab2d1b52b96db31750fdf5bdd82dd30 SHA512 64a6bea16d866f27d3b229463532a4f16864f16f41e7e2f750f6a0079fa24594b0f3d1b0834c6a8a09c85260f26d70a54f45bfc3b0e8d7710a1f60bd66af7ef5
-EBUILD tor-0.4.5.5_rc.ebuild 2347 BLAKE2B 748c868fe10e2ba502f88fb2ed607c19334ce0d7a6b97e0e76ce52a6e51fcf9169bc6ccc3f6a06ba02f4a4011fc64525fe61ae95c0680eb21fddca0b945d7ae8 SHA512 6df906de9f7865ac6498f6d8aae0f6997b4c55310af0c8f47abb8f8ce8076670e14b174a3cb13b652b1b896dd2cde51482789c90e5bbf37f26e88e4b816faf98
-MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
+EBUILD tor-0.4.5.6.ebuild 2399 BLAKE2B 9c3d5b4a9545fe446b86dade86033786b52d4247e62a1fecc6940c65bf0c1e35a1ff18f0db365d6aa57e2197073b1299010d369270b0f9a4cee5e9b18b3ccd0a SHA512 da8647bd7867fc2034ccc0b133cd6bce1b5540c47c9032a133a24177e95340f3827ece6e803feafd58bd9fde486d6f9fd355f074c62cae2832e777a5cb17435d
+MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch b/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
new file mode 100644
index 000000000000..31234c735bc4
--- /dev/null
+++ b/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/770370
+diff --git a/src/app/include.am b/src/app/include.am
+index 8bb315fff1..2e2180deca 100644
+--- a/src/app/include.am
++++ b/src/app/include.am
+@@ -28,7 +28,7 @@ src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES)
+ src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+ src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+ src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
+-	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
++	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
+ src_app_tor_cov_LDADD = src/test/libtor-testing.a \
+ 	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
+ 	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
+diff --git a/Makefile.in b/Makefile.in
+index 8e29bf3..5c9d3e5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6674,7 +6674,7 @@ src_app_tor_LDADD = libtor.a \
+ @COVERAGE_ENABLED_TRUE@src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
+ @COVERAGE_ENABLED_TRUE@src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+ @COVERAGE_ENABLED_TRUE@src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
+-@COVERAGE_ENABLED_TRUE@	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
++@COVERAGE_ENABLED_TRUE@	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
+ 
+ @COVERAGE_ENABLED_TRUE@src_app_tor_cov_LDADD = src/test/libtor-testing.a \
+ @COVERAGE_ENABLED_TRUE@	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml
index 5d6719bc9a3e..2d48f019f6b3 100644
--- a/net-vpn/tor/metadata.xml
+++ b/net-vpn/tor/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name="man">Build and install man pages</flag>
 		<flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag>
 		<flag name="server">Enable tor's relay module so it can operate as a relay/bridge/authority</flag>
 		<flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag>
diff --git a/net-vpn/tor/tor-0.4.5.5_rc.ebuild b/net-vpn/tor/tor-0.4.5.6.ebuild
index 63ea086b109c..c9dce6ad8633 100644
--- a/net-vpn/tor/tor-0.4.5.5_rc.ebuild
+++ b/net-vpn/tor/tor-0.4.5.6.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.patch
 )
 
 DOCS=()
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index 2f7735138335..01a97ff020ec 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,5 +1,3 @@
-DIST wireguard-linux-compat-1.0.20201221.tar.xz 262596 BLAKE2B fffd0f3a5501aa5ad0e52f3210edf507b0db63230d59b3204104584cc2b1d739311262a0e0180ce5cd5d6e74c5228d01a631fdbba8be9788bda2d80df8cfcbd0 SHA512 1b06eeda525903661657cae4f462cf2ef464bce292b0a9ae37425d254142ed4137ca7a2296da0f11447f89a4d921c3cb7cee018a4f691131541f0ec32f99c458
-DIST wireguard-linux-compat-1.0.20210124.tar.xz 262500 BLAKE2B 3ba5de204040abf2c2049b4223f6adcf0c24ef85bcc10702e5f8e40e751dbc6c8d217ac4d1534f407a7cf5f078bbb2e9a82862043c7979cc69a45e33d6e0cfb6 SHA512 4438391eb6a6a1526cbb9b7eb7b8f8b2999bf425d5fca028f1a412d93bffaa6107be133d673e68add6eeeb86201aa080228706de2af00e69c0ac88ccb127e56e
-EBUILD wireguard-modules-1.0.20201221.ebuild 3471 BLAKE2B 9c49d59f13b7c8a6e4260e8a9696af455bdd26113c016cad92c57d08aba7d4ef7b2e3f626eb1c612ecdb3a2455e07c13b153992380a7f1f874fbb61ba3cfc0bd SHA512 7d0d4e11e30e2ba19f5116d79cdaacb542c42884f1ccefdd2c3516645609452cd066785c22f86e705eb4ea76052fd7d3f8a2426869c8d4f8a65200d781a82f05
-EBUILD wireguard-modules-1.0.20210124.ebuild 3473 BLAKE2B c72bac7a93da6bb4026198b1269c8b2c874f18be8be33c6f1e75c6df497249be2ca63e7660d47984a5ad10d5e0b3a4157ad833db8a1637f32abe37e753d1be13 SHA512 56b88643363fc8cc41838954fe866be82ec9826c232ae3f1965e9682ee2382f43bb0ab9f126460e4c885fb6d5384eaa25539a87eabd028cb15f4acf57165ec4f
+DIST wireguard-linux-compat-1.0.20210219.tar.xz 263964 BLAKE2B 9d8c3e17e1fe37b7148e02387e53ba8c7b4e1baf591253b30d69c1cfac459ea16f7f57d640588f2c550f0a3e0c33893ff1e378d7f494f8bfbabbc8eed46d67cd SHA512 1a0ef2ed96d7172f7726fb0e6699e2b49409e544c759df981951b7479f3798762761148cbc8eb5697282787aa8c4560e80690ef41711f6ab5c9d0568526762ac
+EBUILD wireguard-modules-1.0.20210219.ebuild 3565 BLAKE2B 60951d7183ea718b731a9a8d46f4a14ee699fccaed6f5aef151545cc37b7d9adb505a59105c697c8819fc0436ac0212284a2c45d63d953585c8d7c54993fa285 SHA512 31eb0a567b3480110f1d41a569acf705ed1f8e53e05529b12e2a21a74ae1cb78578f8769c00e219c788ccd6dce624ce58b57b0efeae370245ad1bb28723a26a6
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild
deleted file mode 100644
index a3aea3fe6a50..000000000000
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20201221.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="module"
-inherit linux-mod bash-completion-r1
-
-DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-linux-compat"
-else
-	SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
-	S="${WORKDIR}/wireguard-linux-compat-${PV}"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +module module-src"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="wireguard(kernel/drivers/net:src)"
-BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
-
-pkg_setup() {
-	if use module; then
-		linux-mod_pkg_setup
-		if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then
-			eerror
-			eerror "WireGuard has been merged upstream into this kernel. Therefore,"
-			eerror "you no longer need this compatibility ebuild. Instead, simply"
-			eerror "enable CONFIG_WIREGUARD=y in your kernel configuration."
-			eerror
-			die "Use CONFIG_WIREGUARD=y for this kernel, and do not use this package."
-		elif kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then
-			die "This version of ${PN} requires Linux >= 3.10 and < 5.6."
-		fi
-	fi
-}
-
-src_compile() {
-	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
-	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
-	use module && linux-mod_src_compile
-}
-
-src_install() {
-	use module && linux-mod_src_install
-	use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
-}
-
-pkg_postinst() {
-	if use module-src && ! use module; then
-		einfo
-		einfo "You have enabled the module-src USE flag without the module USE"
-		einfo "flag. This means that sources are installed to"
-		einfo "${ROOT}/usr/src/wireguard instead of having the"
-		einfo "kernel module compiled. You will need to compile the module"
-		einfo "yourself. Most likely, you don't want this USE flag, and should"
-		einfo "rather use USE=module"
-		einfo
-	fi
-
-	if use module; then
-		linux-mod_pkg_postinst
-		local old new
-		if [[ $(uname -r) != "${KV_FULL}" ]]; then
-			ewarn
-			ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
-			ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
-			ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
-			ewarn "which this module was built."
-			ewarn
-		elif [[ -f /sys/module/wireguard/version ]] && \
-		     old="$(< /sys/module/wireguard/version)" && \
-		     new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
-		     [[ $old != "$new" ]]; then
-			ewarn
-			ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
-			ewarn "However, the old version is still running on your system. In order to use the"
-			ewarn "new version, you will need to remove the old module and load the new one. As"
-			ewarn "root, you can accomplish this with the following commands:"
-			ewarn
-			ewarn "    # rmmod wireguard"
-			ewarn "    # modprobe wireguard"
-			ewarn
-			ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
-			ewarn "to gracefully remove them yourself prior."
-			ewarn
-		fi
-	fi
-}
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210124.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20210219.ebuild
index a057f7a62290..ce3824f93de5 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210124.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20210219.ebuild
@@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
 	S="${WORKDIR}/wireguard-linux-compat-${PV}"
+	# Please don't stabilize this package. Stable users should use gentoo-sources 5.4 or 5.10.
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 71cd1367885a..163adf24cecf 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,6 +1,8 @@
 AUX wg-quick.init 885 BLAKE2B 440224b688b1a1b4762bac7ac3bd6cb6fbee546543f1da70fcf5ee1c6d213ff62c43d502fd88d1778913455cc233b6419b3176690b471a71aaf2792671045eee SHA512 3de3edb359a786bdb8de06f496caced1293048c2ec489073c0525b4eca61365424ffde6a7eb899d7672db38872b6c67436b2e39019e92300ca5e590ba02c2e84
 DIST wireguard-tools-1.0.20200513.tar.xz 94500 BLAKE2B 34a39533018416df382d180da76d6494feec1d40208c9df427c1979817dbe138c217fe4c4f4cf5cecd3c4053e6f73f1863d1e0a9ed2cad41899dda5387c15844 SHA512 4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c
 DIST wireguard-tools-1.0.20200827.tar.xz 94788 BLAKE2B d7d881a56819c028b37c11b9a44e3304a0f49250aa6ce3da894802dc2546b755f790ddd3fbc14ec1e0f653ead744434ee540c20226373122d131d7deeae94544 SHA512 843b70050d24f142262b672daee44cdccab508b52f42b19a32c275a17d40fd8fb66136a22ef2a4602217e821703bb36a261e474b465807308f52e6a0ee49e267
+DIST wireguard-tools-1.0.20210223.tar.xz 95444 BLAKE2B 59606684c08893c40ac14f9d021013c741f1ea80dc5a07946ec2597d8c91f6c8e1ebbc5714d04ea6d7d9356362a9d5598a578019ead38a2e327a2162d1d1a9af SHA512 98855853a3ecfce23a0a6bf4a885c85efaf2b08c9a92e0d3800fe40ae9adf05fdf4443150a71319bd9b53e314c8032694ea978db850a238813232a0c04edf692
 EBUILD wireguard-tools-1.0.20200513.ebuild 4007 BLAKE2B 0efa36293ed60bb34de6f09e42b8bdb83025a2682b782abfcfe130661bbcaa2ddd6564f7250fcc4bde7526b46f44b1b53d6bb0538bf2bddd74ee9f47f0af35a6 SHA512 ae2935a24cf5cb0289ccf52f51fd74dd8352a62105e921c627c04456dd3d0049bd137e4855707f8b5df43845d3ed79b1ffa1fe8e045a86ba0aa4b89b0aa7a7af
 EBUILD wireguard-tools-1.0.20200827.ebuild 4014 BLAKE2B 7cbfad529059e2e54e3e2d9c8aae986c8e15cc58a17679c8f315e4fa68d98f961a433f35c67c88e563978989be12f1a438b8a34861d09a6fe6a94645a5e535ae SHA512 5232fd852509d26b6014f9222c4d0c7e9b57bd87ba23bd44fc3d926d4e7818fae5b51eed9dbeb6633b7a2cd9e81c37b85b55c6e4ad6d427c78dabe7a186575fa
+EBUILD wireguard-tools-1.0.20210223.ebuild 4014 BLAKE2B 9e2d0b6594458cd698667ba230121761d5ac1f54e7525cc30d9b44b5b5dd093e0c142c020cf39cc1d1be6b3a6905e51d291b8a4bcbc4a641019bb759b24fc02c SHA512 8197b6fd9b9d9e9dc5e13e9842bdc42ea5390960570247df3721397fbc01ad7827eed04a5463039da0247182d6406fe3ed9926d8f06de184ba0df9c4382f26ec
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20210223.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20210223.ebuild
new file mode 100644
index 000000000000..b0ff48c21a8f
--- /dev/null
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20210223.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info bash-completion-r1 systemd toolchain-funcs
+
+DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
+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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+wg-quick"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=""
+RDEPEND="${DEPEND}
+	wg-quick? (
+		|| ( net-firewall/nftables net-firewall/iptables )
+		virtual/resolvconf
+	)
+"
+
+wg_quick_optional_config_nob() {
+	CONFIG_CHECK="$CONFIG_CHECK ~$1"
+	declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
+
+pkg_setup() {
+	if use wg-quick; then
+		wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+		wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+		wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+		if has_version net-firewall/nftables; then
+			wg_quick_optional_config_nob NF_TABLES
+			wg_quick_optional_config_nob NF_TABLES_IPV4
+			wg_quick_optional_config_nob NF_TABLES_IPV6
+			wg_quick_optional_config_nob NFT_CT
+			wg_quick_optional_config_nob NFT_FIB
+			wg_quick_optional_config_nob NFT_FIB_IPV4
+			wg_quick_optional_config_nob NFT_FIB_IPV6
+			wg_quick_optional_config_nob NF_CONNTRACK_MARK
+		elif has_version net-firewall/iptables; then
+			wg_quick_optional_config_nob NETFILTER_XTABLES
+			wg_quick_optional_config_nob NETFILTER_XT_MARK
+			wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+			wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+			wg_quick_optional_config_nob NETFILTER_XT_MATCH_ADDRTYPE
+			wg_quick_optional_config_nob IP6_NF_RAW
+			wg_quick_optional_config_nob IP_NF_RAW
+			wg_quick_optional_config_nob IP6_NF_FILTER
+			wg_quick_optional_config_nob IP_NF_FILTER
+		fi
+	fi
+	get_version
+	if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then
+		CONFIG_CHECK="~WIREGUARD $CONFIG_CHECK"
+		declare -g ERROR_WIREGUARD="CONFIG_WIREGUARD: This option is required for using WireGuard."
+	elif kernel_is -ge 3 10 0 && kernel_is -lt 5 6 0 && ! has_version net-vpn/wireguard-modules; then
+		ewarn
+		ewarn "Your kernel does not appear to have upstream support for WireGuard"
+		ewarn "via CONFIG_WIREGUARD. However, the net-vpn/wireguard-modules ebuild"
+		ewarn "contains a compatibility module that should work for your kernel."
+		ewarn "It is highly recommended to install it:"
+		ewarn
+		ewarn "    emerge -av net-vpn/wireguard-modules"
+		ewarn
+	fi
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dodoc README.md
+	dodoc -r contrib
+	emake \
+		WITH_BASHCOMPLETION=yes \
+		WITH_SYSTEMDUNITS=yes \
+		WITH_WGQUICK=$(usex wg-quick) \
+		DESTDIR="${D}" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+		PREFIX="${EPREFIX}/usr" \
+		-C src install
+	use wg-quick && newinitd "${FILESDIR}/wg-quick.init" wg-quick
+}
+
+pkg_postinst() {
+	einfo
+	einfo "After installing WireGuard, if you'd like to try sending some packets through"
+	einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+	einfo "test example script:"
+	einfo
+	einfo "  \$ bzcat ${ROOT}/usr/share/doc/${PF}/contrib/ncat-client-server/client.sh.bz2 | sudo bash -"
+	einfo
+	einfo "This will automatically setup interface wg0, through a very insecure transport"
+	einfo "that is only suitable for demonstration purposes. You can then try loading the"
+	einfo "hidden website or sending pings:"
+	einfo
+	einfo "  \$ chromium http://192.168.4.1"
+	einfo "  \$ ping 192.168.4.1"
+	einfo
+	einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+	einfo
+}