gentoo resync : 02.06.2019

19 files changed, 143 insertions, 62 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 87386785137e..85a36faa9b46 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 80cbe5119dce..5fe6584d420f 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,4 +1,6 @@
 DIST libreswan-3.27.tar.gz 3720103 BLAKE2B 51ee792cd3fb8330a9cfee0b1a27e48c9a8c8fd3346e8c06fe0a911c813c400ef62d68b1d06bb849695aad5f4d5a496dc444b2543aa9ffbc59d373081c0b85e5 SHA512 b92ecfd08b9d19dc801032176eff3dd07f625223d4f0dd07ff10f639644573430a55f7aebfcc8b9d2424e194ca9d06b17ad5a13dad5dc6f659d19bc5d32520f5
+DIST libreswan-3.28.tar.gz 3842828 BLAKE2B 7e78f3c6d1d6a22a64f1316bb63366823ce763a3eb236e2cd64dc7f3fa9a84caff7a31cb65a6583521280e5ee84ac220c1770d230ba0b7098a1582613751c456 SHA512 aeb3ea723f2ca10098f2626172166cddea59b3bc084f0fefc823fd784d8986b12adc5a5b0965f2c7ecdfff5ac8029a922b8357debf79ff43605783d80e144983
 EBUILD libreswan-3.27-r1.ebuild 2939 BLAKE2B bbceef07aaefbf8323a2342bf8479ae47ef9824581095d065a5d61ffc9e3c6434f8217b88221c421f2d1f377cf8f50c3e31661b7627abbc81a51ad7e2fc9a759 SHA512 6de7bbf1962589cfd1b4cdb4d9b3db2fec2d997a5e7c46dbfd35330521a3c42915adf36a6214736da5173f851fd3f659f89d23782a197d72a5d33be29e42b093
 EBUILD libreswan-3.27.ebuild 2811 BLAKE2B 04ac4dc887783fcadd8aaa444ec59c71b9221b4f968d6ab13305866d26f5025208c806307b63874607de8617ad64e69fce54b7a08d3e958b20e5331531048f94 SHA512 e3b7a8b50f17f426cdab73fc237ef555e8d0d89d06546a60d0c38d01001620e9b03ec4e8e933aa587561019057aa71ee80250b8c3ae6aac502a93e5c6a5cd77b
