gentoo resync : 31.05.2021

19 files changed, 418 insertions, 554 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 70117239845c..eb5fd6fb5d9c 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index a9003b26a1a6..6b8690a4123b 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,9 +1,9 @@
 AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f3950e63f8f827ec3697ec52f60e29c3e01f232d6c12cf776883672203f01645e5e2d5d994 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f
 AUX i2pd-2.25.0-lib-path.patch 725 BLAKE2B ad87fbfae2cb78945d0e0f62ea9d0ab45e1676908ebb11d6c4844a6160e0eb2714fa1221e886d158454a7ba3c19af7d1bb672035195993fb4633162a761e3bcb SHA512 1e1942c8c424ecefb0b62ee96973b2b238553a887a42cb5d9206cbea31e3136b7b3ad0b8ff1f290cbb507f1cc404e8a6e3c1a52551ac0aa719fbadbcf5ccc43b
+AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 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.37.0.tar.gz 551885 BLAKE2B 478c4b3088760643a79b12fe963d8edb3f0f98b9f3422195ce493477b338e875fd5e28f45cd9d29c7f1e536732c22ed6cb4144f1400c8c3c3ec9db5697d558e1 SHA512 2cf785941b58563a575511ad2ef8b94ec20bfed10f1a4a06e82603f85c9b9586cf10740fcee0d962cd94bf6059c3950f68f2a0b96b55f1c6de23a7d49014d3e6
-EBUILD i2pd-2.37.0.ebuild 2216 BLAKE2B 5d05293f353cf757f7d660ca19ecdae5474f44976671851e7bb82c68bd8ad5ee70130c0d1b9516649a3dbbd896b8697e107f61bdf4594993ac3033a1e0eccbe6 SHA512 a188db4c33f1f68b9788425dbd7cbd5fd3dac6f3cb034521041126814838f83388b6da309c9435165183b3d91e8fced5177a097f2ffb2d7276d1b0ae39346073
+DIST i2pd-2.38.0.tar.gz 555543 BLAKE2B a47c4b77e3a1d4c88cfd18b288b53592a8096509e0bed01bbf57f8d81b715699f822059cd9eecc0deb8fc82d98c23a8c0f6a67ac71654da528f81785338bfe54 SHA512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f
+EBUILD i2pd-2.38.0.ebuild 2214 BLAKE2B bb70fe86af18f70cd99fe0447ecdf1409787a2b756312164daa9c71b4e3d1fb4cf70cc57ceb97697d572b89e5219aa67fe7b18fe7cf06f69e4feff756ef0c5c8 SHA512 866c8ba29e4191e8ae7d3174763efbb81653d2505275e132fd78071d943a25660a8d4bf91d7f1e278cc49788a2e4835907cb97c5a756b7ce3b9394faa0c8506d
 MISC metadata.xml 727 BLAKE2B 2956a473062444342fb7436a09686b9774210105445288152df0e024fdf81b93b86782a1e3e5348ce8d4a2d71383db3ed63dd51dde00abadcfdce5f84819b37f SHA512 0362e22d09aa7735d12b66da01cc717704429750a57dc2cc625c2907525c935764ede0a83ef4908417542bc0afe24cb21ada71ee3100dffdb3d3b2ab3999da38
