gentoo resync : 30.06.2018

12 files changed, 11 insertions, 118 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e5075757d303..63cf4b7ad511 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 744d0ab0202d..489b7c51251f 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -4,10 +4,10 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.16.0.tar.gz 1872885 BLAKE2B 6ea2df953363acc3cd55d85b372900cf2486260be0d96c75a4ef4d7ed6d9303c371063d27af9f3e13cb3cda5bafa3a635c617b503d801193b90c33d7de4ceb93 SHA512 ac005e68ca77eb44da801b6ddb97859a1dee61009e5940c109001026eedf9b664c3c1737e17b5f7da6b690f9557d998f1f67c0996a7a6e7473e966068ec9a55b
 DIST i2pd-2.17.0.tar.gz 1874984 BLAKE2B 0fd265bbd007009196d2a8202885a016092e9abd016e8dd184d8cd61597ba2bb122698bca2bc073c9393b7d7ead3c59e0dcd5145144afdb5b487b4712936b22d SHA512 ea962b8c52bfbfe211aec9e6d73bf630d7680745c915eaf12e468dc02c8c492edf95ac55b4c131e1391cf0d97ba08d58f05e9652d5b2594b839730317b4c8f6e
 DIST i2pd-2.18.0.tar.gz 1868440 BLAKE2B a5c65c379b38735bc43c81553416ac1dfd7064da33ff282de2ab7567aaeed1e49edbafb48c03f372f72e70bc4fe0e922036cd08538bf0b6c07e00c2c2f328dd9 SHA512 dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
-EBUILD i2pd-2.16.0.ebuild 3087 BLAKE2B 4ca201520f8fca1d21cda3be75a12fe39d911a9b96e14c211670e91662655ac47ac1a6429fe6e39c45bc0dbb5934ff8f4a69748781a7282077951a9db16f7ac7 SHA512 502aee8fd5558f23a73797a298a2170e46cc541358e2f6d66235963902459a40bd0ed8f44232d93398f93d58636d3add97a0c5bf25d35487ed00832df4b10d5f
+DIST i2pd-2.19.0.tar.gz 1982459 BLAKE2B b05f7a3018091e9c0008ca7037e44b6f5a4416be57054df5f9af72bd664b7d4fc7673e5d3eb1b8bb1ddfb61e81145eb0a847b301a580ef971d181ed00a4c960a SHA512 4c3d2408962f3e55e1a22491b0844ce44cacc7aa631541a86e94554da88e42234576fe221e1398c88e7e68d267bbf9e73cbea9cd74981c354e46ba82d62bb32f
 EBUILD i2pd-2.17.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
 EBUILD i2pd-2.18.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
+EBUILD i2pd-2.19.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
 MISC metadata.xml 742 BLAKE2B 81ae213b17776466f9d33a4798bff20494ab8c09872d1a65fcb0ab4d05cbf2a0858c1c7538a205bbefa491a21d0b3deb613a362d7e5493e5c6ac074b1dacbe53 SHA512 ca6b5eea5aeb685632ed742144cf8a3fc19e7b0b1c213ea6fdf62a07a4f7727e8f001189e09daa201563bfbb79539cee0050c739a23320baa4b4d95a4279b553
diff --git a/net-vpn/i2pd/i2pd-2.16.0.ebuild b/net-vpn/i2pd/i2pd-2.19.0.ebuild
index 2c29b4139a6e..454dd172bd22 100644
--- a/net-vpn/i2pd/i2pd-2.16.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.19.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/PurpleI2P/i2pd"
 SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
 
 # if using libressl, require >=boost-1.65, see #597798
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 6f5f5c9fcaac..bba96ebb52ee 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,9 +1,8 @@
 AUX libreswan-3.23-modern-kernels.patch 525 BLAKE2B 5c1353932dddd0febf60ae0b8c03e81e1c1397e6ea93619e5d02f60c4a735a0b63c8c1dfc6a3a79c55addf4af20e3e3f2b82b3f369b2c61d62c51c3c57f3d241 SHA512 e2a798d1bc8b089056a400bc0918b1037420a268e49e0183db99c565da9c8bce344e5fa9c3cdcc246a066450aceeec1af333f8b4c931e4e9414d6485db03bd13