+EBUILD libreswan-3.28.ebuild 3013 BLAKE2B ec5f6ba88f5b46217b3ed5f987b51a83949536581f63e9b89a84bc5d5c9bb6a3c71a7133614b032513283fe0827421d3b62740afa03d782fe44bdac0bf50b1bc SHA512 be0989524389b7d8cd382b2b12d9d18ce62c5558ea8ad162d3e0a1edb78370ce55f13444324c90c254b51e8e9ee8d273f837e32042f97be368ee9723c10c6b78
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.28.ebuild b/net-vpn/libreswan/libreswan-3.28.ebuild
new file mode 100644
index 000000000000..9d4ae2605aac
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.28.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 seccomp selinux systemd test"
+
+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-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	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="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-misc/openswan
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+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_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	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 SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" 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 && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index 91aa8e1a98c6..8e14df5008ad 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.4.tar.xz 647944 BLAKE2B a2a096224a42e5ab55743e46d9030eb036cb0d8d43a957c2b7f056f7de8763ec8d2de84701ac59951540aceefd0329614eb50aa5c57600b3e72fbce0118fe431 SHA512 203652a468525c3f6d374ce7fbf2f5b904a13b5e74fb3898dbfeec863c64a60fd9826fc5d9edb52c3e75b9871f49cb78580914e37a3522e4676ca1c29102d0a2
-EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1121 BLAKE2B a47eb36ad4953016c9e78cea3127a4012a508cd625423d23036c5b5f8888125dddb7126817714a7824bebcfc80d06860f42b51106d83780d7169c66f5f4459c6 SHA512 5ad925a1c60068aade726ad09e98b41c675a07931ce0671b70e6fc0749d59bdc47cb52fbb29b7391beee8a8a93ef70ce36cc463a61a729a7f8e909d2ace583d1
+EBUILD networkmanager-openconnect-1.2.4-r1.ebuild 1120 BLAKE2B 2ff3d693764a66d9e8ae57d110833cefe4691e2d1b0548421162970e41c33abb4f8698aa0d54277d387ad30b82e52b252db0850505cd834bb4eb4089b3999a6e SHA512 22a3de3521ef79f93c518ee4a4c4ac939ef683699db3ee142d255ab3f648f36ece2517534474537d02a54429a8d796ab3034f33c5d0772c5558fa32763659e2d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
index 22e99755b27e..e69273edff31 100644
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.4-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 1362e7f844f4..afba45d3dc2b 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -5,7 +5,7 @@ DIST openconnect-7.08.tar.gz 1686133 BLAKE2B 265c43982b475ef1e49d7bf16e782c82b9a
 DIST openconnect-8.02.tar.gz 1876135 BLAKE2B aef1f17702ddbbd392c3203f4235a6e24ca5ecbfe144652675ac8b98c0cbb85bf8cc5563295150cf385d3c0bc5a9b3ad84228706baa17f56dd62b798cbdd05d1 SHA512 690a51198aeaf4bb1cd0901b0799ac991712a29aa899fe735a7b5201683cd627556eebeefba01d0c752ba44ba0a6c5ee1c3647d692383f3f4b335e79c5337cbc
 DIST vpnc-scripts-20180227.tar.gz 21241 BLAKE2B 2ba4c76121ba9c5d307233d6f8c91db03c8da4882b8f6dfeed335f7fcc30438df8fe0657a1177e7e551566b597e195cf41bb6e27e13b757a0c931e8574de9a5e SHA512 9a508426e9307213078ce57b59d25168647fa5d2e823b1085e93401259b0a52269e948c8292e4055babf3e8b3c087a23475b5caa2a43c11feb2df8b0d8843972
 DIST vpnc-scripts-20190117.tar.gz 21412 BLAKE2B 47adc50fe8940e6f5253321d2ef91abeb03e131dc0c1ba02f33f90c9a1ef75c0e838c0215c7ac419134c620b83a449e225d6ba5d77bb98d8f461406cb39eed9f SHA512 d01bb52532bd96f1bbf9735b8d5530c762c80205e53057f619db6090556887da1c91fe111da9937b452910f493e73dad26fcd20d3bd97248099d90ffa3060cde
