gentoo resync : 03.03.2021

4 files changed, 32 insertions, 4 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 1a21ad2b56be..2ae629f80a63 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,14 +1,15 @@
 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.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e9114c69ba738a5849e28b886cb7326bb4f0e8b40861407f40ca21988ac188280a4eb8031cba699eda63e66b968013a9796713a5468 SHA512 ef4023423cd96c85106d0dcd3f381ffa1adcfab8c4ae49046c3dc4a45c61401e0db205483144421f620279f6a989c821c581f202561e5c24da7ccdc61a267521
+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.4.6.tar.gz 7806477 BLAKE2B 8eb5f22825193a61be42105ad32bd82e662c1859971fb2248fe05da2f80d1a3a9cbc96ee4f47f4127da56c328f5c60a6f57d5641cfa90b79becc8bf622f56f3f SHA512 84f981bed6d8c89d3de437e35dd2ad2ca3ee5efd7ce6b78e3e00bf40f644f495b960a7a741be5dd7ba096d73d5f941974722a44e9d3ef4fbcd02b20274d565fb
 DIST tor-0.4.4.7.tar.gz 7812645 BLAKE2B 8e35c56c0dc94c01de556ae3a02e2d465776dbe9cb2db35d4513dbe83b5e3b0b3641570ddeee1f43aedc34edba245591d4457debc13fa43111780cd4cff739f2 SHA512 356e9569eb79d81bccba1360d10af7d78f3824d5a4827fc95272a952fc8e5bebdfa9ec99fa82992c025625d6da963c15803acbabd66cd59c587c1e042af16acc
-DIST tor-0.4.5.5-rc.tar.gz 7918239 BLAKE2B 8db4d4edbfa8a3298bd5269dfa6c38797cb217a6e5e1bffbee7a007847f8ea0c2fa87dc9343597af500fb9a51dacc7685d66a309b7bdffaabcdf271018b3bc84 SHA512 e7ca955387a7e985488d9af8a51703251af990e7fe790377caa8e349b48ccc6286e73fdb2f042d74323af2f9a82ecf3766adf3c2dd499bfc46d7ad7f578815a8
+DIST tor-0.4.5.6.tar.gz 7926711 BLAKE2B fe7e2c0020f4c2bbfbcbdfb666413d19e4b58ec90c4e44324ab0e2a96871a4ce2ccf63cffaaa229f6d91948babde83c3ebd4600ebfd6c63694f2afde9ccff21c SHA512 3759657a997f4aabdfef6ad3f5da16085a1dd3353015db8283a21fcb1d658ca390bc3c36387a89c99baf2069c6e1d392a1fef4b3eba24ee1f2b408acbc103f9d
 EBUILD tor-0.4.4.6.ebuild 2396 BLAKE2B 222e94672d20bc9b073b668a84ee446c9c2ea3161da990e2599119046d3586c1e781f75f4f8617c2f224072c3f8b50ff8b4fd3a6529535eceff072cbd12d4104 SHA512 d5e477251f5d13f48c4f46adebde4c24ebb89fb80547ee1719f534fa091f65f3444da25d4ebd717e24b37fe63387d5ea3af261949822482f45bb8b2205ac84aa
 EBUILD tor-0.4.4.7.ebuild 2402 BLAKE2B 73413ad692d0c74f51000ee1d52805046c116646741effc3cf86ee06347a671647e26142b0a5b0ae54196022e752fc125ab2d1b52b96db31750fdf5bdd82dd30 SHA512 64a6bea16d866f27d3b229463532a4f16864f16f41e7e2f750f6a0079fa24594b0f3d1b0834c6a8a09c85260f26d70a54f45bfc3b0e8d7710a1f60bd66af7ef5
-EBUILD tor-0.4.5.5_rc.ebuild 2347 BLAKE2B 748c868fe10e2ba502f88fb2ed607c19334ce0d7a6b97e0e76ce52a6e51fcf9169bc6ccc3f6a06ba02f4a4011fc64525fe61ae95c0680eb21fddca0b945d7ae8 SHA512 6df906de9f7865ac6498f6d8aae0f6997b4c55310af0c8f47abb8f8ce8076670e14b174a3cb13b652b1b896dd2cde51482789c90e5bbf37f26e88e4b816faf98
-MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
+EBUILD tor-0.4.5.6.ebuild 2399 BLAKE2B 9c3d5b4a9545fe446b86dade86033786b52d4247e62a1fecc6940c65bf0c1e35a1ff18f0db365d6aa57e2197073b1299010d369270b0f9a4cee5e9b18b3ccd0a SHA512 da8647bd7867fc2034ccc0b133cd6bce1b5540c47c9032a133a24177e95340f3827ece6e803feafd58bd9fde486d6f9fd355f074c62cae2832e777a5cb17435d
+MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
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
new file mode 100644
index 000000000000..31234c735bc4
--- /dev/null
+++ b/net-vpn/tor/files/tor-0.4.5.5_rc1-LDFLAGS-typo.patch
@@ -0,0 +1,27 @@
+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/metadata.xml b/net-vpn/tor/metadata.xml
index 5d6719bc9a3e..2d48f019f6b3 100644
--- a/net-vpn/tor/metadata.xml
+++ b/net-vpn/tor/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name="man">Build and install man pages</flag>
 		<flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag>
 		<flag name="server">Enable tor's relay module so it can operate as a relay/bridge/authority</flag>
 		<flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag>
diff --git a/net-vpn/tor/tor-0.4.5.5_rc.ebuild b/net-vpn/tor/tor-0.4.5.6.ebuild
index 63ea086b109c..c9dce6ad8633 100644
--- a/net-vpn/tor/tor-0.4.5.5_rc.ebuild
+++ b/net-vpn/tor/tor-0.4.5.6.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.patch
 )
 
 DOCS=()