gentoo resync : 16.06.2018

13 files changed, 106 insertions, 71 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index cf1546893e3a..9ff0e17d4d84 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index d41a16a1c07f..8e26600bafde 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -2,4 +2,4 @@ DIST openfortivpn-1.6.0.tar.gz 55606 BLAKE2B 649ca2a8112313fc7b63d89867efe33c4cf
 DIST openfortivpn-1.7.0.tar.gz 60073 BLAKE2B 422e21daa4ee340009f9e1d660f12b4cc392e2c9694dc24cd2912c89996959907c2ea08fa3bfd11ea82c3984575f1cd1f59d671a7b4188e50ba1a9bbf77f9977 SHA512 60bf57a78e228f3f2f497f5b537abe25eb98a6fb8c41b521acf2e2182ac2c0ca12202a8c4e8d87cd230b0e35d31f4ae97f7137247b53e0c574bec195de0f4275
 EBUILD openfortivpn-1.6.0.ebuild 766 BLAKE2B 3dfa3574c89f8101c5e10915118fccf5d5bf50954d411390e501d701fa746a6f58b89fb0b37140bb301c4baea697ec527cceb77b38107842f433b55139c907ef SHA512 f5e8bdac45457934df2e749c45eb91e15909edbdb3b3aab3891bef1a34732e6dfab2f739954c9240250d0e09a5cf5a93a378a5cc1b7d9e3770f1cf682f578704
 EBUILD openfortivpn-1.7.0.ebuild 767 BLAKE2B 80b75f28a23b3af0b2e60c35b73079bb71d3ac1489a4dc8296188386abc82a2f951b674f3d7ff9223c900bd4ab6483edc0ae38b851ed2bb2232c319e752ef51f SHA512 56d386a18c0363b1c35057cd6bca72da55b06671238a363e4f7ad3aac50207c6358d7118d864a5df6daa4aa03a9e544c4e7b757250ec1310b1e597653eed80b1
-MISC metadata.xml 473 BLAKE2B aee10343291eb84a3f404dddaed244e982587a4f74aa1e9e0d3dc6d2d888a77a03dd944e2c607cd51d895d193387e2cd81cd1c3f10d212ab52ed4df68081882b SHA512 d2807f01f5e74e765e1ee6fc23b917c78987f7f73672cfa019ab4e96c387105a5e8f90a53b1ffbf079f832a7bbaf74a9938cb2f9bb2fcc7a7deb76cf99b9469f
+MISC metadata.xml 333 BLAKE2B e32a7c48154b338f9919dbe5f5fca6d91c33f2cfb1d13a955d4dc4ce7e79bcc8f7fd0adbd7595804d4d1973604cd2c8df2135b32d70d465915823bacc4adf6bb SHA512 bb066ff19adb6a336fa96af47323cabab75d7959794e1c72a32736538aeee18d0225da8696e5eb945c5b0eeb1fe4a5972cddc2b18d71fadcf3246a929addf74d
diff --git a/net-vpn/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml
index f70327221315..94ab0e40cd4e 100644
--- a/net-vpn/openfortivpn/metadata.xml
+++ b/net-vpn/openfortivpn/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mathy@vanvoorden.be</email>
-    <name>Mathy Vanvoorden</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">adrienverge/openfortivpn</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>johu@gentoo.de</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">adrienverge/openfortivpn</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 6e51f9d4e674..002823cf792c 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -10,6 +10,6 @@ DIST openvpn-2.4.5.tar.gz 1430930 BLAKE2B 3ff1324b18fdc24109085a4958401e6d5636b5
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 EBUILD openvpn-2.4.4.ebuild 4671 BLAKE2B 40962a19add6aca1a388cd121852d79496e8b1a496f78e0a86fe1b7498b445bb3a367f89e35d56d061dcd29d086ffd5f9e26eb92f05a66f4cac588a53609f951 SHA512 a02edb8f48fbe348d58cfbe35dfc07c7886844a64c6955f2ad0c317b92a6e86ec19cd44e140e4d1ca7bb326fd888ac1610c4533478cacf2fcf495286b031753f
 EBUILD openvpn-2.4.5.ebuild 4724 BLAKE2B a9d07e27b4c23da4d00831a0986389ce0c308bdee95680b6a6c5244e87f95d8742b7ed99ab02af086582ec78a837b3199ef00b3c0c1262117af596c151537883 SHA512 d06e458407309246c87a93a1beb29431dd7621560a3704ab04a27f22303e880e6a9da165f7e9293f1aa443e60752e939b0d4f15803f509b3e78a830f05b653f1
