gentoo auto-resync : 13:12:2022 - 09:26:53

4 files changed, 11 insertions, 138 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 22aa5d50460b..9378faccb437 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -11,11 +11,10 @@ DIST tor-0.4.7.10.tar.gz.sha256sum.asc 1321 BLAKE2B fc7fd43115992e5d434cc1bf2808
 DIST tor-0.4.7.11.tar.gz 7983705 BLAKE2B 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e SHA512 318377916880310438aa9804d1ea0154c5416d6b13988c4ff7f2e65fd38c94e2cd6c53252fd76a4dcb488f452837468e19197bf5feee4020e3c1927a76ed2937
 DIST tor-0.4.7.11.tar.gz.sha256sum 86 BLAKE2B 1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b SHA512 cfdae54a70dc0d8eb0eaf8b8c9902a7dd8bc8d597a678d5a0bf431c3e09a8b56206b70b6f9207e3c06e1ba11913b25b81d7c269e49cde5f297ff7b165a3348a9
 DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931dbdb6cf5b13e7a99e2dcc1c784e3832ba2f0314c1c2f3a9e5ccaba3f20d7aab9b9c918373194290769e358cbb5411323012 SHA512 b5e3c82378bc18268d6d4523787e12ece39246cc0f035fd1aedc50c2182d1ba3d2a8f8817a3dada2cd60acabb78f604f06ab347b92c6f42a82f260cc49285c2c
-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
+DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9 SHA512 b97a6cc3fd3353cc1cdbb47df6d8895d0f730967083171795be56ffab4660c9a0f8f73ce83a98eff1fbd0793bae28c987d53c29f57fc5e0f26dddc30c197abb2
+DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1
+DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc
 EBUILD tor-0.4.7.10-r1.ebuild 3234 BLAKE2B a80b64e1f6e6a0b158cfd42e44782b563b4f6020560f930caeb56db931ea8bc0f8f4e43cf7b14436cc81d91baf474c9ce9643e88dca873f0f354fa30261fed9f SHA512 17780bc894b55b1fd5b4dfab4b789034518f0d8e1d534f1ea9d61f66c7c7a2eb189feec70cba38e9d30a48629c07888877e4d4de2bd9f0526ae5f7ff21693677
-EBUILD tor-0.4.7.10.ebuild 3188 BLAKE2B 38219b96311d1b087f15543634fec44839223a1f5e74ea3baeddbcf3907819bb6fa5b8dc07364802d51e453d50d3c352de461a8014cfab2c9f40b5526e5d6853 SHA512 f3e2012daae2cf4afe29bd01d5bd5c3d64dfbc221f3c519070d04758e65e11be8fa28a4c88833f72d0af6a852c5927a3523e187fc1c421ec14622bdf701e11bf
-EBUILD tor-0.4.7.11.ebuild 3188 BLAKE2B f40c82a55f716ede917c546078cab99a992c2bc4db55ad9e8c3a89e9cdfe096d24510426fb52f68be5275550404b46553afa5d78c93f945d45b0ef4d0612291b SHA512 c209e94735786bd4cbdf8aedaf37c1c5ccb4eb8f1fe248326b05e1a5f9fc88147b3355069d3c0366c09c435f288930364cda4b3ae16eb8a6baf4553af938e837
-EBUILD tor-0.4.7.8.ebuild 3182 BLAKE2B 33b1531bbaf9ed8f176b1801fa9a7c7a17d7feeac0bd2007b9cab0f3bf36f838e242c13ae566776c8844da7b9557626cebdddba7aaf54284a08005a85a4c2fdf SHA512 35133f9dfc685723739a53f2714032b0a428a338473945769386c57e96388b11dad64f6c68bd6e152d47efb77fed308b55cbc1345dcd41b77860d03ef762d5f2
+EBUILD tor-0.4.7.11.ebuild 3182 BLAKE2B 0a9d4c581b51b370fba88c124df05938111ea4cc404b6f134f364a705ef0d07b106b1eddedaa67ddab845948f8840745eb08032aae874b9906ea4705a30a76eb SHA512 d237932416e70bf209f389bd18ff43f7fb4e95c61f6b141ae609b90b9428550e296f23f9ea26e7f758237c1719663639cd22215629aabb56ab1a002ab734d242
+EBUILD tor-0.4.7.12.ebuild 3188 BLAKE2B 948b2ab80d768661c147fe3d214af39b4c50182ad9a6656f2e3f44d2c069411579526ced7e149128c56fd0d979d6061726c0fc6315991c02de1b7469f3b0be22 SHA512 4d706594f7d17e5e77ada92519001c2b9a790e41398f84ebb7fbf7bb2a61eb9ffdd303e9c154c4b304fab185429d2a37e14177b236ef1865a514c5085e702f2e
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.11.ebuild b/net-vpn/tor/tor-0.4.7.11.ebuild
index 4a5266e2af76..48c9d0380072 100644
--- a/net-vpn/tor/tor-0.4.7.11.ebuild
+++ b/net-vpn/tor/tor-0.4.7.11.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"
 RESTRICT="!test? ( test )"
diff --git a/net-vpn/tor/tor-0.4.7.10.ebuild b/net-vpn/tor/tor-0.4.7.12.ebuild
index 46b0279c3cb8..de5e0e4c2145 100644
--- a/net-vpn/tor/tor-0.4.7.10.ebuild
+++ b/net-vpn/tor/tor-0.4.7.12.ebuild
@@ -24,9 +24,11 @@ if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
 	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"
+RESTRICT="!test? ( test )"
+
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
 
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )"
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
@@ -51,14 +53,12 @@ DEPEND+="
 		${PYTHON_DEPS}
 	)"
 
+DOCS=()
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
 )
 
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
 # EAPI 8 tries to append it but it doesn't exist here
 # bug #831311 etc
 QA_CONFIGURE_OPTIONS="--disable-static"
diff --git a/net-vpn/tor/tor-0.4.7.8.ebuild b/net-vpn/tor/tor-0.4.7.8.ebuild
deleted file mode 100644
index b6fa64574aad..000000000000
--- a/net-vpn/tor/tor-0.4.7.8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-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}"
-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 ~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
-
-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 )"
-
-# 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
-}
-
-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.md 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
-}