gentoo resync : 28.07.2021

16 files changed, 83 insertions, 252 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b467f86a7a6a..2577fd902d13 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index a9fccd25e576..63984371f981 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,5 +1,7 @@
 DIST NetworkManager-l2tp-1.8.0.tar.xz 435964 BLAKE2B 05267b4bb1a824cd9478b79af4b07535b0b9245d34f49397feb778d806c814d6a7bcf723545d53b9f3d2d39e6de079fac00407e7c8d0e6389394aaf6a432b16f SHA512 8ef6732dbef2d24a51c6f70bcd98b272244dfc4d89e888e0d2c6c12b0042c1bcc750b73cdfda3489f4987af4fe85df4fc54976c48151996aa205939671d250da
 DIST NetworkManager-l2tp-1.8.2.tar.xz 437032 BLAKE2B 24d3bce74d9b57228196b288406983423a98d242fc26129a14c144269a9173d5ab2b47ad9dcf7b16dde5b9f015e6f3851e34d1ebe7e5edf6769401a2377eb0b7 SHA512 fc7f4037a4e2d442231f3c72692b7d405f13507625828dc4b975fab3717c7c0daaeaa757ef2ed875f347a87ac4ccaf5a0df1834235d8879f3d1e0d1b450531b8
+DIST NetworkManager-l2tp-1.8.6.tar.xz 446780 BLAKE2B d1cc532a5aafab6c3876c74ad88387ee3a2db2d0844a4c79bea2afcd252aab9bbef1e3435075b5089d1f8471ba41b47f6054a06e1a3440cfe5fe7c432a5ee3fe SHA512 968e8c9140f800935e57e6a58fb4cc8a92385427b8a070a5106c37f5a9d05cfcc1333fe706dfa5ae79dfdcdde89e4becd7866a4e5f535b32e1edafe7171946a7
 EBUILD networkmanager-l2tp-1.8.0.ebuild 1012 BLAKE2B 1beecaeb16823ca7bc7fcca4f237616e642279876192b171a9822375c24f56aeef99c2720faaaf904bb968a1c9fda241e0b398fc9be91c18a2c04251babc6c2f SHA512 0b5ee5a8ef5ca4b17db896ca4424e1427e12cb104707fdc1fab4c2b319b5c5bbea29ebc4de68e87740b2ec31ff588511c6d068511647509ff4701c34b8b16b3a
-EBUILD networkmanager-l2tp-1.8.2.ebuild 1012 BLAKE2B 1beecaeb16823ca7bc7fcca4f237616e642279876192b171a9822375c24f56aeef99c2720faaaf904bb968a1c9fda241e0b398fc9be91c18a2c04251babc6c2f SHA512 0b5ee5a8ef5ca4b17db896ca4424e1427e12cb104707fdc1fab4c2b319b5c5bbea29ebc4de68e87740b2ec31ff588511c6d068511647509ff4701c34b8b16b3a
+EBUILD networkmanager-l2tp-1.8.2-r1.ebuild 1262 BLAKE2B c0f60d71ed6f56b2d224c9b242a9df450534ec30972a7af7d6e70fd6196af017254b017719ab3b8f880864004a6821a137a9465d6e3d87c4711aed7338d1dbe1 SHA512 8dba4d68f5cc7a9e603b718c73a4582cf76f3888cb83acc2b717f6468b6641191ecd4fde113e9f0c1e9646c18f9b5ed400c972f0a0c4a5ba4d615f99c25c9005
+EBUILD networkmanager-l2tp-1.8.6.ebuild 1262 BLAKE2B c0f60d71ed6f56b2d224c9b242a9df450534ec30972a7af7d6e70fd6196af017254b017719ab3b8f880864004a6821a137a9465d6e3d87c4711aed7338d1dbe1 SHA512 8dba4d68f5cc7a9e603b718c73a4582cf76f3888cb83acc2b717f6468b6641191ecd4fde113e9f0c1e9646c18f9b5ed400c972f0a0c4a5ba4d615f99c25c9005
 MISC metadata.xml 361 BLAKE2B 3cbc2e35a93fc771cbf0d9152b5f5b0059f6ba114f176135a193b78f2462151e5fd4276082c8912fb6d695f10247b48b6f4dd590a08b09784f008224380fd520 SHA512 d23341b2bf05543c1d41a25aa10bf1afcff3f8c235f08f0063f928e0027236d754cae539ed770acfd14aaf2a791fa932b7d663bffc423515ded5f555c6b71e0e
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild
index ec5ca2a6ddea..0db9addd3960 100644
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="gnome static-libs"
 RDEPEND="
 	>=net-misc/networkmanager-1.2[ppp]
 	dev-libs/dbus-glib
