gentoo resync : 16.06.2018

3 files changed, 91 insertions, 3 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 160fb4a7f895..30ec505ac6a3 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,9 +7,11 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a
 DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.2.10.tar.gz 6421984 BLAKE2B bab8031982f05ee29b14d22fdd9c4912e35342e6ac57a1c3fe1d5de3c4f394e0211607d20917b705a5f489109511a7ed7761e1dd7b4310c3d112c5e7cf9964bb SHA512 b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
 DIST tor-0.3.3.6.tar.gz 6547166 BLAKE2B 6fe88b991cacf14541c264629fb916d049f73c13c70a1e82d6e5683edc42f3f6093df3ff3a3a313ba6373f36f4eb9b6a8fd92e678517cfcb0b0c5a9ec54494e1 SHA512 ab2a6324844c0015c58b65faf61e9b72fe1aca2c90dc3c2970939f962f7d999483e223b980f3088207035d2ad1dc6a5628a253a486e048a072b4c5022b9cb0d3
-DIST tor-0.3.4.1-alpha.tar.gz 6603160 BLAKE2B 9fc0049ddd367198174fe612709cd61eabc6052153cbdc49c65090a364e3042331cd7c221ebac6cb4aa55f06f18dc7f57ad882d41b21154ef7bfab9e564936d9 SHA512 d27e65a2b9d2505051a3d5b95955010eae8cca0d220cb9de75f5d59eeeebf2484b11fd1d27f5fffa80917e1f3ff255ed674ab821af1403b6d6795617b1a9557f
+DIST tor-0.3.3.7.tar.gz 6564968 BLAKE2B e153d72a29ce4adb558e8062fd4c2ebd37ac557834358661cdda243703505f2d6263282079b92535cccba673af7a9326be5086ee3f91e58f4b26b8ac7316a2c9 SHA512 70c7d089fecde7d5c4ccf4fc0c774aa3da2121f297012065292f9e5efda54206365ef1fa830116ee143b027f5023a5eadcd6fd4629c4d2d930c12fa9fa7abf9d
+DIST tor-0.3.4.2-alpha.tar.gz 6634506 BLAKE2B f5fd597c0df5d49230d380b8a989cc1549d7e0249269fe5dad4cbc62dcd4f1bf03320f330591379be97a6ca19625f9c3813fb16728be9e8e0b9b446da6e127a4 SHA512 cec88017f1a36a74234eebfe83cca0d983ac698c5e27c6861d107e3776d89074b4dd654fdea943e325ed0ca81d7a64dfd80bda61f26a73d29ec75b940323a930
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
 EBUILD tor-0.3.2.10.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
 EBUILD tor-0.3.3.6.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
-EBUILD tor-0.3.4.1_alpha.ebuild 2227 BLAKE2B aaf77e98cc42a8c1242369461588ff79c03178ae6a9d0d26c3fad005ce1b82df65839c69bf213e07d8d65ed0f54dc5e01c2d28d96caef1da3a0f33ef9566c1bd SHA512 6af1b997f67e65e66c4ca8423319efc4c3e86145748e1247d42337fc4f273d647daecc2da6e4671355eabcaac64c8c444373b43a228746f2b5fa675e41df17c7
+EBUILD tor-0.3.3.7.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
+EBUILD tor-0.3.4.2_alpha.ebuild 2261 BLAKE2B df921bc4d42256443956133b20f35fd8f6bb9a5c096b10d0cca4e7b5799e021186386775eface12c880a41b1367859efdb251185f505273126a4ca97bc7ab457 SHA512 8d7a9de9a3ec18951cb416ad75c6bccc7771451b34286243ae8d8ed7675834d0903695fd76e56872c0ffc4ba296b83c4dde0fe408b0a70274f51f521950d2b36
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.4.1_alpha.ebuild b/net-vpn/tor/tor-0.3.3.7.ebuild
index 6cba207ff123..655250741364 100644
--- a/net-vpn/tor/tor-0.3.4.1_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.3.7.ebuild
@@ -53,7 +53,6 @@ src_configure() {
 		--enable-asciidoc \
 		--disable-android \
 		--disable-libfuzzer \
-		--disable-module-dirauth \
 		--disable-rust \
 		--disable-restart-debugging \
 		$(use_enable lzma) \
diff --git a/net-vpn/tor/tor-0.3.4.2_alpha.ebuild b/net-vpn/tor/tor-0.3.4.2_alpha.ebuild
new file mode 100644
index 000000000000..2a7722eb02ef
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.4.2_alpha.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 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
+	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.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-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--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)
+}
+
+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
+}