gentoo resync : 25.09.2021

11 files changed, 80 insertions, 72 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 30d8dffb8134..aaf8ffd8948a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index ec696ad3245d..a59062f0e7ac 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,9 +1,8 @@
 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-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2bad43a1858b55fb6b502bf0c7fc975958e7a88fe9cf2bb331330e7aa70f13a3d9ce64fb525060bd84e965af5f2 SHA512 d2460d1d1b65222a0e3b89e464e75b2fd94fc65a49afe78a26c19e7a3c097b2334c02d58faad5f4ff06e3e4847425ed383f1963be2dbb9282a77c5b287a30fe2
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
+AUX i2pd-2.39.0.initd 1440 BLAKE2B 081cc813db1cf25b81d3c2b51315eb6f6d6e95cf1350c5ded76107361b13f3add2e3d583e7cee177e22ce2a4c9bc99183af8145fd08145e531afd55cb9255438 SHA512 b16a49e72a0c0a0a2fd2f067bc35b4374de8fc606c9ea5830b84b630b793ce4bb7e0fa41ffd95bc651bd20e9e13889b05be49d868c2c67bbdb7e690b70281dc9
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
-AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
-DIST i2pd-2.38.0.tar.gz 555543 BLAKE2B a47c4b77e3a1d4c88cfd18b288b53592a8096509e0bed01bbf57f8d81b715699f822059cd9eecc0deb8fc82d98c23a8c0f6a67ac71654da528f81785338bfe54 SHA512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f
-EBUILD i2pd-2.38.0-r4.ebuild 2020 BLAKE2B ee4bfa727f8ebc50d1b8d5970db42bee3ea85b20fcf1c908280f9999bc63ec802ee29d7b45b15b403bf8477e7c2819231417095b335a3cb8546ada6e14b2485d SHA512 9c74c5774ba3e5565cdbcbf679b144e02c9ffee00eef28aa3c8bea71bee6d1011914ac1ca39748ab80a55a28b4b9e69e5efcaf4b1083e6229e166f443e4ddcdd
+DIST i2pd-2.39.0.tar.gz 579825 BLAKE2B 14f4167fd7752529f513f89cf9d08fd9dbf086f9336c5dae47ef30fa81a753c955de7e622131214f6924a7af8fb62e6a3b5b59c8ae0d407ed7305c3c6dc8a692 SHA512 6b38e6e2e763e94ffe9d11eb2f9a0e9554560bb4fec95891240adf5bc0a9639f879dac4ff3712a9f8e00895b7bbeabc854887e61fe9f9755c33f96899e20aa76
+EBUILD i2pd-2.39.0.ebuild 1978 BLAKE2B 03990127224de9dab073e6079891d077625701c91bf1d704b468dfdb5a1f2ee03ef2eb844bff6dad95c8b5f1e07feed64afb018f7b8f0d801269a742883f1115 SHA512 26eec820e07dbc1a1bb5a524c621dc251227c384a2743b1a3e1d61357a507b1d57c0c64c7ede910ee739050ee5a021459faabd0e6d09a91a3e12a687517fc245
 MISC metadata.xml 728 BLAKE2B 37fbc9a6966478aa61c9c67e20835bd759dc46ec88e4a575974acb872e3f73d093ec354399441b64b283d16ebbd9b6d23bdbd40e38c483a184f0700d01e1f179 SHA512 927d1fb8cafb87bf199e7e67bbc6edffd08eb7e7b50c8b7a7bf16cf5cbe3dfef32fca387b5c861c8e4aa3336687022a6978a7084e730d1dc6308c3db6152d309
diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch
deleted file mode 100644
index af0590be32f7..000000000000
--- a/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
-index 949f6a46..a6d29990 100644
---- a/build/CMakeLists.txt
-+++ b/build/CMakeLists.txt
-@@ -103,8 +103,6 @@ set_target_properties(libi2pd PROPERTIES PREFIX "")
- if (WITH_LIBRARY)
-   install(TARGETS libi2pd
-     EXPORT libi2pd
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
-     COMPONENT Libraries)
- # TODO Make libi2pd available to 3rd party projects via CMake as imported target
- # FIXME This pulls stdafx
-@@ -135,8 +133,6 @@ set_target_properties(libi2pdclient PROPERTIES PREFIX "")
- if (WITH_LIBRARY)
-   install(TARGETS libi2pdclient
-     EXPORT libi2pdclient
--    ARCHIVE DESTINATION lib
--    LIBRARY DESTINATION lib
-     COMPONENT Libraries)
- endif()
- 
diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd b/net-vpn/i2pd/files/i2pd-2.39.0.initd
index b09b4454e96d..c5248b20cfee 100644
--- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd
+++ b/net-vpn/i2pd/files/i2pd-2.39.0.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="C++ daemon for accessing the I2P network"
@@ -37,6 +37,11 @@ start_pre() {
     checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}"
 }
 
