gentoo resync : 15.01.2020

3 files changed, 2 insertions, 95 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index fa563dd4954d..417e4d227efd 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,11 +7,9 @@ AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c5
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-DIST tor-0.4.0.6.tar.gz 7380018 BLAKE2B d013fdb5c253be934e28d312fb1e9f03b679651a42878859375d12620fcbe30e077870b1714f2e52f5d7836351dbb1cc0805535c2a7e32256ebf1fce1ba68d63 SHA512 6ed701e5a3c05437877b7c3891c924655f2e47585ac3e2e6ac2fb5604a3ebf8a945f17f03e042d491d4d956da653ba110aa7e5f8bfa231fc0476d36a0a7f02e5
 DIST tor-0.4.1.7.tar.gz 7512661 BLAKE2B 34c1c8e40c6a2a2aeb19e1161b3b32d1683da246c5839c9fc4375471d8e7c46bb1277bcf8fc700898580a6b15d8f401ee61f422ecd7a88c783cffb1157150fc5 SHA512 f6ead1412d23516a16f31e1157b4538071752ae09a421d9dceaa7cf76599c01490f9bfcb8e26f1a75e888359adf6adcd029ca64cf48e3b45b07e2d62482c9541
 DIST tor-0.4.2.5.tar.gz 7596836 BLAKE2B 0c7fa5d427f9d0683846c1023a4539ae4042c0d26f1c5afff20037f0681f6ea0dfb735e9c0e9d14bd7dddbfd5a0023064dc6e6cf6e6629402a6a13248129e6c5 SHA512 e63157713caa3590324f652f17c5c5634bab015dcde5c7832eb725351c3a91c1051dd8a95650502703e9c3dd5daefc2867ff3d20530dfec17310bb3dd4bb5b7d
 EBUILD tor-0.4.0.5.ebuild 2260 BLAKE2B ff4a22c81179b1fee52c812fb672daf85222b686774ce3654cd0a7cd8efc5657c19fdd67f0a0367f224c21467dd05ae298abbc2c6e9b2963e49398bd841da32c SHA512 8ec4875689f48aecab48074764c67423720cf1beacf30727753ac9d79b7ad2fd0a7dd29c02e9372b19ed1030d5fe0f853055e2605f5226540b898930fda62713
-EBUILD tor-0.4.0.6.ebuild 2265 BLAKE2B 921ddc2a62e9577ed6a683d5a5648f519b1951ded86d02f802f273e43ba38c60ed76898d379da7eff656a093435128b2a693505c23a55ae9b5163bc11144f37b SHA512 bea8c2d97f9c8e951ba6f82f0586770e8adf34206ca0fb34e25e9180741305febf346afececffbb5070ea2c1f18ce8eb8af87da60dabbccf7ac026e2f2398599
-EBUILD tor-0.4.1.7.ebuild 2233 BLAKE2B d123128ba7fbd043e8d97ff122f011b2c3882e67ee50968870b5739ee20be1cb9835e9c20b0e348737c2f9e1bcb64a74e0cf1ca3f45049bf977f062fdd5f1744 SHA512 ccdd5a061eedb05ca810f08b529b84f6ae287a406aff79a90300c650deb803a1d9132e717911c0ba23a9d2ced4cdffd432bea59155b5fe1d6ba4a3e9fc1c9af1
+EBUILD tor-0.4.1.7.ebuild 2228 BLAKE2B 8fb5b646f254fa5cc654c6c9f7eb7d0210e149575fdbc3bcf15e0d687b04cf7d34c37540192ea83dcd8e7f47e8d0f4f3d1ab9134b6a8c5f5846c409d1046b39c SHA512 25629021a44ac69d65c4d385de128c87aa749d6d8c996420f580e16049c9ee7afaf7b756c7818323b546e581b15ba09106e038e36b858649ca51e02a78f42d21
 EBUILD tor-0.4.2.5.ebuild 2289 BLAKE2B e2d53844303c811a9b4a515418afbe3bc83e93a558afbe6231f8a5860757d2685bdb875968494250a023c146412ec58cde66bd87dbc8b3918b5f889917fe1e34 SHA512 a6acfde2cfbf4e608a5c2c8be80371e6b4c889d4872c627fe2d3264f375044080f18f52bd0123e02e796fcc5c36188a9be25c0c27791763fbc7e48b2529d31e3
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.0.6.ebuild b/net-vpn/tor/tor-0.4.0.6.ebuild
deleted file mode 100644
index cfb78c50ce3f..000000000000
--- a/net-vpn/tor/tor-0.4.0.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd user
-
-MY_PV="$(ver_rs 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"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
-	dev-libs/libevent[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	!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
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(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-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.4.1.7.ebuild b/net-vpn/tor/tor-0.4.1.7.ebuild
index 8085c15bf0ad..81e7a01b64f3 100644
--- a/net-vpn/tor/tor-0.4.1.7.ebuild
+++ b/net-vpn/tor/tor-0.4.1.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="