gentoo resync : 29.12.2022

2 files changed, 9 insertions, 5 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 26703ac951b0..19a90b257b26 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,9 +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.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
+DIST tor-0.4.7.8.tar.gz 7910081 BLAKE2B 40f6eab453d95a09e4531ce7cdb59715a21b84e1d0b1045d107add6a443fb7563a5747734b23e0e1dfda6490a5a7659f912e38c11cdb5fa635535dcff6169eeb SHA512 2daeb4ef9144772b4e0793ccd00990b7eda58c533f9616670940931d6d12770e9a7d48b33b5626d330f62bb71fbc6e1f559881f062d16bc15fbb162e29fa91f4
+DIST tor-0.4.7.8.tar.gz.sha256sum 85 BLAKE2B 0fa1e094af83c74f46f87d0569a623bd3061b416f272d19326faf08ab6e9e926b14c2d46c99fba80d68f22188aa74c73e68477015e1c37382e4acb115d10a5a2 SHA512 8d8ef020e8028a0d481cbf6e50809212ebfb493b11c3937f1f732be48ca139a991e68b799342a17374f6faf77f0a7113d15c5220a5bf94d110d11582a078a013
+DIST tor-0.4.7.8.tar.gz.sha256sum.asc 1321 BLAKE2B b70d64db73c45f50bac4ef07f12d755eaf02b676d929bd6f3a9b5b593326e1cce4a3bc8466f2ccce003ab044084fa812ce6ea4cbf32f5a4c0321199dcd291bee SHA512 5c58745abb4db4a9d53c4c4df209cab96689494704d661439efa705f143267aac648ed23240aedc802e9689223f79d2d1c7eba865d2d5b3296590f8b93e03c37
 EBUILD tor-0.4.6.10.ebuild 3085 BLAKE2B 1b09e39479439bbd276f0a3f810f2509a7cdec2f5e1b31176586e213d2cb7398c97452e12b4960c3c75e37c3eed64691824d08f9ac0a6d66a701b5d3f7e3cea8 SHA512 8dbd47200f35f15479cf611f2f68346c534f30403b3d56d289717672097b150b627cfd91e64ae46a881e94f5c39714f830cc788931a13ca485f0872cc870ebde
-EBUILD tor-0.4.7.7.ebuild 3075 BLAKE2B ffad3d7f1332cba0a6a59915aeea390fdf7fd1d7a81d568aed9689cdf18de3380e0e03acb731347fa82571112198e81fa6cfa48fbb26a8f5c743436287a79561 SHA512 56c5694bddcafdb4abaecc5d6be5afa196ea9e113391cd0685007e71fc001d5c395d3b3459ffd0fa551b9853ff4b3ca1630bee8b9f27c45c59966b5a354b0219
+EBUILD tor-0.4.7.8.ebuild 3182 BLAKE2B 33b1531bbaf9ed8f176b1801fa9a7c7a17d7feeac0bd2007b9cab0f3bf36f838e242c13ae566776c8844da7b9557626cebdddba7aaf54284a08005a85a4c2fdf SHA512 35133f9dfc685723739a53f2714032b0a428a338473945769386c57e96388b11dad64f6c68bd6e152d47efb77fed308b55cbc1345dcd41b77860d03ef762d5f2
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.7.ebuild b/net-vpn/tor/tor-0.4.7.8.ebuild
index ff633774bff4..b6fa64574aad 100644
--- a/net-vpn/tor/tor-0.4.7.7.ebuild
+++ b/net-vpn/tor/tor-0.4.7.8.ebuild
@@ -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 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~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
@@ -59,6 +59,10 @@ DOCS=()
 
 RESTRICT="!test? ( test )"
 
+# EAPI 8 tries to append it but it doesn't exist here
+# bug #831311 etc
+QA_CONFIGURE_OPTIONS="--disable-static"
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }