gentoo resync : 09.03.2018

6 files changed, 8 insertions, 92 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 1a0a3d49bceb..9a1d223b0410 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,13 +4,12 @@ AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e911
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
-DIST tor-0.3.1.7.tar.gz 6058284 BLAKE2B f2d825c82342cf1ca9354f051d532ef31e1d183be28f0f5b49f14c0d88176910292b6727b8cf0f066bae276e3a431851714cdb385219516d0a7519c5ed02b203 SHA512 a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
+DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
-DIST tor-0.3.2.9.tar.gz 6250442 BLAKE2B 34f6436d94f105bc0e68fa89bd6b671c84c9a6389010b5741b2da339caaea2e4d549f799aa8c6867eddc90818195c73a4d13cdf7f7003d578779f7e2d9964cfb SHA512 60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
-DIST tor-0.3.3.2-alpha.tar.gz 6487418 BLAKE2B e1d574640c88249d0930da386c3421eb0fc47557a4af294fd40e529db8f5c44834e10f89bf650b3b8fb0d7a7db29d3440e70e7dfaa3c5bfd2e0af09ffc8eaa86 SHA512 60d7d30b24bf6c4201a5653cb6ae80d82f0f5a877c6cd1f6418cd3536259f62dbdf38cc02cf438180a6625d66adf76a64a685ca308b0e7a0a7095cb083b2cf8a
-EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
-EBUILD tor-0.3.1.9-r1.ebuild 2019 BLAKE2B 8bbf2b10bad9d163551fd700e477d8123cb75d3a3d11030d8bdc132e9d5db2247e5c8e7e1ffebeeec349ace1e99b3a142f60e0ace92de0e64b79794dba5cc3cd SHA512 9a294302ef07cefa8e7461758f861e9c9d0c1c4e01bd4b096d989ba08e77216131d6ff7ed7fa92c73a9c8837873186b5c8a7d0ca87785c304d3afa447315e813
-EBUILD tor-0.3.2.9.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
-EBUILD tor-0.3.3.2_alpha-r1.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
-EBUILD tor-0.3.3.2_alpha.ebuild 2142 BLAKE2B 3482c9f988da8b2fe8cf7dbcd53a2c2dfe86b960240422aa927522e3c57a0eccfdd5abca4d56724f36399c9f6c07a043e7d72bd5ae45b2832b33594b4a811ab7 SHA512 e2653dcdeec3339effb79164c991cde78e691749866abb9ee4f8813ef7eb6abd51ce8eab846b9027b1784236b6c3be0a316bb2730de72777bc031b6d2396ec5f
+DIST tor-0.3.2.10.tar.gz 6421984 BLAKE2B bab8031982f05ee29b14d22fdd9c4912e35342e6ac57a1c3fe1d5de3c4f394e0211607d20917b705a5f489109511a7ed7761e1dd7b4310c3d112c5e7cf9964bb SHA512 b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
+DIST tor-0.3.3.3-alpha.tar.gz 6486946 BLAKE2B 1cd281ffd960e2d161da390bf0e8f25ffa998458f9cb7c08d5d843b6748feab7e80a963b785433d66f97e46c5c5cb8d00e57240ed2f53866e423cff3e7bbe7b0 SHA512 03c819099b5d7b1657da2df387aa6d354ac0a450ddc19eccd81cc96be96b7741ea034e999d09092dcdfd78c93246a341149da7640a1d693eccbe3ed137370fd0
+EBUILD tor-0.3.1.10.ebuild 2023 BLAKE2B 63b3cbada2dcc3930132dd8932b7b187c9bc02a27702be12d3ba3e25cd10fbd5e4b328b50f8defdc879e8d6737047c65986e65c30dc9ca6d388942217879d715 SHA512 ceb0b9879a6c6bd7e353c5d1d5a1d6e8110ebaeb4cdc285e07ef76d423cc929b4bd5e16acdf0ff6e9e41e9b354638f7e4977b64dd9e7ef6b79807d7633033476
+EBUILD tor-0.3.1.9-r1.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
+EBUILD tor-0.3.2.10.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
+EBUILD tor-0.3.3.3_alpha.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.3.2_alpha.ebuild b/net-vpn/tor/tor-0.3.1.10.ebuild
index fc9664985e63..759009ac2c4f 100644
--- a/net-vpn/tor/tor-0.3.3.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.1.10.ebuild
@@ -16,7 +16,6 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 # We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
@@ -50,10 +49,8 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var" \
 		--enable-system-torrc \
 		--enable-asciidoc \
-		--disable-android \
 		--disable-libfuzzer \
 		--disable-rust \
-		--disable-restart-debugging \
 		$(use_enable lzma) \
 		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
diff --git a/net-vpn/tor/tor-0.3.1.7.ebuild b/net-vpn/tor/tor-0.3.1.7.ebuild
deleted file mode 100644
index 55c84d5df6f4..000000000000
--- a/net-vpn/tor/tor-0.3.1.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://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"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
-	app-text/asciidoc
-	dev-libs/libevent[ssl]
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--disable-libfuzzer \
-		--disable-rust \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable web tor2web-mode) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r8 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.1.9-r1.ebuild b/net-vpn/tor/tor-0.3.1.9-r1.ebuild
index 33482fbf0bd5..eda70f132ce5 100644
--- a/net-vpn/tor/tor-0.3.1.9-r1.ebuild
+++ b/net-vpn/tor/tor-0.3.1.9-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 # We need to keyword app-arch/zstd
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.3.2.9.ebuild b/net-vpn/tor/tor-0.3.2.10.ebuild
index 57655d96e0eb..57655d96e0eb 100644
--- a/net-vpn/tor/tor-0.3.2.9.ebuild
+++ b/net-vpn/tor/tor-0.3.2.10.ebuild
diff --git a/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild b/net-vpn/tor/tor-0.3.3.3_alpha.ebuild
index 655250741364..655250741364 100644
--- a/net-vpn/tor/tor-0.3.3.2_alpha-r1.ebuild
+++ b/net-vpn/tor/tor-0.3.3.3_alpha.ebuild