-EBUILD openconnect-7.08-r1.ebuild 3721 BLAKE2B 765faa806a725c554faca14efe1317e7facddac5d701d9a3e252bca579f5be311576886d9b91e94fa31b0feec97ff5aee0427458ac66265edb51ce4671dacac6 SHA512 87eebbe79f95c5502b3eb3fcedbe38639fc700c76b3287d352f35e88e8d8a14dd1a992effe85154510bcea2e26895e00e43302709b370ad8ccc5b6343456e559
+EBUILD openconnect-7.08-r1.ebuild 3720 BLAKE2B 8fff58b2aa115deab2eb95cc397ec5cfb97fa196320a48439484ffda5aa63fe5a057f26ed56e4ee27506f446432ed4c8c738e0834f7ac4f77395427e18bc0456 SHA512 0b6c4e0590b5de04fad4be0b08306bca4359812f6521cdbd5ced8c83567591b5ed32761d9d9562c1b784203eda0f323046b79c40f91bbd2adfa835cf4e3ee672
 EBUILD openconnect-8.02.ebuild 3637 BLAKE2B 9ed3a5704bf71fb5267b130b81474cbedecdbbd4f8d581d13e0c34de89669045412b3a902d1c6612af0f2f88b57457453aaa31e252b2e3ff63f4cf4aabe9f503 SHA512 8d6aea2fd2d98bc8c2efdf1ebb3c5762c1b702a9c9c197cc0d9e54788c29e13d7bf5cd684aa7f731b6dc0908544e6c5a3ef9a32981ea4177022feacc20a982df
 EBUILD openconnect-9999.ebuild 3637 BLAKE2B 9ed3a5704bf71fb5267b130b81474cbedecdbbd4f8d581d13e0c34de89669045412b3a902d1c6612af0f2f88b57457453aaa31e252b2e3ff63f4cf4aabe9f503 SHA512 8d6aea2fd2d98bc8c2efdf1ebb3c5762c1b702a9c9c197cc0d9e54788c29e13d7bf5cd684aa7f731b6dc0908544e6c5a3ef9a32981ea4177022feacc20a982df
 MISC metadata.xml 642 BLAKE2B 57e9e1e2bdbbac2deaa1419dd84f793b9e6adfedddb04a57813633d1a552e13d392648782ed642bf6602b1e48b47432aa3bd05588f9e410ed67d775d34adca80 SHA512 3a6b08e9258161af07ff47a0c52fe294185a2dd41bb7786500bfc35d56a1c1e366d013979a3bba6a80d8350e5765cb06876e9f4270c1e504445224a308de185f
diff --git a/net-vpn/openconnect/openconnect-7.08-r1.ebuild b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
index 46f90fa74f44..db3c5070cabc 100644
--- a/net-vpn/openconnect/openconnect-7.08-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-7.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 VPNC_VER=20180227
 SRC_URI="${ARCHIVE_URI}
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 3ce78a909c48..3e108c2e169b 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,7 +1,5 @@
-DIST openfortivpn-1.7.1.tar.gz 61236 BLAKE2B b382ceac577e63ebb7a92ee3ca80c45e94f77eb95f8ea75f91a4c2ca2fb006f4d2e5e4c7bdf3974875cfb3611f34ef249218d194d58f66f3b51b30c8b90a3f82 SHA512 9c151ce3f914a7cba13be3e3b98e35d49329ac2c04410b653ce40dfb9fe1912c2e51d0322f9e37d5ed47bb28a46203a19ce87ab2fa670229f2b5ccf5b9bb6fc1
 DIST openfortivpn-1.8.1.tar.gz 70521 BLAKE2B 5451ab9937e0f6ba1c2601f9ad8a44d5b9954b9798f4a4aa81675d561f5aa95890946a5623af9a57db6e20fe074e65b0578655ca538c20751e7e1363df01ab68 SHA512 0c2f26e744c266125bf35a643bc2510d782c9c7b4e3324cef53cc7e9a350df3c968c4d0d34256a64cf6b7d1cad2ffc95019a39586786238481dda20030e524a9
 DIST openfortivpn-1.9.0.tar.gz 71903 BLAKE2B 0f37b782944e96ba043b82bb172cdd90badf501a31f4ef253cdfc2ea59f4d478ccb4de15514df279059ad41ff3d872e2521ebc64af56844e5d3dd719e8965e18 SHA512 bea07d173f84562e37bbd925fc9ca1ffc4b91442792d29dd5f78849a44df7f4f677f306bb9020ca3ebdc4da1d5635bb4e746455c4ccf9ef1598c8100dcb2df7a
