gentoo resync : 12.05.2022

8 files changed, 11 insertions, 596 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 5db9e3758439..26703ac951b0 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,26 +7,9 @@ AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9
 DIST tor-0.4.6.10.tar.gz 7811644 BLAKE2B 4bdf8ab8ac992866ffc18711de0ad9e19b496398dfdace4d3902273822666dcfda3acd825ee22251cd8d671ff563702c6f24fe8670719a2c75d144cfe9219f68 SHA512 7d3ca14f260f8d18c020f629fee93a9e941962f99d7b6106d81b1f302152e4be14f5f719c06a34257c2bedf1612c53da21c26750b2608034bd6c6cf0c82192a9
 DIST tor-0.4.6.10.tar.gz.sha256sum 85 BLAKE2B 1c51a80a0bdc34c31725ba6d632ae16ddec1c4aadd4c5ce8ff5ccd4dc9b051f76ddebbe1f1dc2c6f86194bf6badc95222ae14be100bbc24b75bc53f525cb8378 SHA512 97b49664f9f998b00fdd80f956bd5ab9588cd75d09041a0b946fdabd9f10c471eb49aa4bbb4d19bde45a554c1f2ef60d76ff58aa1dc74d4e7d930df77ac68262
 DIST tor-0.4.6.10.tar.gz.sha256sum.asc 488 BLAKE2B 4f17ba1b555eeaa0aadad9348420979c1c83d3ce3cc4fa7e1cc6f453e75ae0bb43db19b883efcc329de5b52b91cda0f740ed949674f64e8cbfc0eb343ca2819b SHA512 3d814c0b3533cf2b2ff421dc92f254596f2af7206bbefdc15a71a906c667dd3606b2c37ada3d36df6011fd0b4d5fe78860f8845fae9e19bd9e3ba5745f45130b