diff --git a/net-vpn/i2pd/files/i2pd-2.38.0.service b/net-vpn/i2pd/files/i2pd-2.38.0.service
new file mode 100644
index 000000000000..99c1bf202250
--- /dev/null
+++ b/net-vpn/i2pd/files/i2pd-2.38.0.service
@@ -0,0 +1,37 @@
+[Unit]
+Description=C++ daemon for accessing the I2P network
+After=network.target
+
+[Service]
+Type=forking
+Restart=on-abnormal
+User=i2pd
+Group=i2pd
+LimitNOFILE=4096
+
+# restrictions
+ProtectSystem=full
+ProtectHome=yes
+ProtectControlGroups=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectClock=yes
+PrivateUsers=yes
+PrivateDevices=yes
+PrivateTmp=yes
+RestrictNamespaces=yes
+RestrictSUIDSGID=yes
+CapabilityBoundingSet=
+NoNewPrivileges=yes
+
+RuntimeDirectory=i2pd
+RuntimeDirectoryMode=0700
+PIDFile=/run/i2pd/i2pd.pid
+ExecStartPre=+/bin/touch /var/log/i2pd.log
+ExecStartPre=+/bin/chown i2pd:i2pd /var/log/i2pd.log
+ExecStartPre=+/bin/chmod 600 /var/log/i2pd.log
+ExecStart=/usr/bin/i2pd --daemon --service --pidfile=${RUNTIME_DIRECTORY}/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.service b/net-vpn/i2pd/files/i2pd-2.6.0-r3.service
deleted file mode 100644
index 6821a00552df..000000000000
--- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/run/i2pd/i2pd.pid
-User=i2pd
-Group=i2pd
-LimitNOFILE=4096
-PermissionsStartOnly=yes
-ExecStartPre=/bin/mkdir -p /run/i2pd
-ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd
-ExecStartPre=/bin/touch /run/i2pd/i2pd.pid /var/log/i2pd.log
-ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd/i2pd.pid /var/log/i2pd.log
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/run/i2pd/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/net-vpn/i2pd/i2pd-2.37.0.ebuild b/net-vpn/i2pd/i2pd-2.38.0.ebuild
index 2422eec0aa6c..847dab8ce292 100644
--- a/net-vpn/i2pd/i2pd-2.37.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.38.0.ebuild
@@ -75,7 +75,7 @@ src_install() {
 	# openrc and systemd daemon routines
 	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
 	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
-	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
+	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
 
 	# logrotate
 	insinto /etc/logrotate.d
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index eb2407798d95..219b32dae2c7 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -4,13 +4,7 @@ AUX openvpn-2.1.init 4176 BLAKE2B bcce4f9683c485acde0c909a2be77511b7f0576dcd2452
 AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d8b14b7563744981f9fef15c5b217aba00d91469eda99cfa04b4a1e8ffbc92dccfc981290ec5aaf209041ed7790f05f2bcf51a06981bb SHA512 373e63417f829c3309cc3ec1e676559deaa7f19be438228d05ac4f47cd5d18f36be270cff1e6dad5b610afd77ff128c170a319263b903d6f221344e3b6be32bc
 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.4.9.tar.gz 1000602 BLAKE2B 4a10ec76d1a816f9184dd33e4384623e011a1af40ea38ad56cc06f70ab2c911b6fd92cf8ffcd2ec3ab4179fef87feb187fc9df61c5bea92b1c69ee4113093866 SHA512 7683dfb93592968459f080a07ea750992b7444708cdb1a5aafc0118ab8528fc488f2b9fbd7d042e57ad1811303208875237ae9decf0bb4977c45cd30da53751b
-DIST openvpn-2.5.0-r1.tar.gz 1815964 BLAKE2B cca1c1ec4fbfe0c337c14525cf706280c9d961c4bba992dfa0b13c9f96e00092864301138037485095716c746ef6ff3473a2085780b3ef77183bf4a6f1c602ae SHA512 3deb55973b87cc95c0437ab9ce6c43fdc246aa7e42e3e68bd6a5651deffa798b6750f625917cb2aaa2c82f0b3a0805bcf206a2aa8e2c735fd24e6bd38f736562
-DIST openvpn-2.5.1.tar.gz 1827517 BLAKE2B 068af9313c9b2b93dcaa06f82ad66489154ce04973e323af07f38f209b4be77b7b785046aa31559a9f744b4b8c6976acd3e644d5a573f3c5511dc11f5bab3dce SHA512 eb85d14eeb383bed09670941451328db38feacc0b8b7b960840a3f465de83a7527de7d183e66344011da3a3655d558483c569d096b36964209a23418f89052e2
 DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
-EBUILD openvpn-2.4.9.ebuild 4673 BLAKE2B 5c59d4d0745d7ea2efc85145acb06a101aac417f8a2f5a23e21b0939b9180d009b380db2064d7babf9335fddc866bd48fcf1c0a87f4094f1718315ad22e6f5cd SHA512 4c4880507b407549b42b9f58443f6031e0ac6aaa41c14426dcc792930c1fa45ad84e7e3934fa85c91599adfdd2dc019eefbfa3afefad518a30058c6a6489f0da
-EBUILD openvpn-2.5.0-r1.ebuild 4695 BLAKE2B dd947f38a6484cc69e8cccac511fb60ffc04ab3ab7e69d11192b274234f93c175d2f15f8567b5312281efe76ba568bdf168a9d6cf51f1c19d778c914921d228a SHA512 7d8d46b49fe36c2850c031c74a47a459b28bbc5e94bc9ba5862999b196f3ad8ba425cd30031d7e592a53c89e6926a9110baee8b3b4300ba44e629ba33ac5ee8c
-EBUILD openvpn-2.5.1-r1.ebuild 4679 BLAKE2B a823847503c964ff792b78ba44116dd9f257814d73e24965560cbcbc85235368be160892274579a60d26c77e31bda389a6b4122a0e1e344a4ee4fe2e0f29552d SHA512 1894deec5ca459b8de6cf58c5aed77b9987671a7bf7c052e15dd3ffa48a6e1b2a7ad14797ee9886ba6545f4a8f14d64de8b1715787880b5bc8880f4e23d8174e
 EBUILD openvpn-2.5.2.ebuild 5000 BLAKE2B 87806f8baa1589c14ec92972199068a774e4d30406466ce3611b0ec818e6dc99eabacd619ae72ca94988df5ff6047ca95e630838b14a9fca81828e4790449d8c SHA512 e414ef1ad5496dcb220aab5785a5343f2d1d40bad1e184d52c0aa2bea4772a9594b201fd91fd786a8c984c15e3b8da8b06c2a02f8a9cd39db95232a4d48d2c23
-EBUILD openvpn-9999.ebuild 5006 BLAKE2B 580199387ed1a7a35ada0566f030f4597bb78106fcc49a19473f15cd63581db3a0ddf3493bbe3935914ed9df687c4d26aaf84cba8f1a693e581a1fdaa8bf9881 SHA512 149e1cb8868a6133a061c9434fc13f12cf7b1ea90130f106adbf4d9e7fa25aa560d449f153cc3dbcbe067fc28f08ad287a9fe2465a377dc0b95a8e4a639d35ac
+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.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild
deleted file mode 100644
index fa2a4e2f0261..000000000000
--- a/net-vpn/openvpn/openvpn-2.4.9.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://github.com/OpenVPN/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam"
-IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="pkcs11? ( ssl )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
-	)
-	pam? ( sys-libs/pam )
-	ssl? (
-		!mbedtls? ( >=dev-libs/openssl-0.9.8:0= )
-		mbedtls? ( net-libs/mbedtls:= )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-CONFIG_CHECK="~TUN"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable inotify async-push)
-		$(use_enable ssl crypto)
-	)
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl))
-		)
-		if ! use mbedtls; then
-			myeconfargs+=(
-				$(use_enable pkcs11)
-			)
-		fi
-	fi
-	myeconfargs+=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-	IFCONFIG=/bin/ifconfig \
-	ROUTE=/bin/route \
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
-	make check || die "unit tests failed"
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
deleted file mode 100644
index 8ee40bcb156d..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz -> ${P}-r1.tar.gz"
-HOMEPAGE="https://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-PATCHES=(
-	"${FILESDIR}/openvpn-2.5.0-auth-pam-missing-header.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
-	make check || die "unit tests failed"
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
deleted file mode 100644
index f6859b6c7e04..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-HOMEPAGE="https://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-PATCHES=(
-	"${FILESDIR}/openvpn-2.5.0-auth-pam-missing-header.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
-	make check || die "unit tests failed"
-	popd > /dev/null || die
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-
-	else
-
-		elog "The openvpn init script expects to find the configuration file"
-		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-		elog ""
-		elog "To create more VPNs, simply create a new .conf file for it and"
-		elog "then create a symlink to the openvpn init script from a link called"
-		elog "openvpn.newconfname - like so"
-		elog "	 cd /etc/openvpn"
-		elog "	 ${EDITOR##*/} foo.conf"
-		elog "	 cd /etc/init.d"
-		elog "	 ln -s openvpn openvpn.foo"
-		elog ""
-		elog "You can then treat openvpn.foo as any other service, so you can"
-		elog "stop one vpn and start another if you need to."
-	fi
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 20cd58c60ee4..ac64c3e3d3c7 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -130,7 +130,7 @@ src_install() {
 	# install examples, controlled by the respective useflag
 	if use examples ; then
 		# dodoc does not supportly support directory traversal, #15193
-		docinto /usr/share/doc/${PF}/examples
+		docinto examples
 		dodoc -r sample contrib
 	fi
 
@@ -139,12 +139,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use x64-macos; then
+	if use x64-macos ; then
 		elog "You might want to install tuntaposx for TAP interface support:"
 		elog "http://tuntaposx.sourceforge.net"
 	fi
 
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
+	if systemd_is_booted || has_version sys-apps/systemd ; then
 		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
 		elog  ""
 		elog "server:"
diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
new file mode 100644
index 000000000000..9a9fa8fc3a23
--- /dev/null
+++ b/net-vpn/riseup-vpn/Manifest
@@ -0,0 +1,47 @@
+AUX riseup-vpn-ip-location.patch 445 BLAKE2B d1b43da1c39baad62bca64c922ec5c2666e7be38db6e5402bc616f02e7faef4f3884dc8141c40d25edb147c27c2234d1b90e116696eac022d95066b527222f8c SHA512 051ffb1107d5d4c7fe0be9a158d7b2b5d90ff3aad60918449c56671e541662dfd0163f1d62eb88ac95ae3aed88917efcbc085ae9a41d27706a154b51dc24e82d
+DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.mod 36 BLAKE2B 18848dd9ecba98ad55023c343e68149c2a86e1fb1cec95cfc36d58f304050b29c4a8a0b108392e8daca2f201b0a7bbc30b9e5f5ea54196433c9c6a37ed4c5522 SHA512 ce08c7ff89bfcf6d9e56cec299cb0befa012493384be6f1d6d6b0ab2875d91cce640cc8df51c660ab291cca52c53cbc98bfb465bf569fcad351fc5c126ccaa87
+DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.zip 2199 BLAKE2B 7b996b10c73fec0c9cb1c038245bb3bc04b297443b853df62b1ca910476162cd984d52b62b4b0c76c35bb69aab3129f880602fc726af78a75990b4444f61ead6 SHA512 3f9d68dfc635253670f55a36e2257956eaf08c186ef4aa768e7d0e445885070ad39461b97a3fcef276df8bac31867a733c690e4cb32f52f59d5ab365f0473e66
+DIST github.com%2F!operator!foundation%2Fobfs4%2F@v%2Fv0.0.0-20161108041644-17f2cb99c264.mod 43 BLAKE2B a97856b301e7add28f30c43da9693c6df2e96bee193c1ee14712f6c87d6f84cfbe2072e13603e0309ef346d1fd72504f47c66242e3d62a852d6f98e5d16e0a49 SHA512 8ce3244a1456706dc0acf147c7bb1001942d34f3701b0dc02c9af9ede2925d656a1d21b8e39dbf2b288fcf1b36bd5b9aa24203019fbb2c927e4a7330598f3233
+DIST github.com%2F!operator!foundation%2Fobfs4%2F@v%2Fv0.0.0-20161108041644-17f2cb99c264.zip 134378 BLAKE2B 5c5011e255e5625c357b4582abe7668582a72657b3ebb541d590d09917cae95f4360fa0e825b22b1088405cf818aa035602bcb38c50e53d47a85813edc36f2a2 SHA512 9ba1645dda1a5823ce6311065f19645916b10032ec74084698b5ae24fdf100fb144ae78fb3395948164b448e6dc9a2f8fa8d9f5236f1f8934ff4aabc71d9780e
+DIST github.com%2F!operator!foundation%2Fshapeshifter-ipc%2F@v%2Fv0.0.0-20170814234159-11746ba927e0.mod 54 BLAKE2B 9463b3ec74c8b0e2d431d0e70fa50604cb44259c2e51cd9e61eff1545f3be18951a271fc82acbe5c069b85dc41ae0b967c50ae6ead0c8a512bfa99aa45ee82a0 SHA512 f4d9ab0c9f828d257951c76890e54a8e963790de026d3f5ce7c71bcebb59ce1b19f90d6164b066a5f90e562aeda581986a2ed08892120c2a03f483c8f3e170ca
+DIST github.com%2F!operator!foundation%2Fshapeshifter-ipc%2F@v%2Fv0.0.0-20170814234159-11746ba927e0.zip 32111 BLAKE2B e35290aa4c68070179d1d09acdc014c7da0e5e8b14112ca6b6aaefdb4378b203bbb7f66f3726079c7118dd188a142482fd3ed20062383c1c6f077a60b54fe7ab SHA512 0b0bee0cfec507c1171bcfd337d35a8a04bf330605f64e9c644ee3fcda97d304e097fcacb11bb0e86096f747b32157b794cea815e61faf29f1e764cf02e4c8d6
+DIST github.com%2F!operator!foundation%2Fshapeshifter-transports%2F@v%2Fv0.0.0-20191101030951-7a751b0500f4.mod 61 BLAKE2B 63d558d3837ce143001b0b9ed7a89ad2a0cb63e49f14d339b66fcf2e97e693b0e85a89b6dd1c8b0528ca0d8e58e881bdd186d8211d1df3ee3702c5dc6c828407 SHA512 0bdec413bf7d73f98c4ab3ae24c3dda68e06f3aad126436d89c38fa756f1ea4b5e13d737455f511111d72f02bd490e472859ff5ef62f0ed4bb9d63f4fdd8879e
+DIST github.com%2F!operator!foundation%2Fshapeshifter-transports%2F@v%2Fv0.0.0-20191101030951-7a751b0500f4.zip 79748 BLAKE2B 2b850c2a4415b8c1ae914fc5f393383d5af62f6f434a411f54a300d753425d008bde22baf1eb3d6619cabaa8e369932d709fdf06fe1df6dfcae630ceed057c5c SHA512 af10af72e49ad977d76adae0f5296b4669d495b75db5615510375ece80d76985f0405637bb1e8457f58ca3d29fcc882ffbbba9e607f314f803783b0244cd1101
+DIST github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.mod 42 BLAKE2B cb05e18c5376cec012392d35ff01707e89b1a61ac0eded39ddf9766548acbe199221af35654b0e9a33a99a092ad07ebe9e621b81dde67f396b2d20e680dc92fd SHA512 98e26068a1c7da5e4a05d4abfaa835ad42bc9d98c8b636d92ea2140060ac9cdddc11a3c416784de39446973cc121f32bf95e8c7b73ca23830e1ff1e65718aa68
+DIST github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.zip 6615 BLAKE2B f3438820f0bfb667f3d54ef5ca64fd79010ba837da2cff7aa9a8a1321e8c4cc65066fa1371ba91f964e0525a55aae43a1bcaec5729fe0c71a1077d80a607673c SHA512 84543d41f69f8102c992876275c82160b6f42ae8fe12eb5168710478fadf02a5ebddea2f3ac2195fb8bfc757d177db304ac3edcb2b918c02fb5472ec80d82d30
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 104690 BLAKE2B 7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0 SHA512 8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854
+DIST github.com%2Fapparentlymart%2Fgo-openvpn-mgmt%2F@v%2Fv0.0.0-20161009010951-9a305aecd7f2.mod 49 BLAKE2B 6f751017aead1f28a71bd72592392a1b939b631db91caf59c56b9dddfbf6ff7751c0d46df0aca63c63d9498b077593d14e7199313075f5e1a263bc17ed8bfd6e SHA512 7c0c132bcf7e2980b25efd7f37cfe1ccdb79e7e5d097778677e127ab17d7c72c18dc6bfc48c23b16109f670b471fa550783bfb9dc4d9fa2fb30ae4c09e77bd11
+DIST github.com%2Fapparentlymart%2Fgo-openvpn-mgmt%2F@v%2Fv0.0.0-20161009010951-9a305aecd7f2.zip 17001 BLAKE2B b3dc06455a7e36f9d6d8e734f9aecca49a999a6d9671f2f429f346f21b88823c17b3ad8a499492e795efafff7f83a9db7d15aa1679f3e72e3a3928c4ba0545ca SHA512 99e4fc45d97e4f2e283725037795ca75f1bb1cc8ccf542e061890aedd37ccdb0c91e5ef125dbb63ade9aaad2961aec27a454d8e37d521a1b2a07b18383a2f0ec
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb SHA512 e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef
+DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f SHA512 fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55
+DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod 34 BLAKE2B 478d9f3a5b214f002fcd08abafc3b9738ee5a997c612d017bf40def473be58c81d69489ecf546cae460f2ee38c9489ccb1c3bcbf1c27ca572169425b059c3019 SHA512 535a205c3f8b1d8c1c0cfd13ad5881f0174977c0de81ab5927d5c23c99f067eebc8f5c371530234f9626252f52832c3e8d229ab3c0dd6472bd570ac4464c7e36
+DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip 8274 BLAKE2B 9f7261226e45d83c0c0645eb1df0e99fcfd3e5de3e0f4bdfdb702aa81f6e4f9b9d0e5a36023c2c723893e10697acce9b32e8a806e9e231d9d150340299f9224e SHA512 0ca91b5d7133f7e71ba33e41f5d87b39eee842986f7c356c1751d03377ca266743b1b00ac912631b8c96f82de03109e3141273730accf160f1a2b91791bdf016
+DIST github.com%2Fkeybase%2Fgo-ps%2F@v%2Fv0.0.0-20190827175125-91aafc93ba19.mod 32 BLAKE2B e8df7db581962b31a4f50e890d8991ec465b2f975f60d4bfbccf06ff0ea72367a6a305aedfe8571769be1fce3df1aede4adb01a0254c4f3c121a6ac4e7942d0f SHA512 29c40abae6909571a21eb3ff7a07807e75d4ba51ea904105457827aba9ceadf6992c43b73a8b3f27c4e0a1d8b69332c3e777dcb4f67b1b7efa6804a60b1e2f67
+DIST github.com%2Fkeybase%2Fgo-ps%2F@v%2Fv0.0.0-20190827175125-91aafc93ba19.zip 19175 BLAKE2B 9548e332723772199c0d1570e31c7dacc0b520066c761ac21bc60975b70a6e984b6be50d78315677dfaa9385012bf0dd2f38caf0456d54200d17ed06f62fe062 SHA512 1f109d7c46e7cd361e2ad4b9801e2be6acdfed0ee7adcd6309f16480207c2b9d6af342245ab62f36d9936b31e7eeb0c080fc280d84e2d41edaa4f5364c53e138
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.7.mod 41 BLAKE2B b8168afe16d638d362a5f5792c851874a8c6bf55d9dd62680b84cc0efcd2272c8831d0a8ab407f3c8a60b6daef38417d381b0205a76f218082561cc800690942 SHA512 2b8d8c859733b4440c64c391fcaef7e7cd30d2cf911e48c09b435a509880aabd9cebabea55c2ed891b762ee49c0ffa2a52c3db5d7f57ccc66cd0db3907e10db0
+DIST github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.7.zip 180844 BLAKE2B a793c9a5752af756fcf5bb2ee2a6b0ec2a6a1ed79b8ff8c6b43278e9d3a2e14d45ba84e42a25e3b28d840a88b92aaa10209bf60f6ad65cbb77864d98ca78a8c8 SHA512 40f59864fe85cb7548d751f6bd3b7cb6053325476476fc76b206cd1d7324c5260eddf19a2a72d14223a063bfa04eab7ec041e287d3974bd32d8067eddf4be002
+DIST github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.mod 36 BLAKE2B bf24b6a9ff886b4536e7df9b8667f3663f74d2591eb4c716846224f52dcba57d54380d02b283a5e2c1fa8a3f5ad5bd09b7ee29180efae41a8db7d6eadfbdf1b1 SHA512 eeec8b9435f18e3329fe3373307bd8b6330f22747bd9349147d31b704435b0f5e5f62bf4cceedeefa598fa9cd16041d5d2b9bb0ada2e312db21b89e3264d173f
+DIST github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.zip 71423 BLAKE2B f0f4a9ecb3c7702e5714fc412ab275fcf506124868b98e7cba5b993d3f2fafc0d2496397079030568e6377bdf3bbd5d7fc75d5cc0ab1a03a7eeed50815e2a928 SHA512 e331647c37bedf2d95cbd550f6b13669a677f30ec82872eca3d66f13a671ad25db3f7bd778ebdf76a0639a13aa400219479c116528027c5df8a3d30871e11050
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191105034135-c7e5f84aec59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191105034135-c7e5f84aec59.zip 1845085 BLAKE2B 107ce7f8a1ca3dc87cabb4be27b41fb15ea9fa1d7b9234f3ff6cec0f968fc1b335f0e6f514c9ef381d69367c2f70d2a36b22b3553d732cc46d0b0f012075c2f3 SHA512 c4a6da69f26132924d0438f7b0b8f8ff22b9ccf6bc66cd6968b84202a6b2b314cd6f842a560832a9b0a9c6947d10f28bd6c95d9d6b2cfef947cb6495268d43b2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.zip 1500176 BLAKE2B 19d7d151e8d60007d2f947acca62dac5191c8383b951d0b243b70b36e132eb15749352bccb94aceae00ff114a3273bf79acab4043520c34ba76d7a5e137e0366 SHA512 61a5ddd9691d95dc88f2a147f9a07fcbd69f2c1b573cb8ae895fcbbcd0b4f0a928243cad62efabdfe0143b8aa06e61e29057406ce3b3863c4c22fc01432293f8
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.zip 1916451 BLAKE2B da323af18ec6dbb2c7cfcc267ceaeddb5e452789f3ed5797345020ccbf118992e9972fc652b20d8cd5a023c96613d5a770f71e6384b6576a271bc322d02a450b SHA512 13fcebd117456775d53483f713e5a090321ab1159048b92252aee953c294dc174d7f5695e8d09f272203786143bdd6b15ff32c979aef5a30b442a56aa09d1a7d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST riseup-vpn-0.21.2_p20210517.tar.gz 5332313 BLAKE2B 0f9673ba0908c60c2c31c032d48a4b9b0c31e8a8e2621c84c673f006f43aa6d41d2b6f5567a0ee73ad74d8b7456618a00a177af9fc65b0bf28765983e96ef20a SHA512 88fd43e922500aaeebb80d7f4bf290f9511f60fa58c2a2b3ffd3930508630d2d8c5fb92ca5012689721545a6656135defe3ebe420c04defb53316cda93ddba6f
+EBUILD riseup-vpn-0.21.2_p20210517.ebuild 4798 BLAKE2B 09d9745a7cb94aa977f11a2a6daa0e5f4584e22f6cb91df03e5c0f864c9029271a367ba75aa3d8bd2becbe82e9981061773505de2d099f33eafa8c97cb8e66ec SHA512 5efc73ed57f3863b427461fdcc668d4a27a90b0ac558a4c49e16db797a434295da51d400583dd6e9513163cbc3ab2d9d04326d2df1d52e30e1aa34926c0b6eab
+MISC metadata.xml 1043 BLAKE2B 342f9bcf0fc9a679dc7f42e0b61c8c2767ea99e72923e0431a091e97cee8a3e3252562394b471e0ab5bccf08faebaa98bd2409fb352b80f4caaea4c3f2ef65e7 SHA512 b9f4174bd7ad0212f0864eb369fb1df4fbc8c6a2e44b165187700e3bdbe8fd573b44e291b8ea283897b9fc9ed06ff12ef8f1666b7057a75507c1393a3beacb78
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch b/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch
new file mode 100644
index 000000000000..99c7d5255962
--- /dev/null
+++ b/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch
@@ -0,0 +1,13 @@
+diff --git a/helpers/bitmask-root b/helpers/bitmask-root
+index 13ba407..7c08b21 100644
+--- a/helpers/bitmask-root
++++ b/helpers/bitmask-root
+@@ -106,7 +106,7 @@ def swhich(binary):
+ 
+     :rtype: str
+     """
+-    for folder in ["/sbin", "/usr/sbin", "/usr/local/sbin"]:
++    for folder in ["/bin", "/sbin", "/usr/sbin", "/usr/local/sbin"]:
+         path = os.path.join(folder, binary)
+         if os.path.isfile(path):
+             return path
diff --git a/net-vpn/riseup-vpn/metadata.xml b/net-vpn/riseup-vpn/metadata.xml
new file mode 100644
index 000000000000..d832d42927a6
--- /dev/null
+++ b/net-vpn/riseup-vpn/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://0xacab.org/leap/bitmask-vpn/-/issues/new</bugs-to>
+	</upstream>
+	<longdescription>
+		Riseup offers Personal VPN service for censorship circumvention, location anonymization and traffic encryption. To make this possible, it sends all your internet traffic through an encrypted connection to riseup.net, where it then goes out onto the public internet.
+
+		Unlike most other VPN providers, Riseup does not log your IP address.
+
+		Riseup has a VPN client called RiseupVPN. This VPN client is super easy to use! You just install it and run it—no configuration, no account registration.
+
+		This is an experiment to see if we can create a VPN service that is easy enough for everyone to use and that people will donate enough to sustain.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild
new file mode 100644
index 000000000000..6ab61fb41f19
--- /dev/null
+++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+DOCS_DEPEND="dev-python/alabaster"
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit desktop python-r1 docs go-module virtualx xdg
+
+EGO_SUM=(
+	"0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2"
+	"0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2/go.mod"
+	"github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264"
+	"github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264/go.mod"
+	"github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0"
+	"github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0/go.mod"
+	"github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4"
+	"github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4/go.mod"
+	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a"
+	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
+	"github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2"
+	"github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/dchest/siphash v1.2.1"
+	"github.com/dchest/siphash v1.2.1/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19"
+	"github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/rakyll/statik v0.1.7"
+	"github.com/rakyll/statik v0.1.7/go.mod"
+	"github.com/sevlyar/go-daemon v0.1.5"
+	"github.com/sevlyar/go-daemon v0.1.5/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59"
+	"golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	)
+go-module_set_globals
+
+COMMIT="c6c0209ad45fb7d2e45370ee3a39f2dd437603b0"
+
+DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask"
+HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net"
+SRC_URI="https://0xacab.org/leap/bitmask-vpn/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# Generated with dev-go/golicense
+LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="
+	virtual/pkgconfig
+	dev-qt/linguist-tools
+	test? ( dev-qt/qttest:5 )
+"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/libappindicator:3
+	sys-apps/fakeroot
+	x11-libs/gtk+:3
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+"
+
+RDEPEND="${DEPEND}
+	net-vpn/openvpn
+	sys-auth/polkit
+"
+
+# ip command is in bin instead of sbin on Gentoo
+PATCHES=( "${FILESDIR}/${PN}-ip-location.patch" )
+
+S="${WORKDIR}/bitmask-vpn-${COMMIT}"
+
+src_prepare() {
+	default
+
+	# do not pre-strip
+	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
+
+	# add autodoc to the extensions because this actually
+	# does require extra dependencies
+	sed -i -e "/^extensions = \[/a \ \ \ \ \'sphinx.ext.autodoc\'," docs/conf.py || die
+}
+
+src_compile() {
+	# does not build with j>1
+	emake -j1 build
+	docs_compile
+}
+
+src_test() {
+	# these tests require internet access to connect to Riseup Networks
+	# the UI tests do work though
+	#emake test
+	virtx emake test_ui
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "build/qt/release/riseup-vpn"
+
+	python_scriptinto /usr/sbin
+	python_foreach_impl python_doscript "helpers/bitmask-root"
+
+	insinto /usr/share/polkit-1/actions
+	newins "helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
+
+	newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg
+	make_desktop_entry "${PN}" RiseupVPN riseup Network
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index aa137344370b..2d54c1ca0cc3 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -10,9 +10,12 @@ DIST tor-0.4.4.8.tar.gz 7699461 BLAKE2B 4d314cefdcf49d41367764028ed38b5acb320dae
 DIST tor-0.4.4.8.tar.gz.asc 833 BLAKE2B b69ab73743b5c18eb006113fe0ac561f6b44536bd6e320015dc1aada7592fdab9a5d5a36efe5e878623f424154fe67475424d3572446ee546c25b22494ad82bb SHA512 50280a788a1751c85f22080e933b6c80820f01003b23e9eb788b952ed0a6ced5374b2e927cec4d287cef7ff27ca8d86da93d3e7af7351fc6e1a8160fbb49c60a
 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.6.2-alpha.tar.gz 7726760 BLAKE2B 01bd4b5b1b5f675b880b8ded422871a0f7538f3206ab86c6ddb12d99f6279c052d5b1d6f139231f9f9b989c18b0027854530e7a66a1a48ab5cbd5496747c23a3 SHA512 4a3d20389cc5516b45448a001d50488a30e959f256be45e91dafdadb0f13339099d183d3b1a7e4f5ca1f4861312151849f8ad8e360d5f07e8135ea7cfbb2ed5f
-DIST tor-0.4.6.2-alpha.tar.gz.asc 833 BLAKE2B 06afc9a4d5b8baa57cd8fbcf2a2c13ebb0f3e26c3682d4d2317557885a6f7f840cef2afe7cc7817e7c665ccdc6a6687c2bdbb645ae2734b95a2766b44671044d SHA512 72b2930c741f8fd6d9c3b97ccb296ad6f6a2ca0b62421ac2b8d1bc81c1d294e664c95659c1ebe884a89200a7b2eeaf6eb1fd646881417833fe67882f4d9ff3f3
-EBUILD tor-0.4.4.8.ebuild 2550 BLAKE2B c119ed3b538a7e81a1c32a2c6b4d8bd2d74c9524894a5cfae8cc9f6f7ddafd94519bc1f33aa37d3861626ceb1b4de2700ed24aa5a4bbb0fc1eace3f208c892b2 SHA512 8c8bc53ded727b9919762a9d4d000bd7560765b83fc62401974a377cf495b1888cab3920ed84426c64f45bb296e8fdd853a990941e01514611d58b34ae8df80c
-EBUILD tor-0.4.5.7.ebuild 2541 BLAKE2B ae1d9127c828b13a877e7d620c70863f473daf722ff0cecc26b4bd2fc0120c24183c930fbc1d24f3cd0be7e3269644473bc75ad910d7e56e22093cf1f0ef908c SHA512 45a469f5e22244d2d5138bba4994c60fc889d19d3cdbe02c3e6d4a105d1d773467a7411ef2e073e7230756c054e9bbc03991fe9b7f844764270737ded22490e6
-EBUILD tor-0.4.6.2_alpha.ebuild 2495 BLAKE2B 44d1a3f74a3d3fe08cdcb77f28819aae0aa69be1c48bfc83923276bf2a77a9e8a5c25e885a99ec899f6ab18a16c9c71a470f52df767ee6a4fc35f6b44c629ffe SHA512 c26ad68597171949198e0784e2a2805c57a6eadd6db6c295f0b654d92c73dac1eaef867282ec44cd163652b8d1b0c4f05fb0fc62451802ed240488b1c35bc920
+DIST tor-0.4.5.8.tar.gz 7826458 BLAKE2B f81f690922ce2e46083706dcf8173720e95274878c17e2b2754d347cdfb4324d2c3ac50c787b501b37e00dc8387a7d6d44dc2d4e85b7afeb61964fbcdcf4d7b1 SHA512 f5cb32f5d0fc333aa1607370e290e6be85230896bd26e00072a68db4b32293d5dd38cccb57e92941fbe6ac17fb4207c38d11e3095ede289c3a6ebbd64ed70119
+DIST tor-0.4.5.8.tar.gz.asc 833 BLAKE2B 80be1b4981771c797b15cf695299c32e68acc4fd5e880d794479956fa75604088cd26f7e99e1a11e10290786b00ffa40f099ac11b9a75d6bd557ed30caf3d605 SHA512 3fd05701f908434eed13970abe989182b9b6af0e4824d1d258a74ce29230a928b06d88d5c398d7031d71048fbeb46185a9d76d8a5d239ee3c58cf41f90ae08c7
+DIST tor-0.4.6.3-rc.tar.gz 7734759 BLAKE2B 13f96813db9aa77416b0c5a9031b84ea4a42ebd1d4c6b2740f009bbf10fea3f49591a307fa8992007d6b92413d755875d74d478e8192284f32e692f448180bc3 SHA512 0d9d400e0d61a15ef801b430e0acb7eee369fdd62b78e450759d2fa08363e78bd2a301ce87796a37ab8630ce4669021b5100dedc1ffb983159893b1769d01a61
+DIST tor-0.4.6.3-rc.tar.gz.asc 833 BLAKE2B 15b614758f719916ba38a1a70f99aff3d14d8b38105963edf708987dc383d9157024b1dfbf7e248a6275bab33cc1a8d599a14a08e29d4d9986b9b0ffbd3e93d6 SHA512 1fc31fd4cd4c1d40e25797b0bdf2408bc81ea664e31ec21961b81f25d13b4ddbe7e6db9a50c52e6f5492d7177817e753d7bd3383ac6486e6f8d6c01bdbb2ce8c
+EBUILD tor-0.4.4.8.ebuild 2794 BLAKE2B 561a2af6b4e64dd50cd04f30a8fb5a67e56d6759a5d6144c19db21b914e9d5be44947d897769a4f8f3d2b6ba7faa73e9d0f36caff73ff14e10934014f0481059 SHA512 3b6b96b82ba712d4258818cce58a51baaa097ac2c249ba51ed53e9c689ccc85fa7e43ee44c62919911c8474eb106ea1ae5384272e2751cb6331954b315221dfc
+EBUILD tor-0.4.5.7.ebuild 2785 BLAKE2B 806c5ed6f41d3f7e792127dfdd92d7d015a6f5b9cfdf182523896503ef86bc72a239abfd20f2badca408254a04e8b440e4d1f405794c02385a5ffcd9270bcbe5 SHA512 42a07d094edff6560f6b20c588ae6ec41ccbf20a5bc8dd3255badbfe2f09c07bb739356120ea4b6d4287b4b03652c17d32f46a511111d6040b6a8d8074676f18
+EBUILD tor-0.4.5.8.ebuild 2547 BLAKE2B c92a1e8d85cee22ca2f23781c433154fe7b2276e506adacb5213ba0262ab997b6d2c5b261895c1da3dba21c805483e475ce320f6c3cbd7ea627130aa9f4f4b3e SHA512 7d225ab54bce43b0d1028129141aae604092ec3a2a6f35ac4bf6a4ac107067a0c4b68266b3df75134065cdf38778a95b6c277175ea3074b727f15fc6ed1a546b
+EBUILD tor-0.4.6.3_rc.ebuild 2739 BLAKE2B e9f1b852aed9b3124be411c407f4c5686ed8645957b31acf1aedc349b3290cb0a745b7c28801fe19415c2a5531064fa596af50e3db0e0143aa0a883cb983ac31 SHA512 ae8ca192172d72aa4829a4760a6d4734e0895153eeb6fc785a98aea4fdbd77c094af1b288f3b5feec6db8a897a1d23cc59a5e842488bb3678c91b6e8175e864a
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.4.8.ebuild b/net-vpn/tor/tor-0.4.4.8.ebuild
index 6a411102af45..bdb635b77531 100644
--- a/net-vpn/tor/tor-0.4.4.8.ebuild
+++ b/net-vpn/tor/tor-0.4.4.8.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="7"
 
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig
+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}"
@@ -16,7 +17,9 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+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
 
@@ -38,6 +41,13 @@ RDEPEND="
 	${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
@@ -47,6 +57,10 @@ 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)
diff --git a/net-vpn/tor/tor-0.4.5.7.ebuild b/net-vpn/tor/tor-0.4.5.7.ebuild
index 5616d54e5b3c..82738f38a284 100644
--- a/net-vpn/tor/tor-0.4.5.7.ebuild
+++ b/net-vpn/tor/tor-0.4.5.7.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="7"
 
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig
+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}"
@@ -16,7 +17,9 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
+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
 
@@ -38,6 +41,13 @@ RDEPEND="
 	${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
@@ -47,6 +57,10 @@ 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)
diff --git a/net-vpn/tor/tor-0.4.6.2_alpha.ebuild b/net-vpn/tor/tor-0.4.5.8.ebuild
index b44a8e126c1f..b89880165801 100644
--- a/net-vpn/tor/tor-0.4.6.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.5.8.ebuild
@@ -40,6 +40,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/tor/tor-0.4.6.3_rc.ebuild b/net-vpn/tor/tor-0.4.6.3_rc.ebuild
new file mode 100644
index 000000000000..b58b53b2f97b
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.6.3_rc.ebuild
@@ -0,0 +1,108 @@
+# 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
+)
+
+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
+}