-EBUILD openfortivpn-1.7.1.ebuild 766 BLAKE2B 59675dd6afd568ef60fc345e96c401e462063bb570c4e5c094c4a2c5f4061e862e6b185763af143d34a79d817fbe61ff1783180a981611e9405875c19d8bbece SHA512 19abaec0e7981787d4f2995bfe905a0d24643d17cfdb651dec7d2dc4be2c80af6042876ef06d5196c953d3209c90bd8d9bea2650bfab650d2608609d211bd048
 EBUILD openfortivpn-1.8.1.ebuild 763 BLAKE2B 08493890f4639410b0ac11123ba8babeca5e1888586bf4bc84e7fb8e00c3170a8b26a7b342aed2174c2ed65f8cfcbe9be8df7b687d967995b2cdaae437032bb0 SHA512 8d8abd0fa604fcef6d156ac14e085a19f3418e5ea569947e8085017c55b4028c5e2a7437cd7efc05b8b822e3397c2d459835bb6a4aa5ea5873b50ec4fd2a1512
 EBUILD openfortivpn-1.9.0.ebuild 764 BLAKE2B 41d9b1a2d531317f54089e0cab337c50480b0698b55ecc81bf685084ff626bc79532415735d00a431e73c078b70746e14ddeb154fe69a750d7c0169bbb115537 SHA512 9ca560c229901eb4919265cabef86e7dfe106bd4ff7c7b9d4e2cb2fd79ff468d69e66c5c81abb142bc274bdfcbeea0d48b5583268b3395f289680b869df27896
 MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
deleted file mode 100644
index edc56936ac07..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="A Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libressl"
-
-DEPEND="
-	net-dialup/ppp
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	keepdir /etc/openfortivpn
-}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index a11e701ebacf..c412499dcc52 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -10,7 +10,7 @@ DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
 EBUILD openvpn-2.4.6-r1.ebuild 4570 BLAKE2B 553cf285d9b56c9980288a76086cc4c1e6c2966cd0faa9fef748d8d52ebd9d5cc753744af2b91040c9b13842a143018d982221bc38d0ddffd94670cdc19e19ae SHA512 0dbfab153334ac315aa2de9aee667ed0febcc48a0d5cc432e3ec404dc564fdbb35b52626141132ca12ac6638987e98484693bb5e4181de4627228ec9aaf68ce1
-EBUILD openvpn-2.4.6.ebuild 4562 BLAKE2B e6e9d019a5acb456fc52dff3e811045a846fbe1d26548dd2f9b6c4ef5ace5072d7921f095085f2dbbc5c7f6602f2aa2f18d18e20146b5c0842ce9f18fde95515 SHA512 66a74cdff4521b8e0b63b648cf6931e9e47c0d19aa831d00bacaaf5682598d582aa953cc7b6a7447e93606aa3b0db2ade5f80beee337c15e375f684243088736
+EBUILD openvpn-2.4.6.ebuild 4561 BLAKE2B b1d8c976a760015e0e434ab4688ee7e0a5ef2a1fb94ae5c56f611792100199def8f34ed8d052733a92c76e5729f1faf8e50cd6ae0193d93df5f481e3016d49fd SHA512 c5efb4e0f2d4268727254fe4115bdf8d27d9d6bef820c8a745299d987113e3ee3b04be2324df0458c2fd92b91c66f13daa50297b47920af58d740ea056dd5865
 EBUILD openvpn-2.4.7-r1.ebuild 4615 BLAKE2B 31fe988c02831d6a8bc96e1cec0b7f3046ec7b78d72c8694c1f3f45b34c20d21656646aba643e552dc199d69df288ddd49c5f8f396c969cd421b105da0e8c56d SHA512 e973cc64e828761ea9a5439d39722d2e240118931d029eb868c86bb05ca4679941bff20ba98d3d71bc15c8ffc8148b4af69ffaac55afb084323d208e677410fd
 EBUILD openvpn-9999.ebuild 4303 BLAKE2B 0f3cbf8a1a16b74e86c95ff0b8b2890ff2c3170ba1f5e274e616a5dfd68310abcdb249075c3dd6b1490e6b161ec64e1aed6a1c3b476179bad8868cf1a4c9b727 SHA512 d0ab575c0144753c57c63bdef58b7ba0a8cb8c62c72b762153b607470a73c87388271c9c079010c2dee157c906fe45fe67a911ac0fbe75d90f934bf925906822
 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 41badc7b0794..015f8bcb94b6 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 ~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/tor/Manifest b/net-vpn/tor/Manifest
