gentoo resync : 16.04.2022

4 files changed, 254 insertions, 2 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 9db324346499..5db9e3758439 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -16,9 +16,17 @@ DIST tor-0.4.6.9.tar.gz.asc 833 BLAKE2B 1028464261cd02502408fff7354b92c68f51ce4e
 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
-EBUILD tor-0.4.6.10.ebuild 3102 BLAKE2B a87b17f09dfef8724e63c3a82d94b6dc2ce82c80ddd02ba631f111111390678b6d5b5cebc545d9be321305765522a639ca69eb1f89c7d16e6d131bf9afcc56af SHA512 1b238f0116750755029fbe77594825e86c0950d60c44768de0d641cf4b413637d21e9e21a3c2b58010b3049c8f99f8b4c10bd6f3595b69185c3ead046ef00b53
+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
 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 82201780a670..f84054aac604 100644
--- a/net-vpn/tor/tor-0.4.6.10.ebuild
+++ b/net-vpn/tor/tor-0.4.6.10.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
diff --git a/net-vpn/tor/tor-0.4.7.5_alpha.ebuild b/net-vpn/tor/tor-0.4.7.5_alpha.ebuild
new file mode 100644
index 000000000000..a117b5a80dea
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.5_alpha.ebuild
@@ -0,0 +1,122 @@
+# 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
new file mode 100644
index 000000000000..a117b5a80dea
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.6_rc.ebuild
@@ -0,0 +1,122 @@
+# 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
+}