gentoo resync : 17.12.2017

4 files changed, 2 insertions, 84 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c6df4f105bec..08f926ae28b7 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 5953e7a46239..d840702efd23 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -8,11 +8,9 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a
 DIST tor-0.3.1.7.tar.gz 6058284 BLAKE2B f2d825c82342cf1ca9354f051d532ef31e1d183be28f0f5b49f14c0d88176910292b6727b8cf0f066bae276e3a431851714cdb385219516d0a7519c5ed02b203 SHA512 a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
 DIST tor-0.3.1.8.tar.gz 6073611 BLAKE2B 1f6dcbe1beff2179ea21d39d05200a9a241739a58f7f38a0e4fa24b9a73d29bb49c539d07db1cf5186cab63217370c40a142cf995f9695916f5112fa0d2fba51 SHA512 0c2d5f6e444815f0812b0f8bb2102f2013c890375cf20b62025d0704e8ee7742bbf7173764795e3e63606a47d0695a5a982c318c55a30ca50600eb6de5b94b16
 DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
-DIST tor-0.3.2.5-alpha.tar.gz 6310699 BLAKE2B 47d2916cec19f10d69abffdafd2798b2ae614dbc579c1afff8c6db74ddba902081315a69a8245ce1c58720e8bc1a4db56d764abbcb78a7ae48ca5cc5ca29eb20 SHA512 33528ad98cc655ac0b795509b1ea88e1b94a227275dd028631205a9dda703bbceb607dac634b4a90c8add6614f3fc3112249d957512297b2cc5ee4611da5aa51
-DIST tor-0.3.2.6-alpha.tar.gz 6310498 BLAKE2B d4d68e788c748eac4aacf712b09d8ab821ccaf9354fbaf5f9cb1ffd5d54b55c5da9e455c2b4b9afe453170901bb6085841668fd1270be34f90085c06bdf71928 SHA512 24ecd93c92d73ea31967f127f9ab745bc982737da13d748afa01bf1477ed6e8191e3474d01f49efd629665807d875008558e069e02eefb15ff699dd89b877857
+DIST tor-0.3.2.7-rc.tar.gz 6313975 BLAKE2B ecfe6832b2e9c81f04218f7ec82a63f23913c1dc0a9ec29113e6432eac69b8cc89a9fc6b7c4147cf26e6de141b22574d3118608194641126d961b5f452179e1b SHA512 989bdd4311521528444f4165455365d3c1f1ef5f6a8846bf08db7f84ab8e986cba47f9dfbd3a03ccb6e3f8d813d69289768170a8fd68916e9d6a21fe0484cf87
 EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
 EBUILD tor-0.3.1.8.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
 EBUILD tor-0.3.1.9.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
-EBUILD tor-0.3.2.5_alpha.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
-EBUILD tor-0.3.2.6_alpha.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
+EBUILD tor-0.3.2.7_rc.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.2.6_alpha.ebuild b/net-vpn/tor/tor-0.3.2.6_alpha.ebuild
deleted file mode 100644
index 2e54066d6ba5..000000000000
--- a/net-vpn/tor/tor-0.3.2.6_alpha.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.2.5_alpha.ebuild b/net-vpn/tor/tor-0.3.2.7_rc.ebuild
index 2e54066d6ba5..2e54066d6ba5 100644
--- a/net-vpn/tor/tor-0.3.2.5_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.2.7_rc.ebuild