index 7fa31d5b4587..c544304759c4 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,8 +4,8 @@ AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e911
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
-DIST tor-0.3.5.8.tar.gz 6994335 BLAKE2B d37006ee48f6ecb9205fe9ad1178f2375aec5a8f8c614a85af398e2114d13e4ef7dcfc501685f2f6d4dbb44cca2ab318be69ac37686a3ef1bb980adcdefcac11 SHA512 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132
 DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-EBUILD tor-0.3.5.8.ebuild 2176 BLAKE2B dada372351cc5c34b3929c3a18ee9287728cd3b3c7285366213c056737ed2dfdfdc9887ec9b1cd9c8e352f4d953c927301ab1c2a86a648499ba9932006f7bae8 SHA512 a64cd8723241a6a8af8955b84db614ef6f7b868ee445289cdfc3962ad5daab59925768875cf2a25441455eaee1b3469aabbb9ab5916c5c7b700d867384f7960e
-EBUILD tor-0.4.0.5.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
+DIST tor-0.4.1.1-alpha.tar.gz 7350019 BLAKE2B 5e5022f9a150d87955b438e8afeef053bdc4196b87c891016a2ecc43d44b0a2a271ef4088cb16d539d2ccfaedc8e73c7d663e9878cf7a10af0d368c5a4512409 SHA512 d8fc5c124de8127a1b06081fb45e6cb0e1d2b77dc2cc4677370317961869f82282483b717fadd932f1d86ae32291ba51f61421c89005703c9625237cb84d2e8e
+EBUILD tor-0.4.0.5.ebuild 2232 BLAKE2B fed112e92aa7b11f4646ea94db9fea5ef81a80dd57a4b95990d906142991ee8f4b900601a011246ff6e707069c255555195041929c97e753d16a16bc8d820719 SHA512 44a4958239f006307178121e4cb49f79ca2063561dc593af840456895eaa4f7d272592a1a3658645b29fe9e82a71e73a731eccbc7cab0ebbbfe37b41068f1c1b
+EBUILD tor-0.4.1.1_alpha.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.0.5.ebuild b/net-vpn/tor/tor-0.4.0.5.ebuild
index 5260bac68c8c..7e37f46a9bab 100644
--- a/net-vpn/tor/tor-0.4.0.5.ebuild
+++ b/net-vpn/tor/tor-0.4.0.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.3.5.8.ebuild b/net-vpn/tor/tor-0.4.1.1_alpha.ebuild
index f96f51fd642c..5260bac68c8c 100644
--- a/net-vpn/tor/tor-0.3.5.8.ebuild
+++ b/net-vpn/tor/tor-0.4.1.1_alpha.ebuild
@@ -15,14 +15,14 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="
-	app-text/asciidoc
 	dev-libs/libevent[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 	lzma? ( app-arch/xz-utils )
@@ -38,7 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
 )
 
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+DOCS=()
 
 pkg_setup() {
 	enewgroup tor
@@ -46,11 +46,11 @@ pkg_setup() {
 }
 
 src_configure() {
+	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
 	export ac_cv_lib_cap_cap_init=$(usex caps)
 	econf \
 		--localstatedir="${EPREFIX}/var" \
 		--enable-system-torrc \
-		--enable-asciidoc \
 		--disable-android \
 		--disable-libfuzzer \
 		--disable-module-dirauth \
@@ -58,6 +58,7 @@ src_configure() {
 		--disable-rust \
 		--disable-restart-debugging \
 		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
 		$(use_enable lzma) \
 		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
@@ -84,4 +85,5 @@ src_install() {
 
 	insinto /etc/tor/
 	newins "${FILESDIR}"/torrc-r1 torrc
+
 }
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 90a029738a80..35ae73dbfffd 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -3,5 +3,5 @@ AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32c
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
 DIST vpnc-0.5.3_p550.tar.xz 101860 BLAKE2B 9800ab0704108cd70450dcfe314eba7c09ca1bb329fa6b9f2946dbb6ee6407e5f6bc3d17d8be782e9103d94a12895777125acdad070f39ea1b96a946ba7d2302 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55
-EBUILD vpnc-0.5.3_p550.ebuild 2207 BLAKE2B 44b6d215c5f84b5a8169271947848cc3774667d49db53d3ab0808f22f78445632effdf759fac5ec0e4e0e5135ec906ebc77918149e4f94b0afff5545200416ea SHA512 601b4af1fea80cd07af4f866498ab448976614a59e9706b7341f53f2f6b2c69322637499efe0a60df26b827eaca45ef901fbb42fcff1ae96407b4aa73f8fb102
-MISC metadata.xml 378 BLAKE2B b0a2cd315ee9781e69d78dd75ac6b5ee832f7184be8fd01d93b38a5f0c5c950e06699b9a5dc480cf16ab5a1eb6fc49c9ab04d594c13aae069536d306cd226a6c SHA512 75bf9e1dd168147ebb73034a8bc9f681d72f6ff7c14597f822a237a785deb314a5b0a330861ad751d7837168718204f5e1a14767e12c6ee27f197f2e813e26d2
+EBUILD vpnc-0.5.3_p550.ebuild 2206 BLAKE2B 73d66da98c0e2ed3c756e1409384915a471d817318b3f04765c4e488f2ceb75e92032ef4f4fea85b910d579ce63f818560eb53d716dc291957d690107108162a SHA512 a25a180d9a16507d2c490590f1f6f05dd59abcd2196d9673b0a88c659069c5fc9a2912ea816f6a90d5d20d2300a602df7417427413233be8a12e46cd0b30cadc
+MISC metadata.xml 501 BLAKE2B 31df31e209ccf8c590130748c6b8f800a143b81beba395b0ece4b73eefa5677928ca25dee2f3cba5eed014da2d9fb318b34407ebfd8138f383a035446b3e481d SHA512 68b6553d61bd272eee71187a3d3c547132b694b9258d20887a91b0429a50ea6b35644ec8305fbc67213a22bab10f18b4166dabaf9beef3088182facd461aea39
diff --git a/net-vpn/vpnc/metadata.xml b/net-vpn/vpnc/metadata.xml
index 295fa367b7bf..08b929631454 100644
--- a/net-vpn/vpnc/metadata.xml
+++ b/net-vpn/vpnc/metadata.xml
@@ -5,6 +5,10 @@
     <email>mmokrejs@gmail.com</email>
     <name>Martin Mokrejs</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
   </use>
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
index 34d8bd70511f..6a33ec812e0f 100644
--- a/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="resolvconf +gnutls selinux"
 
 DEPEND="
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index a62f2b83992c..7d0c390c06cf 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20190406.tar.xz 324112 BLAKE2B 11a67eae986b0adac11dc88c899d68e3c5510bd7fa438bbd378eaa5b3c184b3dd726f625950e6800e0f53662cd1c23d5a78c954edd9a3387f278700bffeab607 SHA512 e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e
-EBUILD wireguard-0.0.20190406.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
+DIST WireGuard-0.0.20190601.tar.xz 327348 BLAKE2B bd7827262f0c056b2deaad9c3ca62b28d26200b32c3b31c6d970c141d58255a8c9dd361603663040118d68defe9d5a130f7dd8a2eb26306f66d5fff84762228f SHA512 d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3
+EBUILD wireguard-0.0.20190601.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
 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.20190406.ebuild b/net-vpn/wireguard/wireguard-0.0.20190601.ebuild
index e4113ef8fb96..e4113ef8fb96 100644
--- a/net-vpn/wireguard/wireguard-0.0.20190406.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20190601.ebuild