gentoo resync : 18.11.2018

4 files changed, 24 insertions, 18 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 32ae3cb42043..d2605c8e2724 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,14 +4,14 @@ 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.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.4.7-rc.tar.gz 6668322 BLAKE2B 863d24d04ba7919d08b3c69bca2edf3ee46af6aa074812f76067199670b17bb8538233c7631cb17e1cada4b2b4527b0db4b3b7a7b945ae7ca7a03e52685fce00 SHA512 664211ffd6adcdb325cf669fed9fb7c70b1416da3df046c35622b5104a4b63d9a3123eb40744bc070d29ff97472adf31b1aaecea5b91c07059d0cdad79569b58
 DIST tor-0.3.4.8.tar.gz 6679385 BLAKE2B 9cb65442effd1cfceb34f3483a0e96de5e59e9ce1bd2241533dd8eb62e4428a6c0f9decd816dda49515fc92acd8c77e69f7d39133a67fb5053a858dc78464791 SHA512 bfedc29253cb8fdbe1864ea5992ad33184577d88ab806a249a544f3b3142a7bc1453892955df335185aff72508095fb2a2a07ac6b96c99668e5e8d593d7aea6d
 DIST tor-0.3.4.9.tar.gz 6695931 BLAKE2B ebfe0f49ae923e63b0bd8a7cafc453d7b0775cbfd167463b364490faf9bbf61decd28906d8f5bb08bfa9a5a10b371d9188a5019314c0de5ace15cc379347f88e SHA512 cc254a2cc2f21b4511e9cb215ba5f05fefc4dceffcf46a402efa2d3540872a4ed8e0095245df0802ea12c1367451bc16ca60c0aea6a77e2139580f3c5ba8c02f
-DIST tor-0.3.5.3-alpha.tar.gz 6862572 BLAKE2B c4832828042bbecaf7c34bcb8999873cb4a5314598b2731cba02b2335c09fd8685588c52b15345821288cc94c9ab731c150b5010dee27d2dce1a15914ee31a6d SHA512 fdbbf5a69f9c0708afa4bb9e4925db4f7384997d7f497f1298d0106b76944c060c858fd061aa292310384e7b35f0ac41570cd89bb8c7e8208c832908fa3288af
-EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
+DIST tor-0.3.5.4-alpha.tar.gz 6867919 BLAKE2B 0b9ecb02c4399df80a641825d955ca39c6d8712e8706db63d9946698adf77cf4af0d947077e6150da60e38a41accf6e6894bd29e54c1fc590a38fbc9003220bc SHA512 8bb6c72295fb6d92301fc59159368960d1b12c3c24cbca8620efe20121192d3307fd0e44d91c5cf69bbc27486ad31ec87db04ff732a7eef36b0b5d81898d3cda
+DIST tor-0.3.5.5-alpha.tar.gz 6893528 BLAKE2B 36d3ac98cd535046110ef24f8e388481ecfac2cd01f52b8fe1f0a88e0639ee5bbf620b50b256c954f1bc37da5c99bc8bf74a29315c3def9f21e4ab845a213153 SHA512 963aeb6ecdf8c772670261a49e273a89b5a5ac4296aec445fecf42996059a1aecaadba198a495c665afab02fc55d2572f0e66a7ebfc775512d029d53c3fd6575
 EBUILD tor-0.3.4.7_rc.ebuild 2232 BLAKE2B 3932f94eadda82099130eea978fcb76a88ba5b60bc62942f40b53b1e1d3d47f6ba94d056159bb6ea7d13c4f36eee7ac74b2a1ea6c60a351f38a3dc246ad0ea63 SHA512 0550f1a625ff99adf97ff4dfccc4874596a32ae6ffbc550493acd29f3f8377c7029c142c2b9c4ecc201ab72914ccb26e583b4bd0f51cf5e590155daa870c4989
 EBUILD tor-0.3.4.8.ebuild 2237 BLAKE2B 2d21116f6249afbc98dc16881219fe689fec38c392e253d0b9661edf28d0fffb357c10c04fcf259368b66d0a25b7e2e558134cee404040b3bab78104985afad0 SHA512 64ed20c1dcd0486883729a8f90f89e80e9be5b499f17d3309313ea5aeaf29027ea82db0aa4ae00c107c3af123d4f1de5af003fbbee25cd188c2ea7cae398cb80