-	net-dialup/ppp[eap-tls]
+	net-dialup/ppp:=[eap-tls]
 	net-dialup/xl2tpd
 	>=dev-libs/glib-2.32
 	|| (
@@ -32,8 +32,8 @@ RDEPEND="
 		app-crypt/libsecret
 		gnome-extra/nm-applet
 	)"
-
-BDEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	dev-util/intltool
 	virtual/pkgconfig"
@@ -46,8 +46,13 @@ src_prepare() {
 }
 
 src_configure() {
+	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
+
 	local myeconfargs=(
 		--localstatedir=/var
+		--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}
 		$(use_with gnome)
 		$(use_enable static-libs static)
 	)
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild
new file mode 100644
index 000000000000..0db9addd3960
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="NetworkManager-l2tp"
+MY_P="${MY_PN}-${PV}"
+
+inherit gnome.org autotools
+
+DESCRIPTION="NetworkManager L2TP plugin"
+HOMEPAGE="https://github.com/nm-l2tp/network-manager-l2tp"
+SRC_URI="https://github.com/nm-l2tp/${MY_PN}/releases/download/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome static-libs"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2[ppp]
+	dev-libs/dbus-glib
+	net-dialup/ppp:=[eap-tls]
+	net-dialup/xl2tpd
+	>=dev-libs/glib-2.32
+	|| (
+		net-vpn/strongswan
+		net-vpn/libreswan
+	)
+	gnome? (
+		x11-libs/gtk+:3
+		app-crypt/libsecret
+		gnome-extra/nm-applet
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	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
+
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}
+		$(use_with gnome)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index d741045857a6..991edfdb8b3d 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -2,5 +2,5 @@ AUX ocserv 182 BLAKE2B b7ea6c381fed7406bda8fae3638445d6cd2e2acaf5f5c310227fc56f6
 DIST ocserv-1.0.1.tar.xz 787800 BLAKE2B 655a2a6e1434a5b31b157e0f73df3d6d04011c06fd5a1f39f1152752abdc837974c739bc0694a804a1e96b4e219c78c5cf1a58040bbcdcad3e326d0c9e584c7b SHA512 953e1b6084f68f8627b5383e28b5fcde987881e66feac645a40fa37d895f0711b171c9029c3703773dfbd5432d747f92c71af9240c2df3381599902a7d5fe880
 DIST ocserv-1.1.1.tar.xz 818988 BLAKE2B 06fdc47fcabea162ddd417f315c53e85f4ccdc1dc9b60b624c06ee4adae9d6f0ee96f94c15daafa0633b4925720519da7220914008c64c5771f61416208a570e SHA512 1173416f0d32f9faf98e539c8e73316a50ac93b519d1ade19374a3df865d10d975e13ac53e0c5a5e77c80f3605d7a810287b18b85b798887d227389761b54220
 EBUILD ocserv-1.0.1-r1.ebuild 1764 BLAKE2B 7d70d482356ab6cd8d3023c1473a7e0a9df670156fb6ac73fe2ed3553238629b109f475ca3503ec14bf3dcb19693be0cc492fef36253fff52df62922fcc847ef SHA512 fe17989107f3e3fb08663c66b49f4c87664b033ddb3094743fa939e5940d723718ce862d292cbed1176e2a5669e73973789f02ef7212d624a26fa96d8fdc6bb6
-EBUILD ocserv-1.1.1-r1.ebuild 1744 BLAKE2B 2bd2d7c1443720bbe25f40dc28d32f159da53a08b072235342cbe2ea0dabee4415e93c083117b781130b7e3e7eb2dec3fc0e1eaad78bca65736afb7018769e30 SHA512 3188369d9257b20ec2bbc9925c6289399178b2b6e6bb79437fea82f12090cef13285a982ef10d0b7ccd587a3ad0d8e50ad99ea18dc03df3e0685e30abe791278
+EBUILD ocserv-1.1.1-r1.ebuild 1751 BLAKE2B b9746f11601f1d3879c912e024f0122fb13e2a4f242b7b83629e6faf13a8f77fa97faeb5ccc6537e48e5c07d7abc8341419f012dfc9a0fd93ba2f2305c83eb67 SHA512 ae0e337be65aae1f114ecac874e46bfa64d7c98d540366ea716e47abdce8176b0621e4df03a0dc7ac1f3fdf2d5b3d47c07d1f4d1eebb39de93978e9b6b68b06a
 MISC metadata.xml 325 BLAKE2B 1bb6068aff761fbf40d489d5d60bcbf295a079a2fffbb99af64abfcecaedf7cb5407b3f94b6823b58690912f43dc4427cd8d7a658d2f809b45462702ba5f0aeb SHA512 4fb35360034ac9639198ebd1e0917848b807e0a53ec10eb2d4e1a90a4f3f631b582e6f3d6e3a7d50f2f284ff47dc1a2ec4d362fa73f6b5a1834ef531bb2bc5ca