+stop_post() {
+    # #808845
+    rm -f "${I2PD_PID}"
+}
+
 graceful() {
     # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds
     ebegin "Gracefully stopping i2pd, this takes 10 minutes"
diff --git a/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild b/net-vpn/i2pd/i2pd-2.39.0.ebuild
index 48d52261fdc7..a97df49807db 100644
--- a/net-vpn/i2pd/i2pd-2.38.0-r4.ebuild
+++ b/net-vpn/i2pd/i2pd-2.39.0.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
 	acct-group/i2pd
 	dev-libs/boost:=[threads(+)]
 	dev-libs/openssl:0=[-bindist(-)]
+	sys-libs/zlib
 	upnp? ( net-libs/miniupnpc:= )"
 DEPEND="${RDEPEND}"
 
@@ -26,10 +27,6 @@ CMAKE_USE_DIR="${S}/build"
 
 DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
 
-PATCHES=(
-	"${FILESDIR}/i2pd-2.25.0-lib-path.patch"
-)
-
 pkg_pretend() {
 	if use i2p-hardening && ! tc-is-gcc; then
 		die "i2p-hardening requires gcc"
@@ -66,7 +63,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
+	newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd
 	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
 
 	# logrotate
diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index 4d4b40fe5ded..52a5060e572d 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -1,4 +1,5 @@
 AUX riseup-vpn-ip-location.patch 445 BLAKE2B d1b43da1c39baad62bca64c922ec5c2666e7be38db6e5402bc616f02e7faef4f3884dc8141c40d25edb147c27c2234d1b90e116696eac022d95066b527222f8c SHA512 051ffb1107d5d4c7fe0be9a158d7b2b5d90ff3aad60918449c56671e541662dfd0163f1d62eb88ac95ae3aed88917efcbc085ae9a41d27706a154b51dc24e82d
+AUX riseup-vpn-respect-AR.patch 1700 BLAKE2B ec94095cc7e239add206595d7861260026f00d1c42ab01f2d8093c5f33b9e66bf9923bb4f526deccf92c798a2d3b565bcf159c76192983cbe4d058fa927f6faf SHA512 88b449abff3a015f499ff69d595421aa9c58d51d21b739c6c0532f889b822a07ec506c94ef5d05cd25b0165ec2c1f0056549069c18c8fd6d997db32e1ae2dd44
 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
@@ -42,5 +43,5 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE
 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 riseup-vpn-0.21.6.tar.gz 5404265 BLAKE2B 2dcae7aaa3659fe9e8b9910a6c085ec49389551a6d2e404fb5520622e22adff98277fe3962f1dfd3b44d23b8c687855105196e74b89d4bb9890202e97033c5d9 SHA512 074dadcd24c1ecaa21504a26406c5f8f3cdbbe8dffc3679e1c1b62d1978b51b20154edd54d8887868c7458e4c184b8f16aa6ff21e71890fe6b84c0eb2e008deb
-EBUILD riseup-vpn-0.21.6.ebuild 4615 BLAKE2B 9451acfc92cc52f568e87b823df8f413b077a421dc61d421ca197c7bed05e22982c8f00c496bdbfb838c86683e1687d3b24ab8579a7663cfda0fb0761c65146c SHA512 ee1f2e86f47ae2b2fc5c1b640400b6d9808b33c4cb63ff97f707f3eb93d7e46b6af4f31a006c1a0a21840bc46ac0d785c2181aaf7e9763daea374a15d8c5305f
+EBUILD riseup-vpn-0.21.6-r1.ebuild 4729 BLAKE2B 8ce437ecb9e9e09eec3410120fb570476424a73361371c06aa3ebf721bfe20d25b77d2a39360d2ecb4e563a195fb7d2181a44185c41c572983761a40ba97490c SHA512 91a0a27f33c47904fd557fc8da907060cfd1bd82df968d073d19f9de5389e96e6ceca5a99af5eb76ced43551956435d8b2c4330c2a99be2905e1d7d2e7e550a1
 MISC metadata.xml 1044 BLAKE2B 28fd241b8a0a7cf97f52b56f854a1337272ddb652ed782448ccd71a3be6df07e4791cf1fcf21ee1750f6b498e1d9cd30e35c778427c04af2e4f60b709de7c8a9 SHA512 fc8e0f86bfbb7dd808f145284c81de8670341ec1ca8ce62e8dc4b9ef3aff0a8ff5c1bc72ea6946b0ec742adbd49d977e9a442dd7f075b3649ddf5304fc7fc735
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
new file mode 100644
index 000000000000..431ab1376c65
--- /dev/null
+++ b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
@@ -0,0 +1,38 @@
+diff --git a/gui/build.sh b/gui/build.sh
+index 56e3d66..9e519a6 100755
+--- a/gui/build.sh
++++ b/gui/build.sh
+@@ -63,13 +63,13 @@ function buildGoLib {
+     if [ "$XBUILD" == "no" ]
+     then
+         echo "[+] Building Go library with standard Go compiler"
+-        CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
++        CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB
+     fi
+     if [ "$XBUILD" == "$WIN64" ]
+     then
+         echo "[+] Building Go library with mxe"
+         echo "[+] Using cc:" $CC
+-        CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
++        CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB
+     fi
+ }
+ 
+@@ -77,7 +77,7 @@ function buildQmake {
+     echo "[+] Now building Qml app with Qt qmake"
+     echo "[+] Using qmake in:" $QMAKE
+     mkdir -p $QTBUILD
+-    $QMAKE -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
++    $QMAKE -early QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
+     #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release
+ }
+ 
+@@ -115,7 +115,7 @@ function buildDefault {
+     buildQmake
+ 
+     make -C $QTBUILD clean
+-    make -C $QTBUILD -j4 all
++    make -C $QTBUILD $MAKEFLAGS all
+ 
+     renameOutput
+     echo "[+] Done."
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
index 3b22b5554aed..91db3c978164 100644
--- a/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild
+++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_DIR="docs"
@@ -9,7 +9,7 @@ DOCS_DEPEND="dev-python/alabaster"
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit desktop python-single-r1 docs go-module virtualx xdg
+inherit desktop python-single-r1 docs go-module virtualx toolchain-funcs xdg
 
 EGO_SUM=(
 	"0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2"
@@ -81,6 +81,7 @@ BDEPEND="
 
 DEPEND="${PYTHON_DEPS}
 	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtquickcontrols:5[widgets]
 	dev-qt/qtquickcontrols2:5[widgets]
 "
 
@@ -90,7 +91,10 @@ RDEPEND="${DEPEND}
 "
 
 # ip command is in bin instead of sbin on Gentoo
-PATCHES=( "${FILESDIR}/${PN}-ip-location.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-ip-location.patch"
+	"${FILESDIR}/${PN}-respect-AR.patch"
+)
 
 S="${WORKDIR}/bitmask-vpn-${PV}"
 
@@ -107,6 +111,7 @@ src_prepare() {
 
 src_compile() {
 	# does not build with j>1
+	tc-export AR LD CC CXX
 	emake -j1 build
 	docs_compile
 }
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 8d22aaeaee41..3222dc8fca96 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,14 +1,13 @@
 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.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.5.10.tar.gz 7870323 BLAKE2B cb0b1ee9c997a8837837b5a21e3a18e3efc52f8c056dea65625059b694f5ba76660462510311b1abd30d2659e6c5c5d3f999d42e269d7d7d464676b3f8f8d4d0 SHA512 a6970623696bdd0b3138e51ad3c6eaba13533d537560e1615deb90e41ca508d71282ad526ae6206604889c5a795097a71133bd0e0a9b490f544bff78d9dfa7f0
-DIST tor-0.4.5.10.tar.gz.asc 833 BLAKE2B 8b42bf8e2276ad9f83acf344ddba7db73c8dd3446074980bac339b9021112161944364b5f3d05eae81231ec92846a22fab081bb881133f259a715e242878d64f SHA512 87a60a51c29b8a3ae43b47f0f16e966911e1712ab276cd3da0f8e3194839c6b5c074bd43290a00ff401efd376a7d3100031f8d8e683d9ffa2a35ad709bcaf4b8
 DIST tor-0.4.6.7.tar.gz 7790727 BLAKE2B da6b0fe0de6a334713cf881dece6ef5a932b0f4374a7dde1e1cb78b4b43944fd6156d84bd98c8be734a7cf81b99cb36187544028c3e4800d38d11d7286d19e12 SHA512 e5f9e235fc4b96f5e63e0bfa4ca412d0d11299a31cb77cae1c199b276d0dfbf3656657ddf910b22625dd49eb726d487666e80e8889db78c9edebbab0d80d9e03
 DIST tor-0.4.6.7.tar.gz.asc 833 BLAKE2B 2054c094cc8ce28bfc8822fa6b0ac5a028b41c96160d135da53112c4fcb7ae048e8d48b58f164dd33c6c7dd851aaa71173b2aa36f70411fc7cc2b67d346ce00b SHA512 d45caaa4795d05f1f1a558192c5eedff608c74be0ef933e0ff7a4f68123a109e38e7fe26222c66dfc8966a07f458eeadf77d7f4731d88389595b59413140e9a3
-EBUILD tor-0.4.5.10.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
+DIST tor-0.4.7.1-alpha.tar.gz 7837114 BLAKE2B 87e9cae4fa187b6f7c3f5ed2aa750d6dd4ac3cebdddd566255bf24980dc70b4893f167a1e08e0918545d1533776c57026c30a05dbdf84e80b4f83222dcc93363 SHA512 c88e129d1315ddd35f3387bdd24ac337bf46d47fd403737f5536a8428679bd35ec997ff41910acbd6d9b751f40279e4360fb5b6f2bdb67744a9b0d675595dc42
+DIST tor-0.4.7.1-alpha.tar.gz.asc 833 BLAKE2B 124b7de4c71cdcf2dd79f17d450d6dc4a8cefccd185efed2226e8a2d454a53f56aa86bb43eb1f1d6760cd1ad34764340bd2fa9a2c4e5a581f0db9310bc663aff SHA512 2cdb8483ebd9ca49323346703ca970c10fc0151d91a03535c61e44bab4102f0ffd65008c66ebe62c59596ec6c843910f75b7b75af98e747bff2391dbf9d72410
 EBUILD tor-0.4.6.7.ebuild 2742 BLAKE2B f76a7e441ced00d2c5f8e935468b27c79eac0c15689c84cd6dd3946ab604d481f808b110d5854d7e4a6e6496e656595169b79c7e348a19999fa619a3bb747091 SHA512 1c2aed487ca4c116216ece04af1a71806f51c4858737b2aead93d3be2d40daeb56eeee5c15b5e68e127f6224646a77f8a2eb8b856f8d4aded89df4bddd45a4fb
+EBUILD tor-0.4.7.1_alpha.ebuild 2748 BLAKE2B f32094fc024e199ad7dc5a9254016f4c6eaebcf155bf18d6d54d0c8044fa4d6a50abc9c34dd2424cb6ad4cc39f85ccaf9166d4356fef49f31451cc880d3a8d47 SHA512 398521369076610ff27ffd98754e9a77650b1bd999f73e366b8821bb6ed42475b68dcd10e40b4fce5dcd760da1ebe9b859e6dcb42ff95b4f445d20948a2c78f7
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch b/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
deleted file mode 100644
index 31234c735bc4..000000000000
--- a/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/770370
-diff --git a/src/app/include.am b/src/app/include.am
-index 8bb315fff1..2e2180deca 100644
---- a/src/app/include.am
-+++ b/src/app/include.am
-@@ -28,7 +28,7 @@ src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES)
- src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
- src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
- src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
--	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
-+	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
- src_app_tor_cov_LDADD = src/test/libtor-testing.a \
- 	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
- 	@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
-diff --git a/Makefile.in b/Makefile.in
-index 8e29bf3..5c9d3e5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -6674,7 +6674,7 @@ src_app_tor_LDADD = libtor.a \
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
--@COVERAGE_ENABLED_TRUE@	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
-+@COVERAGE_ENABLED_TRUE@	@TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
- 
- @COVERAGE_ENABLED_TRUE@src_app_tor_cov_LDADD = src/test/libtor-testing.a \
- @COVERAGE_ENABLED_TRUE@	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
diff --git a/net-vpn/tor/tor-0.4.5.10.ebuild b/net-vpn/tor/tor-0.4.7.1_alpha.ebuild
index 7ffede47e2de..ce288604e867 100644
--- a/net-vpn/tor/tor-0.4.5.10.ebuild
+++ b/net-vpn/tor/tor-0.4.7.1_alpha.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig
+PYTHON_COMPAT=( python3_{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/"
+HOMEPAGE="https://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 )"
@@ -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 ~riscv ~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,15 +41,25 @@ 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
 )
 
 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)