-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
-DIST tor-0.4.6.8.tar.gz 7796485 BLAKE2B 3475597c9f46c83c736bf5f3db2a4f44a38c4f4c4998903d1fe89fc75a7090f4eaa8faafbbd44d728d5e8915f195eb3e284141925b16fca9bf6001844f52863d SHA512 ff008ddf10c2a4c9e0d0da28558c7a97a6d42615c8bcad25a74567e3aafaba49df1699e379fd674f93305d222748d16b2f21d0da9a8fd3444b659747e1f1d07b
-DIST tor-0.4.6.8.tar.gz.asc 833 BLAKE2B 6f1825e3f5e2d70c5078d27990633137c7551fa80f5d202e56cfcb2a88d6b5b653ec6c349c7dc152f6c7313e6330182ce22a42be3f7aa63aced0586ee673addf SHA512 5000c111688d76d357c371532f7edbb01280273e5dc9bc18fa524517fcb1efda1403071536f06d61b8b8a73e26505d6e74cd84bd611f63f2a56e4b944f76b2e9
-DIST tor-0.4.6.9.tar.gz 7797677 BLAKE2B 7d6add30867a3b18471bece559acbf6782b516229b8ab2c764f4a581fcbe3c2fa748f2708c60bf0f8a1165bc1fdd930fe00adaf7c1f546e6a7e98bdc0f1abb21 SHA512 67b3c0c0515d4150dd91db6dd4efe19b15a2e8ddac2a34069d61dfaf79d90585f3ca4071483362619719a7cbc6198d67d1ff73acdefa8cc8462bc1e2a7ba264f
-DIST tor-0.4.6.9.tar.gz.asc 833 BLAKE2B 1028464261cd02502408fff7354b92c68f51ce4ec27a16c190f4d16ec4164fb2f81d8018a6c400b22691dda8a29aa5af41b7e8fc9c72f551c8a1e85976ab1223 SHA512 1a34ae6f3b2d58a1a3d71b7a953cb1f8b0ef30430f016d67978a9323f7da42132a7cc2540245e115311951d524bbb67287d1af5c456a72564a4b49971962116f
-DIST tor-0.4.7.4-alpha.tar.gz 7855828 BLAKE2B c30f131254a55e0fcea82361b491730ec4cae2de9bba33bd4f2d68a71b658478ab2344727096c34a7216a13617ea70b7288b8c1f1e80ffcaeb03aba6b462c0ec SHA512 8956424cec7d9ec223ea974e2d13e1f50e3003a9a7535bff109504ce3a9cb8e62add4dd5b716990b8e8fe258fd9854fe5ae00a914dfa7c7e2f79b3d703363db0
-DIST tor-0.4.7.4-alpha.tar.gz.sha256sum 91 BLAKE2B d3e9416c33e286225b3f41f57bb4cb01ba724a4142b301d3a9fde61c6191c83252a3f1ea7100d26cffc6a0eb4466517b61a167a9f19627679ff5299434dd07e3 SHA512 08d06eb70f2894117b83a934a4df334cd2c7db2f4a51a10233e9e71f94a8aba4a0262476e20480444e232116cd184635d53ec5f4a81f8de78cd1bfd75158eecd
-DIST tor-0.4.7.4-alpha.tar.gz.sha256sum.asc 716 BLAKE2B f65ea8b99a957cb2bfea6a5da664864df68a521268f0c15dee02a738498af7ccc8c0b7299bfe413ee16011f3ea414b694482e8c45c691c1e6585648621cd02a6 SHA512 f8353d9c1d3b9a14767fff8c795acf8914c5970a3b146b0b05010b6a6a01901faa27098a18f08119c0256be43c9e5d43dfe12b36ac2d00d8e2506349884317db
-DIST tor-0.4.7.5-alpha.tar.gz 7876166 BLAKE2B f6389401adf0b3fae548f27a13b5a9f20fcad7a4fea7ea7dde159d10a49032d03e1b82a8eaf494df2e20958e510bc9aacc24d2f5ea71aa354614d726396117b4 SHA512 db93ecdeaa600ad6ac5a3c07d7cf0a00c6f89cbe4e407ac7070ad1de958329b0019145b25bc9671bbe1a12bcf3397ffa493abfa147293480616cb82923c09f1d
-DIST tor-0.4.7.5-alpha.tar.gz.sha256sum 91 BLAKE2B 97d7a909cf2f7a94b9ba5ad143c7d3c368f3352be16e61e181b34acde8fea3d314220914ab9b589ad926d360e0bc3bf3012722f7ddfff96909d57d8359fd5c1d SHA512 f86bd14c4964f4deb4aac748dd31a623dd40800d2494b6c627a14d58818f2b7d2d64054f18e0d5f5368e13e2f8242ff46c40447559c22085321710236e21ae98
-DIST tor-0.4.7.5-alpha.tar.gz.sha256sum.asc 716 BLAKE2B 41c5b1242c31d67d17ac9d2ebfd1d6cccb603f83beea0f7b86bf669b6ab6a497fd7331d4eab00a4da9eb5a0cf774df259df428f88bbed751bce23ae4f9dfdab0 SHA512 fa5839e5beaa4decb7ae5410f4261017cbd3308faa773f225a8fcb0c91f90dc7a259c098f3aab511223709ce638dc22e68c5f5235f7e17cafe51c0fd22663437
-DIST tor-0.4.7.6-rc.tar.gz 7883100 BLAKE2B 5820bc21507c1d35cbff9752c9e4e40a9cf387c374a03c5ae02941e113a8f57b7f1ff8f5fceb29670f7a91373adb365252e81b4fc694bd0a7a009d0f9336494e SHA512 4a2331e40a9963efe1922fabb3b3022c6ded0b817c46e8dfb1494c94e9374b639222d131eddd4d2363f3cdea3b1c055ee49d9ab0f583695aee793571ed67e5f6
-DIST tor-0.4.7.6-rc.tar.gz.sha256sum 88 BLAKE2B 676e680b35ba079e4fcb368aed54fd287b5b7888fd67f8566d417e7b7ddbed8ad865eeb022a40f7247f7e8d72f745c9ed69e12f3eab391f0df110a611c7995e0 SHA512 7804acd9d97168364298accdd04dda88525084cfdf752873c6810e93ac915a2167c8f94b4d2621f18107f911d18a4565e1ab35e4ade732ff813d614dd7e86f58
-DIST tor-0.4.7.6-rc.tar.gz.sha256sum.asc 716 BLAKE2B a62c8653fe9a53487101caaef951c99f695ead61c276047b406634b38626b6432432691cf18d186791ebe8f2d483cb9f2373bc2de778e1ef9bef4777d458a8f2 SHA512 e39eb31e7a938fbb19c0e8d89b6d16e332c0491b9b80034b19f1eeb45f15d5c5d1e94ea85a14d9fa160ce48d73cea509c698aa512181b6a361b79823380f0370
-EBUILD tor-0.4.6.10.ebuild 3096 BLAKE2B 1e96cb7155455f282cc4efe439d07c4282e8cc0c6019cc2d7960ae92329cd3af3ca4878340de97b2ccdeb3307e7d0749eee715745a4fd0e1d01c9ba8f5fdfbba SHA512 551bedccbc189a4a0d2e184fdc1f5b9c621bea914fbed967eb7581ef5fac4332a98d96a8153f287d85d868bd0243502efea86d3a7a19f1d8814da8cda728c527
-EBUILD tor-0.4.6.7.ebuild 2741 BLAKE2B 8eb904dcb68d1e65d025f5a212c98ecd94f0cc9ddcd73b2efc80bf70aa44a967c600fd17c7ad909e5818263226fc0d82635b2fb4a1add8b0745dfa642140c479 SHA512 38a62d9b70588301762806663fa680c6fb5bddbe50504ed1aba0dc54b64c2d124780cccdc254d9140626e646eb10200741c85e7f6b6caa03c3c722b507c0532c
-EBUILD tor-0.4.6.8.ebuild 2747 BLAKE2B a7aca64064eadc60687b1595eb61e3a4fe7472eb74bb206d795bc7996742455302f5f1b3be3fae7aa2e229cda1ccbfd90abe903fcae4b44e1058c4aed5aa8784 SHA512 78dc27be6f1c05a53605e1e95c46cd96d9dd5c550878157ba48a7b50b7381c7c41d710b3e3d787f85e3e2f891dc80bdf054eec6d2c36df303a7cdcc663e38de0
-EBUILD tor-0.4.6.9.ebuild 2747 BLAKE2B bbc1ad0aa3f3ea611601359886bb4e05c5faa96c669e00e2221113937b05714b297df32d5102d1c0646e91f4cebcdc5560ab6ce0bdabee198b173ad75fc8e04e SHA512 2a09174c05b81b470d5fe2df4a99b7c9cc22255175d94eaaf0ccb426b16912485aba01ddf85b98f139022d2d05c7e7be2d52551b0e12afb08a1e05bfe91a9cab
-EBUILD tor-0.4.7.4_alpha.ebuild 3070 BLAKE2B 4c391909f847f313f92566ddb63263e498d36f96ba87210f18d4cda5330cbaa5c9980a649d8fc0fe186e3af158bd6b6a986e833fe23049d150b7e1fde736b90a SHA512 d500d4e8f2eca5d47e792760f0d0daa6f39566d79ca189a7d13983b1d2d3800a0473bcfd5b56da597d0c8913a216235400f1d09671e737c4e9c1fa3fde867357
-EBUILD tor-0.4.7.5_alpha.ebuild 3070 BLAKE2B 4c391909f847f313f92566ddb63263e498d36f96ba87210f18d4cda5330cbaa5c9980a649d8fc0fe186e3af158bd6b6a986e833fe23049d150b7e1fde736b90a SHA512 d500d4e8f2eca5d47e792760f0d0daa6f39566d79ca189a7d13983b1d2d3800a0473bcfd5b56da597d0c8913a216235400f1d09671e737c4e9c1fa3fde867357
-EBUILD tor-0.4.7.6_rc.ebuild 3070 BLAKE2B 4c391909f847f313f92566ddb63263e498d36f96ba87210f18d4cda5330cbaa5c9980a649d8fc0fe186e3af158bd6b6a986e833fe23049d150b7e1fde736b90a SHA512 d500d4e8f2eca5d47e792760f0d0daa6f39566d79ca189a7d13983b1d2d3800a0473bcfd5b56da597d0c8913a216235400f1d09671e737c4e9c1fa3fde867357
+DIST tor-0.4.7.7.tar.gz 7895089 BLAKE2B 18acfbe017b2ad456184f6031881149717f6fecad0d3e6daf90241a5a8ef296c32a36ace266d38b703f34b66d71e282c803f03f2059502c6ff6f4fdfb6641a97 SHA512 896e12fea9342b669911d9cb115cb8cfa3841739d7a90e7457b24a72ff02821cd08be21bde961f18ca35c514a5105315dcb1e9519c52390fd8064c57d1e245bc
+DIST tor-0.4.7.7.tar.gz.sha256sum 85 BLAKE2B 09e715beaf05926c4cdc13a43c8cd31ec2f477876a8a13915416d7ac955622c10c77177a1a0d7a7c4eb5a6c1256170379692c42dd2161889c51018f43f4a3398 SHA512 aa7d84bb7bc50d73835b95e5c5c68cff3d4da31e0b5d01e5765cce92963a4a391ca449638338548813fd51031f3114f38c57d617142831f16a967b22284db3c2
+DIST tor-0.4.7.7.tar.gz.sha256sum.asc 716 BLAKE2B 30e2a5a0867d3474aaa935b1dcada9ff96799c48e3e621e7519462dd85386ec1e44592d3ee93372bf1f649213f87247f1f30c0bcceb0ca40de5faecd3b2b90f1 SHA512 2a40a3d61803016b65f4fbab7263679d987811ff829b637d73cb404a4c6ea179f4234f8696833fdddb5af449726dc70e3d74297c0ba62e3ff41e28e372a2c020
+EBUILD tor-0.4.6.10.ebuild 3085 BLAKE2B 1b09e39479439bbd276f0a3f810f2509a7cdec2f5e1b31176586e213d2cb7398c97452e12b4960c3c75e37c3eed64691824d08f9ac0a6d66a701b5d3f7e3cea8 SHA512 8dbd47200f35f15479cf611f2f68346c534f30403b3d56d289717672097b150b627cfd91e64ae46a881e94f5c39714f830cc788931a13ca485f0872cc870ebde
+EBUILD tor-0.4.7.7.ebuild 3075 BLAKE2B ffad3d7f1332cba0a6a59915aeea390fdf7fd1d7a81d568aed9689cdf18de3380e0e03acb731347fa82571112198e81fa6cfa48fbb26a8f5c743436287a79561 SHA512 56c5694bddcafdb4abaecc5d6be5afa196ea9e113391cd0685007e71fc001d5c395d3b3459ffd0fa551b9853ff4b3ca1630bee8b9f27c45c59966b5a354b0219
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.6.10.ebuild b/net-vpn/tor/tor-0.4.6.10.ebuild
index f84054aac604..e5d94f3b2d67 100644
--- a/net-vpn/tor/tor-0.4.6.10.ebuild
+++ b/net-vpn/tor/tor-0.4.6.10.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{8,9} )
-inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
diff --git a/net-vpn/tor/tor-0.4.6.7.ebuild b/net-vpn/tor/tor-0.4.6.7.ebuild
deleted file mode 100644
index 919dc32f7fa3..000000000000
--- a/net-vpn/tor/tor-0.4.6.7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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="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 )"
-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 ~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
-
-BDEPEND="verify-sig? ( sec-keys/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
-}
diff --git a/net-vpn/tor/tor-0.4.6.8.ebuild b/net-vpn/tor/tor-0.4.6.8.ebuild
deleted file mode 100644
index 7eb05f3e6404..000000000000
--- a/net-vpn/tor/tor-0.4.6.8.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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="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 )"
-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 ~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
-
-BDEPEND="verify-sig? ( sec-keys/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
-}
diff --git a/net-vpn/tor/tor-0.4.6.9.ebuild b/net-vpn/tor/tor-0.4.6.9.ebuild
deleted file mode 100644
index d102418e073e..000000000000
--- a/net-vpn/tor/tor-0.4.6.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-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="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 )"
-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 ~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
-
-BDEPEND="verify-sig? ( sec-keys/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
-}
diff --git a/net-vpn/tor/tor-0.4.7.4_alpha.ebuild b/net-vpn/tor/tor-0.4.7.4_alpha.ebuild
deleted file mode 100644
index a117b5a80dea..000000000000
--- a/net-vpn/tor/tor-0.4.7.4_alpha.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-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="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.sha256sum
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.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 ~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
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
-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_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-		verify-sig_verify_unsigned_checksums \
-			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-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-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/tor/tor-0.4.7.6_rc.ebuild b/net-vpn/tor/tor-0.4.7.6_rc.ebuild
deleted file mode 100644
index a117b5a80dea..000000000000
--- a/net-vpn/tor/tor-0.4.7.6_rc.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-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="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.sha256sum
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.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 ~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
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
-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_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-		verify-sig_verify_unsigned_checksums \
-			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-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-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/tor/tor-0.4.7.5_alpha.ebuild b/net-vpn/tor/tor-0.4.7.7.ebuild
index a117b5a80dea..ff633774bff4 100644
--- a/net-vpn/tor/tor-0.4.7.5_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.7.7.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{8,9} )
-inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -21,7 +21,7 @@ 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 ~riscv ~x86 ~ppc-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~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
@@ -76,7 +76,7 @@ src_unpack() {
 }
 
 src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
 	export ac_cv_lib_cap_cap_init=$(usex caps)
 	econf \
 		--localstatedir="${EPREFIX}/var" \