diff --git a/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild b/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild
index 83522add4c3f..459da4219219 100644
--- a/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index adbe87375c27..b9e05733581e 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -11,7 +11,7 @@ DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946d
 DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d
 EBUILD openconnect-8.09-r1.ebuild 3091 BLAKE2B be3ecad6c44152576a3fafccf3a95c239bbf0cd91bc900886f2c7b74e067c81a2bd7145537fc38ceb2ef01af180824df62f5c73ee4a4f2b351eab766c5f7e9f3 SHA512 090bb94bc9f9250ee867e73d20a5b265997ddf1820ed54c1068c33e9822e50f48420134966b3ba6309b628708b4ad0270aa44e94d4e699a510a906a5c3948f01
 EBUILD openconnect-8.09-r3.ebuild 3079 BLAKE2B 030c6f46ebb04966924f6e51487608660e4d2157ae5364d413db5f8cf6c12d50b7b771c640a60047f14a2df1a33dbfc97ff6bf8e07916c496a844d47766aaef0 SHA512 5eabd5db4a6fff49744f8005a98f91f7b9eb0e1ad704cb63451fbd49b6564b294a2c39b3d8c887ebaaacfdaac780f4f255f0f46bba24186e31d9880524a156f1
-EBUILD openconnect-8.10-r1.ebuild 3266 BLAKE2B 56110f7ec9fdff57a53816b166ba4023d8485490493319a0506e0709f9304aa54a6cf3bb5f7b3ac8bab9ee56a7b16270628bdc8fdf2b066691f06f6512588642 SHA512 23d60d738a81c686d9d752b6af614438b2eba6f8a357b72b61e6531a900315542a49e61174a8a95aecbcb0065ea20dd30d6e4836dcf8e8f7c6202028cc8e12e8
+EBUILD openconnect-8.10-r1.ebuild 3267 BLAKE2B ba110d6dd75ef47853187715c5ffed7b9f74c83e72e63d99003e952672a0ac31867f747e3e77b58d1c7f33cdbfb6cff28672d21df950eb11e73cadb4c89414dc SHA512 94963df2eae26626c77f95eda31bbd36dc59bb57e2d7de8609c248c9bd978cdce681a719ffaff5894fc6a2b1b8b57765e8b7ed197945201373ca79c7ca3134ac
 EBUILD openconnect-8.10.ebuild 3014 BLAKE2B ef2a3c2d603c2bfc155fc502009d49e0b6240e625ad7655dba2efb807531767d49ffdbc258ea24ebbd1654b36b36d156c52e3c9e900e1baad942243b74e686f7 SHA512 4c5afe5f42e3befa0aa5e5fc8a788ab1c7c637f1e7981102df9b51aff685f18a9302164edc8c2b5365ed439d2f605a3b74ec6392b61f2c19b0f4fe8c54ed8ae8
 EBUILD openconnect-9999.ebuild 3014 BLAKE2B 8ce4ad4153574a92bd68293e583130ace309499062831d422232814c99f09010359b03490837f2d7d18dd46f0212209704d23dc8d676b3255719fce6dfa80b48 SHA512 b794d2d95f897e0f451b2478759339deb64d38da5d1591fb39cd3686bdaf868521fdab8eb1ca71f5409b7715956d4014dd3e7faa586a3967148b300e8b81f52e
 MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8