-DIST libreswan-3.21.tar.gz 8945666 BLAKE2B 88a96310d54f44c28eb676689c76737a44bfaf17c02146297f1759f1019d8cbb6effc15175880c18bf08b265778a2aba9d055172ea710c259e14cbe2fd84c158 SHA512 f1ef002b3e0869920edfebfc8efd73d9a9f84f64a77ad4832f46b12dfdd3c31cdf48c1473522b63f155058592c46af05995756af5440ca3e9c0fa5207436e0fc
 DIST libreswan-3.22.tar.gz 6910418 BLAKE2B c06134fa2d1096231797f1ea93de8ed61121472b10ae30ee9a843250dce4ef9f21e7d3bf63f38daf53fbfd8d1e435cfdc704743d0fdcbde8ecac137d9becac48 SHA512 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff
 DIST libreswan-3.23.tar.gz 3836073 BLAKE2B ffb27ed75618afcf39c36b7326bb1e4b70ea8337bb4b13951bef95dc13989613c226fe83e031eeba080f55f98262df432b776c3ac5b7b4fb740506f918172ed3 SHA512 3645af522ea9ac868c55bfadfd2cf27dc5acb247543f43290cbe677a90cd00316be6520ca2128b9aaecce2b0293710ae6a2bd710a7d93198b8cb81e32276ced8
-EBUILD libreswan-3.21.ebuild 2568 BLAKE2B 1df86e3bdaebd713fc430d09270bd36d6585696920c936ec1e80d63ca14d829eeb097597d7aa2001fc3f1d7e3aa598d1d72c8a10baf5e5661b4a292a9c1f463b SHA512 65fa1471cd46cbf5cb816f3b4bfe9f29a09b0ffb8d28e688544be044c5b794673d0b89c108c810b43d44fca4ca3107b4c8ff6cf364899211a7c0ea9442d45bfa
+DIST libreswan-3.25.tar.gz 3988630 BLAKE2B 8479b5b0d7d49055b7dcefa6c3b2f469b0aa60005e05446d5c1c6f73a32c904835422248c6ead2a1c2dc83b63794fd50f7461fd22c4206414b5890c01b99b722 SHA512 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
 EBUILD libreswan-3.22.ebuild 2812 BLAKE2B 55b89a58724b02cafcf997295f117a084c1f7e16a65f1adfb0efc783772d3a68be867b24ff038aa8017412b2e4fb716a3aa101d080eda2c9e8a11dfd117c3544 SHA512 23136de2f2a1442318bc692456c32d0675515b508ef6281b33b2f8760bafbbe09ab39d233d552214aecc3e965c22f9fc67bad93902a6be5696117308bf1190cf
 EBUILD libreswan-3.23-r1.ebuild 2867 BLAKE2B f4fb5ffb508732e268199c92ff69d43c14620915bc0b6aa3fb867b56e4c3713a8e2b8dc25ec0e01fd80efad853afb38e54155b0c1a4455b81f0dbb69131c0d79 SHA512 00c4c5399dc14afa872c9b81202bce9d9d1cf5c4eb6a3a34ce2b96f9be5af008edc799fdc7c3c7af8aa36bae2b518f40686e08dc813ba7040e9351c69fcff0bf
-EBUILD libreswan-3.23.ebuild 2814 BLAKE2B 75a2bd92b38261da8141c05e287e9ee33d55b2a19aaddfb30b2f76fea4e944979345512ba1d29465342066646d69cabfef85f4417e471350a05f8becd7f73f9a SHA512 c5c8409272f7bb661e9578ff7d97c52fd07f291b8392826031b106998f1c516f6a6f343813cafdeef4c6245e4123509c764dd303a40200a9b0f98b0821c14a1e
+EBUILD libreswan-3.25.ebuild 2814 BLAKE2B 75a2bd92b38261da8141c05e287e9ee33d55b2a19aaddfb30b2f76fea4e944979345512ba1d29465342066646d69cabfef85f4417e471350a05f8becd7f73f9a SHA512 c5c8409272f7bb661e9578ff7d97c52fd07f291b8392826031b106998f1c516f6a6f343813cafdeef4c6245e4123509c764dd303a40200a9b0f98b0821c14a1e
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.21.ebuild b/net-vpn/libreswan/libreswan-3.21.ebuild
deleted file mode 100644
index 64faa1945d96..000000000000
--- a/net-vpn/libreswan/libreswan-3.21.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs
-
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-IUSE="caps curl dnssec ldap pam systemd test"
-
-COMMON_DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( net-dns/unbound net-libs/ldns )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-misc/openswan
-	!net-vpn/strongswan
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LDAP=$(usetf ldap)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
-		certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
-		eend $?
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-3.23.ebuild b/net-vpn/libreswan/libreswan-3.25.ebuild
index b71d536ae106..b71d536ae106 100644
--- a/net-vpn/libreswan/libreswan-3.23.ebuild
+++ b/net-vpn/libreswan/libreswan-3.25.ebuild
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index b9bc4fbfcaff..d96adad6fc50 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.1.tar.gz 61236 BLAKE2B b382ceac577e63ebb7a92ee3ca80c45e94f77eb95f8ea75f91a4c2ca2fb006f4d2e5e4c7bdf3974875cfb3611f34ef249218d194d58f66f3b51b30c8b90a3f82 SHA512 9c151ce3f914a7cba13be3e3b98e35d49329ac2c04410b653ce40dfb9fe1912c2e51d0322f9e37d5ed47bb28a46203a19ce87ab2fa670229f2b5ccf5b9bb6fc1
 EBUILD openfortivpn-1.6.0.ebuild 766 BLAKE2B 3dfa3574c89f8101c5e10915118fccf5d5bf50954d411390e501d701fa746a6f58b89fb0b37140bb301c4baea697ec527cceb77b38107842f433b55139c907ef SHA512 f5e8bdac45457934df2e749c45eb91e15909edbdb3b3aab3891bef1a34732e6dfab2f739954c9240250d0e09a5cf5a93a378a5cc1b7d9e3770f1cf682f578704
 EBUILD openfortivpn-1.7.1.ebuild 767 BLAKE2B 80b75f28a23b3af0b2e60c35b73079bb71d3ac1489a4dc8296188386abc82a2f951b674f3d7ff9223c900bd4ab6483edc0ae38b851ed2bb2232c319e752ef51f SHA512 56d386a18c0363b1c35057cd6bca72da55b06671238a363e4f7ad3aac50207c6358d7118d864a5df6daa4aa03a9e544c4e7b757250ec1310b1e597653eed80b1
