gentoo resync 08.09.2018

21 files changed, 336 insertions, 339 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d719271b4797..acefe7def16a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index efa9342d6860..508dfeff9290 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -3,10 +3,8 @@ AUX i2p-0.9.31.initd 1107 BLAKE2B fdfda220dd31fd2f49c1b92e9d1cd64ff3787a9f94031f
 AUX i2p-0.9.31.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
 AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103
-DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2
 DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
-EBUILD i2p-0.9.31.ebuild 4239 BLAKE2B ae3db6272e5f18cdb07d42a6bdf7c8c4d8912e29424dfe30ce733a2a34ee00d0f3cad8cd0a17477829de6f68f8f71bb490ad937bd023f56df2a9a38f54145947 SHA512 3139cc083e5e13d5c4d7693801127bf271f1431e103373561ecb27829b5206435f0050cb6b417f46ef1c03394122a989000450805aa91b05c1847f8dc09857e8
-EBUILD i2p-0.9.33.ebuild 4227 BLAKE2B 8a0270c41a8c3ca6d727cf01eb1daf58aba144b384039bb131d70d18f18f79c9baabed9d2f21bf0a10bc0a4843ff074f94a0ba33c903540717e13d5fe4f59460 SHA512 a3143b919829a2e67ff8429965b90a6dbd3fa8f81562cbf0512fdc7123c89b028bd24878d93a7abb5d40e4ae2f547b740d37b809569fefd93418cbb7c6eee025
+DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
 EBUILD i2p-0.9.34.ebuild 4049 BLAKE2B a0104622fd5e19989304d3c0572715ea87cb9684aa6c8f0ef264f5fc17f592a1865e14211c932a4a0a8cb89e05f2f914a20867c141d2009764a60c361a2e0e3d SHA512 66fd700c6493bc79b5580b3c811eb0a7043d69b2b1033d4b1f0d95a5c0071a7af33a358a11c308ff9afc16a4b9027168d5cee13a2db7f55ac3ed3cfdbf13c314
+EBUILD i2p-0.9.36.ebuild 4184 BLAKE2B 58fcad81d8247848e26af7881178618720778af04d513d972e4e894eeb37509cef7c09840bc075fe81b6de77ba33609d1bea73675cbc1ef2fd5cfa3dd3e82864 SHA512 46e4e100d34e65d11383a0e731788866e9c77137050c95c02869ebf4ae1db098bcaa9f1c31adc549ff3c6b02b667d257ea560fa62e90ea2214efac7e715ef1bf
 MISC metadata.xml 894 BLAKE2B 7f1415ae58ff6b83e05824111e0de818bce0f6b00fda294124eb838d3d24bab43e03f9224cdb3eb5e9b0625cb4a930fce107aa508275e398362ae4d3be502a73 SHA512 dbb318ce927a56d1f0d84cec63b1265969dd4d77021d36ee93e253c4cf02238265aa02a292353d6f520c223b433ce7dcafe605ce2bf97fa253e97f286be34cdb