diff --git a/net-vpn/openconnect/openconnect-8.10-r1.ebuild b/net-vpn/openconnect/openconnect-8.10-r1.ebuild
index 3225e8088a0f..f4a03e951f4e 100644
--- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-8.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit linux-info python-any-r1
@@ -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 ~riscv ~x86"
 fi
 VPNC_VER=20200930
 SRC_URI="${ARCHIVE_URI}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 219b32dae2c7..5ac5fc475251 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -5,6 +5,6 @@ AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d
 AUX openvpn-2.5.2-detect-python-rst2man.patch 554 BLAKE2B e379af57dcc25766803043c40ac2128e2649acb4594ba6c4f55967e5d38dc6fd3190d519b6e9ea81656eb9e5344043e6cb84e155059337282913b60a58d09eca SHA512 e09307c2841a8836d12e1973baaa5e61fd9371e6628dcc858cfa9111b8907f8e6ad73073552655292f0f9d23b8850aa821d3a1520b4b11c312a8beb2225c6ae9
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
-EBUILD openvpn-2.5.2.ebuild 5000 BLAKE2B 87806f8baa1589c14ec92972199068a774e4d30406466ce3611b0ec818e6dc99eabacd619ae72ca94988df5ff6047ca95e630838b14a9fca81828e4790449d8c SHA512 e414ef1ad5496dcb220aab5785a5343f2d1d40bad1e184d52c0aa2bea4772a9594b201fd91fd786a8c984c15e3b8da8b06c2a02f8a9cd39db95232a4d48d2c23
+EBUILD openvpn-2.5.2.ebuild 5007 BLAKE2B a276f607f7defd11de4f19f61a7a1a2e21a3d9b929f748b9b1c825033b40578a4106eda5cb66e7a32e999ce04e5506398a2ffbfeab7ebc70c703b9c6b129566d SHA512 9fdb0645c697ca50f8bf7226b3f2423280091a971d31bca972c0b02df59583d7cf9e16f223b34873ca6143c8321e3210a33b0b94e882a1f0002f8ea748257742
 EBUILD openvpn-9999.ebuild 4986 BLAKE2B 5eebd395ec22387351e2dea239b61ca22cbcc0c7cff64f2de4c7bd4bac9cb8c99af4546aa986a67cd11efe524e3db8e57a7bac95da7b22ebfe3f1e0bfdf8beb4 SHA512 279bc764dfda1887a9259c84a226764784ac31d7d8dc85ad45ab1dde5ad05a26f9c0c1556299cd2d3687299a8c89d00d19c18113c94145d59c914885fbde19e7
 MISC metadata.xml 1083 BLAKE2B 5642cd5be7d4d53f5cc3b1e501f3a22c875ceee114cc2c4d5fa45f96983593d8f2c5b60a30c396187ad7bb2adb36d6d5c03aef8530d450ab86df589a591ae95b SHA512 91a8c6eda7d21dbf7619b49b757d9016ac94ff6c9e87ef5684a01d5138d8f84cfcc525fd62729ceac85394e82cec3931716f6dfaae59cfc3eda804bd968ee428
diff --git a/net-vpn/openvpn/openvpn-2.5.2.ebuild b/net-vpn/openvpn/openvpn-2.5.2.ebuild
index 757421b60090..97c64cdc1ea5 100644
--- a/net-vpn/openvpn/openvpn-2.5.2.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 106339d582c1..d09d9d6d5fbb 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,23 +1,16 @@
 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.9.tar.gz 7723996 BLAKE2B 4d24335592a53f06040425cdca71a0efb15da475255f8aa33bee6e802847713a45f74866c59e2d5ce91f79153032bf21bf362c35d9b5ac8c17a1ad78a44525c7 SHA512 c2864c8c81c5bf0c6825841bfd6be3c1879e29b4796921b12304f094c9e889fbc60c3e0c2ca23838ecc9e153b7c9ba47052f3d692ce2e0f408f0a7b708961877