-MISC metadata.xml 333 BLAKE2B e32a7c48154b338f9919dbe5f5fca6d91c33f2cfb1d13a955d4dc4ce7e79bcc8f7fd0adbd7595804d4d1973604cd2c8df2135b32d70d465915823bacc4adf6bb SHA512 bb066ff19adb6a336fa96af47323cabab75d7959794e1c72a32736538aeee18d0225da8696e5eb945c5b0eeb1fe4a5972cddc2b18d71fadcf3246a929addf74d
+MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml
index 94ab0e40cd4e..5ddf53689139 100644
--- a/net-vpn/openfortivpn/metadata.xml
+++ b/net-vpn/openfortivpn/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.de</email>
+		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
 	<upstream>
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 9bc14f1249cb..a99799240763 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 4726 BLAKE2B e0df4321140c1fdc91154729fd13115aa209e1a89497edab8370691d07f3ea097f4135a2451a4996f687cba85bfeeefdd8b4b506a1e1932033a8923272ddca08 SHA512 4a740da3f9f82a05e8c08680f1158556937ae0f1d3523f59541cf76708e2a28aa40ad1ab2f0a3b8d6e7503a076c64ffd718f326fe1d6e70e29fdc52afbafdbdb
+EBUILD openvpn-2.4.6.ebuild 4724 BLAKE2B 94019db6f38efea59cb9b308683ad2a699b7f8ddad02cae15ce99a74dcf58c035ff0520fd87d4435726a89c9c424c647e1792785638b7e36bb2a2d7fb35be27e SHA512 b135b0c2eb54381a8a7a7fd756bae4dd1e6e3131e9a4b092aed9d7f9d22f61d8cdcca5d9c7759888d22b1252bdc40333bb39b8474a3c0862a2efd4218c0ac46b
 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 08fc9b977790..a52f8d6e4a8b 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/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 645a99f22b57..3831485b110e 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.20180620.tar.xz 270920 BLAKE2B 0878c8561f1f43ad4c68e2359a8bb0c219f5e5c11126f4ec1f788796dabc8dc11475efa189a772097f087ade0a47b7f05efe3695c95c1ec2c3a3c46a2e62f00b SHA512 e67657b21b548f0a82e76fbdc16e1856c2aa6e15828bd16514c398f8a867ce20aa5e280a1b8528910f7f210f0b8af709b46abd6b67c88416174cb2f5e87996bf
-EBUILD wireguard-0.0.20180620.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
+DIST WireGuard-0.0.20180625.tar.xz 270732 BLAKE2B 8cfee50e02a24902c1742485003f6beefd2a07413b22c6e98e37f3485ea05fa30e209959ed2d46bf222fbc410489fd7db9e42b1cb4513bcb96dd94231ad5b605 SHA512 3bbbc4eeeb8512fe6ec5ce09a95dcf86a93d0dd49edeb70b03dddeafc1d87ca22060d35abe77f5ae52afca6e5cfd7c252fc248f5a1ebfa7e7f9cf55a7eb1cabb
+EBUILD wireguard-0.0.20180625.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.20180620.ebuild b/net-vpn/wireguard/wireguard-0.0.20180625.ebuild
index 3a4681c656a9..3a4681c656a9 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180620.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180625.ebuild