gentoo resync : 11.01.2018

3 files changed, 3 insertions, 87 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 88c868238267..d4b1078c57b5 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,10 +5,8 @@ AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07
 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.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
-DIST tor-0.3.2.7-rc.tar.gz 6313975 BLAKE2B ecfe6832b2e9c81f04218f7ec82a63f23913c1dc0a9ec29113e6432eac69b8cc89a9fc6b7c4147cf26e6de141b22574d3118608194641126d961b5f452179e1b SHA512 989bdd4311521528444f4165455365d3c1f1ef5f6a8846bf08db7f84ab8e986cba47f9dfbd3a03ccb6e3f8d813d69289768170a8fd68916e9d6a21fe0484cf87
-DIST tor-0.3.2.8-rc.tar.gz 6345141 BLAKE2B e529847252b819a81e6cce5f5989e72ccb9d8db03221c37e504b47995d36977a67653d59cb7f8378eb3652d256867e3ee319062f9cb6acdcd42a415b08f89954 SHA512 60913c492f903307d485af26ab3752e0058fb97816d62cd29eb8785446bb7eb6f9bd2aca964a0d8c4de039c4d432590dea68c28c4f34eda2f127b50c752be0d4
+DIST tor-0.3.2.9.tar.gz 6250442 BLAKE2B 34f6436d94f105bc0e68fa89bd6b671c84c9a6389010b5741b2da339caaea2e4d549f799aa8c6867eddc90818195c73a4d13cdf7f7003d578779f7e2d9964cfb SHA512 60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
 EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
 EBUILD tor-0.3.1.9-r1.ebuild 2020 BLAKE2B c2054caa10f4bd9e7cea92c1f99a944bfd2d9dc2456dccbc54b9715c38c3f641c31c5ee2ec81b4a7307c2465b020e085f75cb946823961aff8119745f690825b SHA512 b512c5d0c5cb51bd89b4cdca0eed158ead35785fd2d3896647b99447e88266e1719423538ce4a4a51d3da35ea780b098a499f4fcdca78a6a232ed11a992ee7b6
-EBUILD tor-0.3.2.7_rc-r1.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
-EBUILD tor-0.3.2.8_rc.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
+EBUILD tor-0.3.2.9.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.2.8_rc.ebuild b/net-vpn/tor/tor-0.3.2.8_rc.ebuild
deleted file mode 100644
index 23286b3b6daa..000000000000
--- a/net-vpn/tor/tor-0.3.2.8_rc.ebuild
+++ /dev/null
@@ -1,82 +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 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 web tor2web-mode) \
-		$(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.3.2.7_rc-r1.ebuild b/net-vpn/tor/tor-0.3.2.9.ebuild
index 23286b3b6daa..57655d96e0eb 100644
--- a/net-vpn/tor/tor-0.3.2.7_rc-r1.ebuild
+++ b/net-vpn/tor/tor-0.3.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"