gentoo resync : 25.09.2021

3 files changed, 21 insertions, 36 deletions

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)