-EBUILD tor-0.3.4.9.ebuild 2203 BLAKE2B 86e026d6aae4bb772a64cffaa9ab28683befae6e8813e66b6f6a6f6582a591015296099346b3895beb7d8f76cc3c59eaef545d86260d48d6a336e26362983d2e SHA512 446bb80734d11b7858b6d6b5aa219816240a235bcbc2ac2c98a370f006d81194650dbf1df6533a7428f546eddfbbcb578e831633006f0b4884c2685cf5b69849
-EBUILD tor-0.3.5.3_alpha.ebuild 2215 BLAKE2B 33b04c74ef81f1ed3d18c84a0a5bf52db92d42037444d432f181cb36eef2b0cf056f79f642e9023758b6e2706253c122c43fe8e065e38865f555fc6d51263bc6 SHA512 bb2c831146afe5a57e4607c0cdaacc57b0b57667d514e63b31ba3d3468916b98836a96fffdf251ae41d9d52c92352174ece6c4e4eb069dafb9a677fa8fa7943f
+EBUILD tor-0.3.4.9.ebuild 2202 BLAKE2B a0ae4ad979a126c4f78b4f32b7749ac425a0a51d32dbb54508973a91295074132f53935dec0840cf46a19f88eeea9f780bd65b9fd56ff65e112a642f1cd7e02c SHA512 b747e90b10303417487e3314141f26bfa8aafe12fa37b8c4c705932880d8b9620938f02c754365fdb39d78b9b322985f3bdb8b73a25ed3bf0c5193dbff5f8482
+EBUILD tor-0.3.5.4_alpha.ebuild 2181 BLAKE2B e65939c84bf205ea13500ee921724db11064a4aade605a9a6fd71ff4294927bceac1d2148eb77821a678c369318f6ce03666ec5b503aabaf87108dc8fd01704b SHA512 4a1e55cc587658858d4156181336a3962904a1ee5f89e8e31dec37eacf6d9217f604c5221c05d756213c5e31fa34957c452bdce8993379558b21045a45e1d61c
+EBUILD tor-0.3.5.5_alpha.ebuild 2181 BLAKE2B e65939c84bf205ea13500ee921724db11064a4aade605a9a6fd71ff4294927bceac1d2148eb77821a678c369318f6ce03666ec5b503aabaf87108dc8fd01704b SHA512 4a1e55cc587658858d4156181336a3962904a1ee5f89e8e31dec37eacf6d9217f604c5221c05d756213c5e31fa34957c452bdce8993379558b21045a45e1d61c
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.4.9.ebuild b/net-vpn/tor/tor-0.3.4.9.ebuild
index 3e64c44d21ed..b411030684bd 100644
--- a/net-vpn/tor/tor-0.3.4.9.ebuild
+++ b/net-vpn/tor/tor-0.3.4.9.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 x86 ~ppc-macos"
 IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.3.5.3_alpha.ebuild b/net-vpn/tor/tor-0.3.5.4_alpha.ebuild
index eec218e6109b..c6f1f5f1020a 100644
--- a/net-vpn/tor/tor-0.3.5.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.5.4_alpha.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+inherit flag-o-matic readme.gentoo-r1 systemd user
 
-MY_PV="$(replace_version_separator 4 -)"
+MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.torproject.org/"
diff --git a/net-vpn/tor/tor-0.3.1.10.ebuild b/net-vpn/tor/tor-0.3.5.5_alpha.ebuild
index eda70f132ce5..c6f1f5f1020a 100644
--- a/net-vpn/tor/tor-0.3.1.10.ebuild
+++ b/net-vpn/tor/tor-0.3.5.5_alpha.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+inherit flag-o-matic readme.gentoo-r1 systemd user
 
-MY_PV="$(replace_version_separator 4 -)"
+MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.torproject.org/"
@@ -15,14 +15,14 @@ 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"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="
 	app-text/asciidoc
 	dev-libs/libevent[ssl]
 	sys-libs/zlib
+	caps? ( sys-libs/libcap )
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 	lzma? ( app-arch/xz-utils )
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
 )
 
 DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
@@ -45,19 +46,24 @@ pkg_setup() {
 }
 
 src_configure() {
+	export ac_cv_lib_cap_cap_init=$(usex caps)
 	econf \
 		--localstatedir="${EPREFIX}/var" \
 		--enable-system-torrc \
 		--enable-asciidoc \
+		--disable-android \
 		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
 		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
 		$(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)