-DIST tor-0.4.4.9.tar.gz.asc 833 BLAKE2B d47cc35a6d6766e98d7c486aec63c1c407ef1f5464c5718eabdc3c26f03ffa011889e569bce5a3914ee8857ddcdd7bc8f4163ebcec5bd7100bfb07983b3cd6ab SHA512 0e2c5cb6667fd5f786c19e47f6f8d146e93e74496585fb89f33b546eb7dbddea268a89d049c929e694e6114034341624a67ed0e0926fd634cf3ecd1b8a5da584
-DIST tor-0.4.5.7.tar.gz 7816158 BLAKE2B 839a81b237e29f12ace8be518d6aed87dce8cc162f8e0701480676996ebe76ad1093f785c8148484e3f14c6bae01499a1a3434d07c465aa6130c18fcbf66236c SHA512 1ca0e35eff5b344ee416de4cb958d7f04d4e5e9f2efff524576b1fc3c2882dbc068d35f25670e7efe5fcb51308b165393b1078fc46585ec6d40052daa0628a05
-DIST tor-0.4.5.7.tar.gz.asc 833 BLAKE2B ede473bd1083acf96c05a1469651a89bc38147f8cb82eaaa4bf2eea8731b1a7a05ccf7d26c59bda51cb46e3a9e762c93a813d05a9e07f24b6d8edb65c4a4e079 SHA512 f41009b3683584a2a6df2609f2bd6b134d5cd02547f53a60aa18a847f3aa8e9a1b0edbd45a52930ba15b19e48c7d6d80a94f8be69a3e4b4e1c39acc810cfacee
 DIST tor-0.4.5.9.tar.gz 7840294 BLAKE2B 75babcbf7929fa34034ad706df1189ca7988e8c5db30f7051a5a006d8bb61afa7ebf7d0f7441e3ef1df1bc777cd80dc165c1d481d65a695c315b8820f8be392a SHA512 b3c3b5cce30c881fb1e705ec6183513f625ddb9d076671b9cd6299e81a410bc12f59a30677636371c336e397211432f0831bdcb2105c9aed8dcb608eae54e2b2
 DIST tor-0.4.5.9.tar.gz.asc 833 BLAKE2B fca3769b683e8bb90540026dda6d2f302d499262c806f7c7215e7a30908cd46b807717fd130380d114660380166852f6a0cbb702966c6930004d04098718d582 SHA512 df538981aa19a2fa730a1e357f277f22b3cae769a1d13fa1d920a5e949d5b3770a8de9883eeaf2522c8b24327f73505569ac0f6ecf77139ddb5ef1e2418924b6
 DIST tor-0.4.6.5.tar.gz 7754823 BLAKE2B bdff61863f8b48381cc52d66c54f417e90177118d6cdd1402f3ecca9783f32141f74bb979b4f8c919d9e2c6cd4373fd9a5e0e84498a26470af1fbc6eb2c7caed SHA512 62bcd8d446199cdd397a688d454730a057ef20be4152e6d0632f64df27c993c70be0dbde0a2e7679a8a20850371a503b8daf777296d555760d8aae3286e48050
 DIST tor-0.4.6.5.tar.gz.asc 833 BLAKE2B 966ab724e37dd341c3ef45f2aeb7e1c928270831ea790cb6cb0e77084a0c813d66ce35c5d31d49bf9d1e9a6ecfb3d4fb6ee4424fd83183d654016d22fcb90d7e SHA512 1cf9111ba08594c716874a2b6f35a7959c5c391518ec1e5b1491d84454f3fe1c705e06dfcfd23f30e0eb619063304c430cbebc9827190df0b03ec09cecd1773c
 DIST tor-0.4.6.6.tar.gz 7754194 BLAKE2B 735ba82bd61fee3fcbb8a8e39adafe72ac23a7c4a4f211d07759add2e5285277b9ae2544bd279277ffa533ab3102048b26b70987857360082dde95d1e614ca28 SHA512 9705a3e43f399d214511968fbeca0ff03d7138ed39d87bb5059989f8259f0c72fb05d06caa813ba48fa227b2b02f394e84c6efa36ab3d79d2eeb42fbe6caff07
 DIST tor-0.4.6.6.tar.gz.asc 833 BLAKE2B afbc9f93eb8b83656d5184827adeca8312cb38777dc2c7ac4219428ef56f34c641f9c9a9a0262d63cfae5c06d0260a5e21054e1a980849db44f75fe09b244abe SHA512 f9f1a3bc8704d0abc1608f3765c2edb10c02f15c44e9f918a1e85a753f9df19f7ec4a3daddd9fb876fa4fb1ff8f8054c8ae2445fed37ee086b2c750dcf3fd4cf