diff --git a/net-vpn/i2p/i2p-0.9.31.ebuild b/net-vpn/i2p/i2p-0.9.31.ebuild
deleted file mode 100644
index bf868bfbd84c..000000000000
--- a/net-vpn/i2p/i2p-0.9.31.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils java-pkg-2 java-ant-2 systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network."
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/bcprov:1.50
-	dev-java/jrobin:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/java-service-wrapper:0"
-
-DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	dev-libs/gmp:0
-	nls? ( >=sys-devel/gettext-0.19 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
-	ecdsa? (
-		|| (
-			dev-java/icedtea:8[-sunec]
-			dev-java/icedtea-bin:8
-			dev-java/oracle-jre-bin
-			dev-java/oracle-jdk-bin
-		)
-	)
-	!ecdsa? ( >=virtual/jre-1.7 )"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-I2P_ROOT='/usr/share/i2p'
-I2P_CONFIG_HOME='/var/lib/i2p'
-I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p"
-
-RES_DIR='installer/resources'
-
-PATCHES=(
-	"${FILESDIR}/${P}-add_libs.patch"
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-ant_rewrite-classpath
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
-		"${RES_DIR}/clients.config" || die
-
-	# we do it now so we can resolve path after
-	default
-
-	# replace paths as the installer would
-	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
-		"${RES_DIR}/"{eepget,i2prouter,runplain.sh}  || die
-	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die
-	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
-		"${RES_DIR}/"{i2prouter,runplain.sh} || die
-	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# This is ugly, but to satisfy all non-system .jar dependencies, jetty
-	# would need to be packaged. It would be too large a task
-	# for an unseasoned developer. This seems to be the most pragmatic solution
-	java-pkg_jarinto "${I2P_ROOT}/lib"
-	local i
-	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
-		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
-		sam standard streaming systray addressbook; do
-		java-pkg_dojar lib/${i}.jar
-	done
-
-	# Set up symlinks for binaries
-	dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc"
-	dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter
-	dosym "${I2P_ROOT}/eepget" /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto "${I2P_ROOT}"
-	insinto "${I2P_ROOT}"
-	doins blocklist.txt hosts.txt *.config
-	doexe eepget i2prouter runplain.sh
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	dodoc -r licenses
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/${P}.initd" i2p
-	systemd_newunit "${FILESDIR}/${P}.service" i2p.service
-
-	# setup user
-	keepdir "${I2P_CONFIG_DIR}"
-	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
-}
-
-pkg_postinst() {
-	elog "Custom configuration belongs in ${I2P_CONFIG_DIR} to avoid being overwritten."
-	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-
-	if use !ecdsa
-	then
-		ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
-		ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
-		ewarn
-		ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
-		ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
-		ewarn 'as the one you built with.'
-	fi
-}
diff --git a/net-vpn/i2p/i2p-0.9.33.ebuild b/net-vpn/i2p/i2p-0.9.36.ebuild
index cf3d2654ed13..5bedf3debbfa 100644
--- a/net-vpn/i2p/i2p-0.9.33.ebuild
+++ b/net-vpn/i2p/i2p-0.9.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit java-pkg-2 java-ant-2 systemd user
+inherit java-pkg-2 java-ant-2 multilib systemd user
 
 DESCRIPTION="A privacy-centric, anonymous network"
 HOMEPAGE="https://geti2p.net"
@@ -26,7 +26,6 @@ CP_DEPEND="dev-java/bcprov:1.50
 
 DEPEND="${CP_DEPEND}
 	dev-java/eclipse-ecj:*
-	dev-libs/gmp:0
 	nls? ( >=sys-devel/gettext-0.19 )
 	>=virtual/jdk-1.7"
 
@@ -39,7 +38,9 @@ RDEPEND="${CP_DEPEND}
 			dev-java/oracle-jdk-bin
 		)
 	)
-	!ecdsa? ( >=virtual/jre-1.7 )"
+	!ecdsa? ( >=virtual/jre-1.7 )
+	net-libs/nativebiginteger:0
+"
 
 EANT_BUILD_TARGET="pkg"
 JAVA_ANT_ENCODING="UTF-8"