-EBUILD openvpn-2.4.6.ebuild 4728 BLAKE2B f2e20428fc10ef77c4abdee4dea1945e682a1ea2ea3c21ada4fb015c8e835fbd3fbfeefd58ca5c46917b46696793a835c9b96bb7ca516de56f26e2caf7232148 SHA512 c1ef3ff65a11cf46e744c05a320546fe1ecd19fa9b834a96d01e4b62670546fab1dad8ae6add83f453e6e98773cf52247619d2e75ae448d79bead089f1250259
+EBUILD openvpn-2.4.6.ebuild 4727 BLAKE2B f8e5d659304b6a309f504cf6e794e04d73cb61e88fe6702aca8027d935ec35e7bae9b1d9a810c14a29ee4c1c67b9ef150f393fa23a88b4ab063fc7fe1e6086f4 SHA512 aa9cb52bdb5d54ef7da3c84172a8896b369c012e38177282916c2f3965203f172c7da888ef0eb2e812aceca35bff1c3a426138099e1d2576421b5a4bbb36af64
 EBUILD openvpn-9999.ebuild 4474 BLAKE2B 2f86c306a76bb95d5c9dd0815c4cfb3148d39e8c4364b727d6c6115c5942d87eed921ef7cdf98b82ee2244d1e18444ef2c3a09295dee07548ae5bcb6713d43bb SHA512 7aa03b7ff2999dcaad84837c554618c5eccc4e5ed6e0ea93705410148526143a27b4245968c9b7c5d531a95bdd74fa7d81de0ae312f3b6b54bf46dc7a7ab45ef
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 390731822f62..957fe13513c9 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 5765326f5f68..903276798ead 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -5,12 +5,10 @@ AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c
 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e
 AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a328fa8ff759ed2f5f42d82a0d3555302cb87d4dfc5521e1850a41b9c5332e9210284f1cb0091 SHA512 f8d9354af5ebc07420ced98059262751bffef434b61c6333964338f327e2ac01ae676e375954efa794a1bccf8b939c78387b9fb7261f675f1237b0d946b529c9
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
-DIST tinc-1.0.31.tar.gz 494877 BLAKE2B bdb47a9026d26cb2681da2a83931063d818a851e9e41dbd27ac131937abda68769b973afba74445bab7999599d766b3375ef853a6ed8740027ba119cfc5d2d89 SHA512 ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622
-DIST tinc-1.0.32.tar.gz 496221 BLAKE2B 692053d2bb690d1b2e76070f3dbae12ff4f90803434f62e0d7de0d1739312e5873abacbacccc976eda9860882846789732750364886961d4c5c164bb88d84a09 SHA512 1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
+DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
-EBUILD tinc-1.0.31.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
-EBUILD tinc-1.0.32.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
+EBUILD tinc-1.0.34.ebuild 1212 BLAKE2B b1561117d04453a25dba0f834a30e7ca816fb439cecb5bed8879a73d980290e10ead3b77d2cd0332a16af4b3e0bb5ad9c8db71ce6f45af224f92d954eadb3a6e SHA512 d58d37be4d1c8852299bd9c72f152c2e156ff6838e04b4fb3d21bd7dbf218f53f37acf4edac292b1ba10fb7dfab295ee3d546e774866fd4cb0a82551c077f9e4
 EBUILD tinc-1.1_pre15.ebuild 2330 BLAKE2B 677427570cdf3eba07d8c12af052576e4275d5995387828dced0520eca51bab34c432b8822dacd7b82f473e80b2c4b576b76038e834ce0344ecbf0043e05047c SHA512 b0a73cd46da15d49c40dbc76c12348b3577d6f1ed17182ba57bd390a0b01eda2e878443c9061fbb6b4f5b81a775120c5024e8ae34eed70a6a0008aeb9bbe274b
 MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac
diff --git a/net-vpn/tinc/tinc-1.0.32.ebuild b/net-vpn/tinc/tinc-1.0.32.ebuild
deleted file mode 100644
index c8adaa0c7d3e..000000000000
--- a/net-vpn/tinc/tinc-1.0.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-	newinitd "${FILESDIR}"/tincd-r1 tincd
-	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
diff --git a/net-vpn/tinc/tinc-1.0.31.ebuild b/net-vpn/tinc/tinc-1.0.34.ebuild
index c8adaa0c7d3e..717bdeac65a9 100644
--- a/net-vpn/tinc/tinc-1.0.31.ebuild
+++ b/net-vpn/tinc/tinc-1.0.34.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"
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
+}
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 4414e3d27fe5..34e150800443 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,5 +1,5 @@
 AUX wireguard-openrc.sh 915 BLAKE2B 1185374a61591b0d6917f7c15f2040b9dd0fb76b5fd007f24cd25396a2814bcd323935c5d642ca2120f60fa16e82cf21ecb723741ecfc012f5404714b203e60d SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb
-DIST WireGuard-0.0.20180531.tar.xz 269880 BLAKE2B 36e9907742b26ecc57a98c54560dd23a0680fe113ed310bd41b3f454913366438d85deebfa7568ed7cb33b9fd2ca914157f0a4198ecc532d3e24e5e74a878d66 SHA512 1dfcdcf41adffdc42dcdbb0a84478b28574613b7834c7d1ccd17f176bac1d664afe824c850baf7d34213380ddffdfd66ddc5cbf7861904dc8359d2005ff07dff
-EBUILD wireguard-0.0.20180531.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
+DIST WireGuard-0.0.20180613.tar.xz 269316 BLAKE2B f2e005391971a9465e8766ca92ea70a7051cda7b9bededd260885df3665444b96ab0099f5d25e7ad060ee5459e4d7f3c94dd4dfcbac1b025f0fe822253679542 SHA512 dc61cb61e507bee3d07aa059a0c2f61812641797d041bade49797e31738858951d7ab209e6b5fdcf052a585754c8aa7d5a203474889b193513abfa7e87942181
+EBUILD wireguard-0.0.20180613.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
 EBUILD wireguard-9999.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20180531.ebuild b/net-vpn/wireguard/wireguard-0.0.20180613.ebuild
index 3a4681c656a9..3a4681c656a9 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180531.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180613.ebuild