-EBUILD tor-0.4.4.9-r1.ebuild 2797 BLAKE2B 2b37de0b894e2b7088fad0463bb173a08139ca8da49507fc5718d270db00b2084f012d619e8df9f0f4821eaf78357401b23348f4ecbef53d972e486198045c8e SHA512 c2b0dd7537064d8d1cbe0eb9d213610460afa79938849232390fd512cd8498e076138f5e9fdad6b0a85b665f73c1ab62bbaac0cb07f543536bbff9dae0590915
-EBUILD tor-0.4.5.7-r1.ebuild 2788 BLAKE2B 7c390e7a4789c967ce7b63b6a9505d487fc5dc7eba3b3d11d929f37a4bb4768dbd00c9547263d051aee401f8016f1abb69189acec02fa22616bfe8b3fb1cbc48 SHA512 746c9462ee787c860d3cee7deb8435b310cd1488c11dd385895fa891a43043bcacc15ed2c3df6905242f132111dbb2ac64850f21397e392e80bd09f851322fca
 EBUILD tor-0.4.5.9-r1.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
 EBUILD tor-0.4.6.5-r1.ebuild 2742 BLAKE2B ded94096f45ce9dd6be3ed15c762f80086aff5f2590ae83b94850ef1a2827d0c436313ee27f661dc190c89ef36417c3b2e8deb89817351b8b82d6e28e3d51eb5 SHA512 489760dbb35167c927ba53f061a767d03f17d90168010907e4a89db62a394029f3ed88f86e127d13c9720f8b875832531545aee4f5fee24522554602a973c692
 EBUILD tor-0.4.6.6.ebuild 2748 BLAKE2B 58f5ada5baad900c2693a457cee8d02163ff7e67cdfcb75f23476d838ac3241995b260f0241787c65d095a8fb28e206c2056c6af6e4532d5f92cd3c2bbf226b5 SHA512 4337b7031c3e51a8842cf3e6586d6aa701fafda7d49e9c259b573f83647a08147af530745720a93b273c299a9dcf92d22c02ba325873b5d608d6fe7ca05361f1
diff --git a/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch b/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch
deleted file mode 100644
index 76e88bbaba99..000000000000
--- a/net-vpn/tor/files/tor-0.3.3.2-alpha-tor.service.in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/contrib/dist/tor.service.in	2017-11-11 13:40:46.000000000 -0500
-+++ b/contrib/dist/tor.service.in	2018-02-24 19:06:12.307506884 -0500
-@@ -21,6 +21,9 @@
- LimitNOFILE=32768
- 
- # Hardening
-+Group=tor
-+RuntimeDirectory=tor
-+RuntimeDirectoryMode=0770
- PrivateTmp=yes
- PrivateDevices=yes
- ProtectHome=yes
diff --git a/net-vpn/tor/tor-0.4.4.9-r1.ebuild b/net-vpn/tor/tor-0.4.4.9-r1.ebuild
deleted file mode 100644
index 8a971fb7b60f..000000000000
--- a/net-vpn/tor/tor-0.4.4.9-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-fi
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
-DEPEND="
-	dev-libs/libevent:=[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
-DEPEND+="
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.5.7-r1.ebuild b/net-vpn/tor/tor-0.4.5.7-r1.ebuild
deleted file mode 100644
index aacbb466ed11..000000000000
--- a/net-vpn/tor/tor-0.4.5.7-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
-fi
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
-DEPEND="
-	dev-libs/libevent:=[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
-DEPEND+="
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 584588668139..de6f98e6d6ef 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -4,5 +4,5 @@ AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32c
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
 DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
-EBUILD vpnc-0.5.3_p550-r2.ebuild 2222 BLAKE2B dfb28bb7ca291d8aec19a35f85e594cb1cfbbf23bd29ad53f7af1b668091749ede2f7bc7151a849637510edb091b21eb655902eaa919c19b71bcf2ec88662260 SHA512 0ffa5a8a59f9935c004362a8ba063cf7c10d89698e000a87381157679efcd59290bd4e264641a3bba0caa035d8119dd5b938436f29d28f75c5eb42ee1af171c8
+EBUILD vpnc-0.5.3_p550-r2.ebuild 2229 BLAKE2B fcd7c82681987e3f766980bb8b7cccfb069b1c51234518a750a074eb73fa3734eac52e84aaa1a385d8c36f2f4a2bc049fd45fa9e1f2fb46778a251ee5b8e04ef SHA512 71b10eea902d6bcb4f472b4e80f0597f697bee4aea45a1900c4e85a33894ed9e46e5e31db516d468954ac854e2f0ec250527c5592461e28ca461ed06c44e32eb
 MISC metadata.xml 364 BLAKE2B ad78bc77b84330fe5680966fa276e821746d7a950e326fde42fa8d330ed176fca5a7dc31831e9af97c28a243aabcb693ff0016d93fae1b702c10f968167b26fc SHA512 5d31b14522ea8c365ead3dd5bfa2370ed6347259f023b17bd19707628ce5e1d0141c340869846de508e3268f79ff298bb93026adc4a798e4774054ee06672174
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
index 529bf1d4e355..fbe052a03af0 100644
--- a/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> ${PF}.ta
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="resolvconf +gnutls selinux"
 RESTRICT="!gnutls? ( bindist )"