@@ -82,13 +83,14 @@ src_prepare() {
 	sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
 		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
 		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
+		-e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
 		-i 'installer/resources/wrapper.config' || die
 
 	# replace paths as the installer would
 	sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
 		-e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
 		-e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
-		-i 'installer/resources/'{eepget,i2prouter,runplain.sh,wrapper.config} || die
+		-i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
 }
 
 src_install() {
@@ -96,21 +98,16 @@ src_install() {
 	cd "${S}/pkg-temp" || die
 
 	# we remove system installed jar and install the others
-	rm lib/{jrobin.jar,wrapper.jar} || \
+	rm lib/{jrobin.jar,wrapper.jar,jbigi.jar} || \
 		die 'unable to remove locally built jar already found in system'
 	java-pkg_dojar lib/*.jar
 
-	# Set up symlinks for binaries
-	dodir /usr/bin
-	# workaround portage absolute symlink limitation
-	dosym '../share/i2p/i2prouter' '/usr/bin/i2prouter'
-	dosym '../share/i2p/eepget' '/usr/bin/eepget'
+	# create own launcher
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
 
 	# Install main files and basic documentation
-	exeinto '/usr/share/i2p'
 	insinto '/usr/share/i2p'
 	doins blocklist.txt hosts.txt *.config
-	doexe eepget i2prouter runplain.sh
 	dodoc history.txt INSTALL-headless.txt LICENSE.txt
 	doman man/*
 
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index a20f180fbc32..b00ad7b0cbfc 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -8,8 +8,8 @@ DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2
 DIST openvpn-2.4.4.tar.gz 1390194 BLAKE2B 52aa5b9d301b4b5a14acf685f4d4c520d5ec1aa06755262a8504a4c3bb5ee1b8435f68eb4278f25b900f9ae182f31688ef36e4e839ec7a211ad6aba0f76a897a SHA512 3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76
 DIST openvpn-2.4.5.tar.gz 1430930 BLAKE2B 3ff1324b18fdc24109085a4958401e6d5636b5dc47d30e21392c17410625215bb20473409410ed74995a1b4bb2650ed62217b64b9184805a15ac1ff64a7a8a73 SHA512 a2e3e23bb5374e26d5af393f75686af1962980838c46aee062bc65cc9ffb6f1d20c2c261d1f9abae56ff84a5d22da4a5edb21e39943b33f4a205f809190383c6
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
-EBUILD openvpn-2.4.4.ebuild 4536 BLAKE2B 01c80f6db733039c406a004fc1486d663da55bc0b982b60ff08fe4fa5f3864e7febfd60c9903b603feb69ae1cd74b0afac8acf2057e0e946629fa053e5c36ace SHA512 f81e0a6eb3f53b1211c77e582b23a31daccd3b796085b4ca7afde7c55fc1712d190cea8a4951cc0d1c3e5c7b16a50d2b7a1898f5f56c738e4f313cd9af640478
-EBUILD openvpn-2.4.5.ebuild 4589 BLAKE2B 95b2f0233ea722fa15fff9dcfe4d0a47c03b4003ee6fc07dee66fbe3ae82bc4368a4078f0454bc01833ec59a5cd24310e51c44289377ee57012dfba2d551957d SHA512 208e2cbbb00dec3568b05b6d6ffb4ad8bb34e9aeeb1d3faf9f86f919d9c5de2b300756cefd7788c3af0807d56db5ebd5de24cd420014e7ceb96399900a5b3391
-EBUILD openvpn-2.4.6.ebuild 4588 BLAKE2B 5e6aeaf998aec5567ed309009db77ed6494f32a12d5e654d46279ff26a0df0e948af6ae9cd6759a914672e440e621436b7f3d3c6432b9b4427a64313cc002b3e SHA512 da91cb73bc4ca4a23f09109761563b5543e887c37fe8dc7d6bfd1e723fb092bb1849ca35bcff393e6614a163271b0785051c1f27d73765ee081c35ad9c8d2d6a
+EBUILD openvpn-2.4.4.ebuild 4525 BLAKE2B da8091a890e1ce24333475823d7caf909ab4c4afeebf5814e8099f0116618e667d95b7a2a98d4f733db7cf0a9654c1b4fa19a58ac14cc4eebf4f030258326e06 SHA512 0b71042f784c281f02502ec287192c482fb3793b66f2a857b232dd3c583c87f1336c35eb2b5eb341a671cc2d99e86efc411db10135e75d6b1a1dc269e9313578
+EBUILD openvpn-2.4.5.ebuild 4578 BLAKE2B a15f67aef482b198cf197b63f85cdb79c22e7afcf012a0b9f0af0a461ed50825a809c7c1e1647b821fed88ae0582d94edc5ab38cc295098852936d4879206c0d SHA512 1c7bc3c4c67231f35b905e311b4e3e86247b2b9643022d1e4163b316b6ee55c85093e693c47611c0148db609911a51b64abaeae87bf056bbc7e36dbbbbb56ecc
+EBUILD openvpn-2.4.6.ebuild 4577 BLAKE2B e8828ba11b3d6026ebddd2f7c64aa351881b99f9bdc2ad480347db796eaf1fa139e1d3478135e53287439a97bd6904e6911b0ff361110b9d6e32e454ff76c6e6 SHA512 b906ae2d8281893d36ed87bf4b6a58c9d8dfd11dedc2f78bdbaf00f246a32a987b50347dd6142c9224e4744bb34146b154e31c9f68b9d938dc21c1bc12a4bf92
 EBUILD openvpn-9999.ebuild 4339 BLAKE2B 8df1da9cb15614c3f0f71d4233209b302517df5d7e7c1eb3b81f8b5ceb71ed94717a9c1599ad21b4cc33f194a5c713d71f4e473bede6fc9b43a2a23e7b4ef2fe SHA512 7d10a8ea396aa773500904e4ecb9722ba30976a1655bea3d6534c062b2e0fa7137d75a6dbcfffecd1a14e26f520a6ebc04eec4584d3f0acc6d8ac733452badd3
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.4.ebuild b/net-vpn/openvpn/openvpn-2.4.4.ebuild
index aa8b2b1360c9..cce5cb024e15 100644
--- a/net-vpn/openvpn/openvpn-2.4.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.4.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 ~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/openvpn/openvpn-2.4.5.ebuild b/net-vpn/openvpn/openvpn-2.4.5.ebuild
index a856d6a63b82..2af9fe7d179d 100644
--- a/net-vpn/openvpn/openvpn-2.4.5.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.5.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 ~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/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 650d907715fb..09a11b23f047 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 ~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/strongswan/Manifest b/net-vpn/strongswan/Manifest
index aae2af1b3d72..a490f3f72b47 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,8 +2,10 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a92576fad2a5c6379b93d8a2e9d3b0804fe26dc0bc7b303754ef499ee938549c7cafbdf9a3f8f818d14cf88f613fe0fd SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac
 DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
 DIST strongswan-5.6.2.tar.bz2 4977859 BLAKE2B 83943ec95e6b95724e9fc130a09f7c7364147d0ce50528ac8b64452db53516b143e92c7dcb746c0c25aaac9182dda14d55e5c267fbdcd5bb9a63cbf48801274b SHA512 cf2d5cb6c45d991fe0ad8eed4ea8628f95a1871e9728ddf0985aa26e78d1e6da1c92c961772aafd3e55cfcfa84516204a15561389d373f78140f05607b248c52
+DIST strongswan-5.6.3.tar.bz2 4961579 BLAKE2B 177d9ca9a730c8ccb3293c9f1c1397429879177aef60c90a3561fffed64cd4fe18cdf1c74bd52956c576e061ce33935b7dc34864576edeac7d4824841b0ee3e0 SHA512 080402640952b1a08e95bfe9c7f33c6a7dd01ac401b5e7e2e78257c0f2bf0a4d6078141232ac62abfacef892c493f6824948b3165d54d72b4e436ed564fd2609
 EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
 EBUILD strongswan-5.6.0-r1.ebuild 9314 BLAKE2B 526b99054b055536ab9956c6650fa9d0dad0e28150a5e1b3e871de20c7472826fc4b0115609180463eed81b76e0acc995a62024c83f74466aeadfd910cc592e4 SHA512 d9ee1657e33d7a2cc9c863ba7968e1766c0e565840c95f730fe35acb45e4aaa60d438f0a30e553806a1924c1440fb2607e7d1a5d552d23260a10fe10876bdff0
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
 EBUILD strongswan-5.6.2.ebuild 9318 BLAKE2B f69307282c88a473ca7da3b15d58036863a4bb117ce6dea4066facb3cdd56df45a3222d42badaa598d734d3576d76dbff14cf0cfe2c77219244088c8606f4ae4 SHA512 ead13610287054356ccc76003112e45fce574578b8f4bcc6657938f7c472e2bcfc7c7e0f52ff09383ef3b94df79a7533ceb59a4842a19b73eba9c744393cad60
-MISC metadata.xml 3540 BLAKE2B 476b299ee9d4bae6c572f11c487fe4c185cde5c43188d78282af7542a850d445cbd955c63a544f457eeb8c687f793462a256209c13f19e1409cc9a7c6d474afc SHA512 9935d34790dbea54dd67fc673ae11da32f0a946ef8942f5f0f228187227aeba2ee85ac01cf9327471522c2122c1aa748715d33f38d4759f715b7ce39186b1b79
+EBUILD strongswan-5.6.3.ebuild 9418 BLAKE2B 82da0e70c5996431f27495bd4839b8f08cc28e8316c0cd9a6f0e4c55c0191b566f1c654ac831c145f25ab1d2c9b640e0726ad1426e21e9e6670c5ce5d4d1df7d SHA512 74be972d938e05253d7bfc574b160913b8ff582e59ecc7af0ec00fae9c772492ad3d60cd502326bc769371c63517f4da38a4ee7eb666d4fd532006d043000398
+MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 0e0b41e2fb4a..7b8971742241 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -22,6 +22,9 @@
 		<flag name="non-root">Force IKEv1/IKEv2 daemons to normal user privileges. This might impose some restrictions mainly to the IKEv1 daemon. Disable only if you really require superuser privileges.</flag>
 		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> plugin which is required for Elliptic Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES, AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2, MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+) <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".</flag>
 		<flag name="pkcs11">Enable pkcs11 support</flag>
+		<flag name="strongswan_plugins_aesni">Enable support for Intel AES-NI crypto plugin</flag>
+		<flag name="strongswan_plugins_chapoly">Enable ChaCha20/Poly1305 AEAD implementation and ChaCha20 XOF plugin</flag>
+		<flag name="strongswan_plugins_forecast">Enable multicast and broadcast forwarding plugin</flag>
 		<flag name="strongswan_plugins_led">Enable support for the led plugin</flag>
 		<flag name="strongswan_plugins_lookip">Enable support for the lookip plugin</flag>
 		<flag name="strongswan_plugins_systime-fix">Enable support for the systime-fix plugin</flag>
@@ -33,9 +36,11 @@
 		<flag name="strongswan_plugins_gcm">Enable support for the gcm plugin</flag>
 		<flag name="strongswan_plugins_ha">Enable support for the ha plugin</flag>
 		<flag name="strongswan_plugins_ipseckey">Enable support for the ipseckey plugin</flag>
+		<flag name="strongswan_plugins_newhope">Enable plugin that allows key exchange based on post-quantum computer New Hope algorithm</flag>
 		<flag name="strongswan_plugins_ntru">Enable support for the ntru plugin</flag>
 		<flag name="strongswan_plugins_padlock">Enable support for the padlock plugin</flag>
 		<flag name="strongswan_plugins_rdrand">Enable support for the rdrand plugin</flag>
+		<flag name="strongswan_plugins_save-keys">Enable plugin that saves IKE and/or ESP keys to files compatible with Wireshark (for debugging)</flag>
 		<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag>
 		<flag name="strongswan_plugins_whitelist">Enable support for the whitelist plugin</flag>
 	</use>
diff --git a/net-vpn/strongswan/strongswan-5.6.3.ebuild b/net-vpn/strongswan/strongswan-5.6.3.ebuild
new file mode 100644
index 000000000000..906869df80cb
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.6.3.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="aesni blowfish ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
+	mysql? ( virtual/mysql )
+	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+
+	if use non-root; then
+		enewgroup ${UGID}
+		enewuser ${UGID} -1 -1 -1 ${UGID}
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO || die
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+		elog "but also a few to the IKEv2 daemon 'charon'."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+		elog
+		elog "pluto uses a helper script by default to insert/remove routing and"
+		elog "policy rules upon connection start/stop which requires superuser"
+		elog "privileges. charon in contrast does this internally and can do so"
+		elog "even with reduced (user) privileges."
+		elog
+		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+		elog "script to pluto or charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  http://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index d9d465cdad10..cb6beadf9b81 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,6 +1,5 @@
 AUX tinc-1.1-tinfo.patch 143 BLAKE2B a78500b9b020c6cd3f667f59459dd9b146baf7cdee90b96b2ed1ef62e4d9d55d8a8752f4a0544452e604d2a6962d29faf93fa6285475c9b39d72e95e94da2549 SHA512 d18d194b63dc71b8e45a0899ca325e722b4228b22370426265eaa669fb421a9b05fa87e42dbc23ce524ae61e62a99ca949e3f4d96be1f60fa0f77a8e8cb54419
-AUX tinc-1.1_pre15-fix-paths.patch 1469 BLAKE2B de939576010a60fa74e1bb5880a7eef2e0c77c7c853d3640d0b779642f0a2dbc83c927e8f9b75183a08cc72345c583139b28d0b3d345f5737be033b7eabea0b8 SHA512 55bd0e61a1d10a89d879d5113082f0cdb5ff6bf1d1fb3f618c459eb2658836bf602f72fe27ac03ec78746e300a3a5178db053eef6f08d3cb34b11410dbeb05de
-AUX tinc-1.1_pre16-fix-paths.patch 1461 BLAKE2B 4891e18e3c72cb97c553b67b066f432f50cbe8dd227df7ed5b1a3e2c68e5f43e51879ca6ed1d78e66a873becad983ba9daca33d211c8cf203a1ed51e1ae8938a SHA512 cbb43bde1b177fb3c05490e33ca764265c4e02952bc51c1ff1f644106c9e80c9c1323092965af1001a511b2a887da8443251b3a6e2ce2d8f8b2cbc493ce4564a
+AUX tinc-1.1_pre16-r1-fix-paths.patch 1461 BLAKE2B 4891e18e3c72cb97c553b67b066f432f50cbe8dd227df7ed5b1a3e2c68e5f43e51879ca6ed1d78e66a873becad983ba9daca33d211c8cf203a1ed51e1ae8938a SHA512 cbb43bde1b177fb3c05490e33ca764265c4e02952bc51c1ff1f644106c9e80c9c1323092965af1001a511b2a887da8443251b3a6e2ce2d8f8b2cbc493ce4564a
 AUX tinc.networks 387 BLAKE2B c3057322b46ee0186db4f2e9cadb8e60a318f5731e77a19e8c31e757c47c88afb8db6848f739511146bd0dc85ffdecea80c5be09890bcc3060a9b9ace9ecf855 SHA512 f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135
 AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c8dd55e29d3916f8de0befdcef4ff7862b5f741406918bba2203c8b2e13548f874edad5c821 SHA512 1308d097487ef0f1fb1763ca99565edc1026c11159775a5d0c1e41905d8332b7df734460ccea5750a7b6dd5897ecffbe8e95cb721d94ffe5b7855ec4293dc360
 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e
@@ -8,10 +7,8 @@ AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a3
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
 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
 DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
 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 2581 BLAKE2B d649fb34bf348eb2cd00c4bf9a5cccf0934bf942be39be27f394839445fb5943bfac3760ec1ea5ed296cb50906132ba78f8abf8ff522e57a84c7002549127add SHA512 f23aebfd1703bc7461e82edfa5f6be09e9e2ff1ddb14b187747d20d6d28954d58a7afa3fef25c0a33c068ff0615f4f617841e4544345c719f0e86e17f42c19af
-EBUILD tinc-1.1_pre16.ebuild 2581 BLAKE2B d0831c71756c93b56a2c2c702e1f82a9667dd7cec24432af10975e40df78ac88eaa9756e4acb8d14d9a341c93311df67fd31a3fb93b7346537d8e5fc1f2fdd47 SHA512 cc5db0007bea5002e3f0371581e68f4718b9375d611a99c8c3355d0ee632f9a864f54ba0444f270819c1115b2d988e64da2abc1b755a92115e8b60c10c7b9be2
-MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac
+EBUILD tinc-1.1_pre16-r1.ebuild 2410 BLAKE2B 45ca4aa369b5d8fb66cd8af6c25b0f124059a86fece6ad89d72f83a5e76e7a4d92b8ed84cecf256737547f596ce32c3479cd68776bd47276d74e60943048374a SHA512 e95f032539e58a0387740f34ff82c51315454b117288a21d45cc620c763a76e3c17edd32b278ef606edf3119d8edd149be117ab95ac277ed01d6819e4ff9811c
+MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
diff --git a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
deleted file mode 100644
index 519677dd5034..000000000000
--- a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
---- tinc-1.1pre14.orig/src/names.c	2016-04-17 12:08:41.000000000 -0400
-+++ tinc-1.1pre14/src/names.c	2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
- 	if(!pidfilename)
- 		xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
- #else
--	bool fallback = false;
--	if(daemon) {
--		if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
--			fallback = true;
--	} else {
--		char fname[PATH_MAX];
--		snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
--		if(access(fname, R_OK)) {
--			snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase);
--			if(!access(fname, R_OK))
--				fallback = true;
--		}
--	}
-+	if(!logfilename)
-+		xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname);
- 
--	if(!fallback) {
--		if(!logfilename)
--			xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
--
--		if(!pidfilename)
--			xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
--	} else {
--		if(!logfilename)
--			xasprintf(&logfilename, "%s" SLASH "log", confbase);
--
--		if(!pidfilename) {
--			if(daemon)
--				logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
--			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
--		}
--	}
-+	if(!pidfilename)
-+		xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname);
- #endif
- 
- 	if(!unixsocketname) {
diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
index 30cafee87878..30cafee87878 100644
--- a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index 02dd537c6e68..f6ec81bf4f88 100644
--- a/net-vpn/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
@@ -14,7 +14,6 @@
 		<!--
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		-->
-		<flag name="gui">Add GUI support, using <pkg>dev-python/wxpython</pkg></flag>
 		<flag name="uml"> Enable support for User Mode Linux Sockets</flag>
 		<flag name="vde"> Enable Virtual Distributed Ethernet (VDE) based networking</flag>
 	</use>
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild
deleted file mode 100644
index 359469d9dc7a..000000000000
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-
-# UPSTREAM_VER=1
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	lzo? ( dev-libs/lzo:2 )
-	ncurses? ( sys-libs/ncurses:= )
-	readline? ( sys-libs/readline:= )
-	upnp? ( net-libs/miniupnpc )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-S="${WORKDIR}/${MY_P}"
-
-# Upstream's patchset
-if [[ -n ${UPSTREAM_VER} ]]; then
-	PATCHES=( "${WORKDIR}"/patches-upstream )
-fi
-
-PATCHES+=(
-	"${FILESDIR}"/${PF}-fix-paths.patch #560528
-	"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Fix the static (failing UNKNOWN) version in the autoconf
-	# NOTE: When updating the ebuild, make sure to check that this
-	# line number hasn't changed in the upstream sources.
-	sed -i "4d" configure.ac
-	sed -i "4iAC_INIT([tinc], ${PVR})" configure.ac
-}
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-silent-rules \
-		--enable-legacy-protocol \
-		--disable-tunemu  \
-		--with-systemd="$(systemd_get_systemunitdir)" \
-		$(use_enable lzo) \
-		$(use_enable ncurses curses) \
-		$(use_enable readline) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib) \
-		$(use_enable upnp miniupnpc) \
-		$(use_with ssl openssl)
-		#--without-libgcrypt \
-}
-
-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-r2 tincd
-
-	if use gui; then
-		python_fix_shebang "${ED}"/usr/bin/tinc-gui
-	else
-		rm -f "${ED}"/usr/bin/tinc-gui || die
-	fi
-}
-
-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.1_pre16.ebuild b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
index 919232287018..f252a1217c30 100644
--- a/net-vpn/tinc/tinc-1.1_pre16.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
@@ -24,12 +24,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
+IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -89,12 +88,6 @@ src_install() {
 	doconfd "${FILESDIR}"/tinc.networks
 	newconfd "${FILESDIR}"/tincd.conf tincd
 	newinitd "${FILESDIR}"/tincd-r2 tincd
-
-	if use gui; then
-		python_fix_shebang "${ED}"/usr/bin/tinc-gui
-	else
-		rm -f "${ED}"/usr/bin/tinc-gui || die
-	fi
 }
 
 pkg_postinst() {
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3c97c2f6f582..29df55529b6c 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -8,6 +8,6 @@ DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2
 DIST tor-0.3.3.9.tar.gz 6563091 BLAKE2B 9bb2009c309005ad913aa8f3e175ef8500a571de6210ecaa1a17947633e201092dd819e30e95a55918dff54858b8c420039e960113e9096b2b4f43ca596bb3bd SHA512 3b1fd9926988233c605996281510cd966a08bc1008e1e4bf7e0ed76b40c1820b7789a85555d5a4d9c0b58db992366d7a62d5d3b20e818a0d68df3b2286d0df3d
 DIST tor-0.3.4.7-rc.tar.gz 6668322 BLAKE2B 863d24d04ba7919d08b3c69bca2edf3ee46af6aa074812f76067199670b17bb8538233c7631cb17e1cada4b2b4527b0db4b3b7a7b945ae7ca7a03e52685fce00 SHA512 664211ffd6adcdb325cf669fed9fb7c70b1416da3df046c35622b5104a4b63d9a3123eb40744bc070d29ff97472adf31b1aaecea5b91c07059d0cdad79569b58
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
-EBUILD tor-0.3.3.9.ebuild 2274 BLAKE2B 350ecbd07a4ade222fe94c1d8d3d11f1d302897b8edf8f769d3fedd49f6d4ac298c0795541ff5acce6b1f23fa9eca3f67571637d3ded1192d9df56fd3315a26a SHA512 97cc47b829c5a0fc5ceb22190ba3cecca1a5307416e3b5944584f2cb056f15f69e219d3b018d2203c30ae1cd02ae0cb97ef9d7c0f35dc21c1e76ce6455540617
+EBUILD tor-0.3.3.9.ebuild 2272 BLAKE2B b6ba3a975eabf3f25d353d19fbbed13d59ae1bbf7822af539110c9ab11483c015fd1b939ebef7c02a83713a01da03cdca0b2d51b6c8d202a0fb19658c371629c SHA512 93b2d767456fc3560c37f0238c055c7ed52f1da9e2355384e158e398b18975deccd27d1c5bfc55d1748ffcd9759311ba66e320e4b2a661f46d933fd6d2d1fd19
 EBUILD tor-0.3.4.7_rc.ebuild 2337 BLAKE2B d439d935972c3d17186256543fe76a4fc3cd315dd8685864e74a32778c9ed60bb7c5a8e9a2f7790207597e3a44610f7372e21e855e58e66d55c7814c2553d21a SHA512 129cb237802568280aa5a5c528e288a8c05a3f0e0f655d96d9499d253be459851a2a34a01df6be46b2822f83be01add55a0dc0e82c90c61cbb6db9dbd65e9324
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.3.9.ebuild b/net-vpn/tor/tor-0.3.3.9.ebuild
index fd1ee6ae3935..78e9cb1945b5 100644
--- a/net-vpn/tor/tor-0.3.3.9.ebuild
+++ b/net-vpn/tor/tor-0.3.3.9.ebuild
@@ -17,7 +17,7 @@ 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"
+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/wireguard/Manifest b/net-vpn/wireguard/Manifest
index b67e0a8311c2..4c6d9f6badd6 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20180809.tar.xz 272348 BLAKE2B 20e78896b685f7ce9bee9b9863d5261b44947049b14a42f6ef75c2bfac1b04e53814faa3f3ddc47d1f8af877c97625dc0e160d3b4955b75422ec218bfb5e23af SHA512 2278cae078cf3ff9e0c43979ff559820d9d99b64c1ccdbc8a7fea3fc1a5fa0818d782a8962aefc07678599cc15f5a4237fd5dd7ffad108d639c39930979e3cc5
-EBUILD wireguard-0.0.20180809.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
+DIST WireGuard-0.0.20180904.tar.xz 272012 BLAKE2B e279f85374f880d69e4a4dc5b8442520abe4e3141a69133ea012e1c613dd1b9cb6f7b31d38ffd3f5e1f453dcad8cec847df2fd6bf1e46e66dc42f94da3516cb6 SHA512 5eba275fd7bc96a81d7c07f92920bf4e562910756bb7980d1381b204efda184ee93fa710f2ccb0c14667c8647c2fac1cc51fa95be3a51ac25a0567c6204c9018
+EBUILD wireguard-0.0.20180904.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20180809.ebuild b/net-vpn/wireguard/wireguard-0.0.20180904.ebuild
index 332e52b44d29..332e52b44d29 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180809.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180904.ebuild