gentoo resync : 13.10.2019

20 files changed, 29 insertions, 168 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b8c6f74808f6..5220b86b9efd 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/httptunnel/Manifest b/net-vpn/httptunnel/Manifest
index b34ba14fa3af..981c9bcb5386 100644
--- a/net-vpn/httptunnel/Manifest
+++ b/net-vpn/httptunnel/Manifest
@@ -1,4 +1,4 @@
 AUX httptunnel-3.3-fix_write_stdin.patch 541 BLAKE2B a78b27f43fd7babde70c084030c7d5a57974c9c13bb0db231cf8d66537d505d2eb7fd2180a00842438dd74bd5b655668b97c61f3e53f0a6ea9e5969dde71c44a SHA512 d8a0cf3319c31f67a7e7bdf097923d52c619aa39cf80e261475213c1fcfaf43297f2a797952bcee413ecc78e78c15f817bc6f783ed525b07940fbe053e49fb6b
 DIST httptunnel-3.3.tar.gz 262749 BLAKE2B d16c06f709befd45e13ac8f13c13242c90d045a23cbb6f39b8d8355d5a9e56643bb7766d4d8ae6dece16686d555850fa4a0e682fc9bb3e33ec7a5144311e517b SHA512 84503e27e84cd39441a7592d6446e30fce07a54b940e4398407dc105fabc6c8f96d3b5d05137d6dab22b2088c5b114728551337429748c900bd6fe7d6b6109e5
-EBUILD httptunnel-3.3-r2.ebuild 658 BLAKE2B 5da3f044e55440f46be506bdfbb85ffcb9c2dcaf0ed9e707e7705a4471c5425d9e3de3dc7be9acb70df1d400c13442e7e33b8c38a7cace6dcd1494f63b8ffb07 SHA512 06a39ab5fae75f191f9e9376905ba5053dac1f063c904a17c37fadc7362f3acd787082c3c99bb57f5f214f4707bddeadbbedea5641b92800beb6a92d98ac2b38
+EBUILD httptunnel-3.3-r2.ebuild 648 BLAKE2B a3c0cf33f4c25d9f026491706ac5b8f2f6c81787fd4e729d1c48f78d9b6bf116e1e6938d44cf585b0a3c22642fb7ba15653f22fa730b96157f5716d7c29b416f SHA512 db768a9b4a98844d83a78d8119c4e4596053aa1d7858ff64e1908580be3d863b6378423463f1c3d43773dae702a3e53d38dde27f8bfc12b74cf298f79196dd7a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
index 74bc2848e259..f5232f19e9f4 100644
--- a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
+++ b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HT
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
 SRC_URI="http://www.nocrew.org/software/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 SLOT="0"
 
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index aa9efe2bb90d..b6dcc42a16be 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -6,10 +6,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.25.0.tar.gz 1068786 BLAKE2B 80e5e6de2ffaad86c0c3ad4a89cfa12cf3ac8cf61ae856f4647af4e06b56594f39e9d75d798d5429b372fba718f4e92ea4ea94b802929ab22d8850ba46b2827e SHA512 e45318236b7a4e23c8dc83423f4cbc62e622a6f6346a67d56af09b805a82f1d1bf4174c9785078292ad07fc7e5e75f15d3fcc801e44fddcbd8c30d6c7bd6975e
 DIST i2pd-2.26.0.tar.gz 1073024 BLAKE2B 21a59b140c0a21dec5a5b57c08ddc81530f5a2662e53d6a028ba9fd2d6c7bc89de1a49aa0f2981b6dd6dadc2ec0d84542419e100d86fcb407d3f0ae7c66e3f76 SHA512 1f0b2ca059daa9238a9bc2959a559636266252ad0858e4e941918bb195906c817de54b2379ae95d0b9813b7cae8697db335f9d6d15d0cf919e6f687a282e528c
 DIST i2pd-2.27.0.tar.gz 1073766 BLAKE2B 331407c6bed3ed49e2438590a814ce91301bfe318d45f0726568877a966fee217b94a37152206652672b221e62d41dc252b8cacdac3e96117c896f4de00c39d4 SHA512 260cef32503bb459f3e7e07940f303b542bead54c9b6faf63f61e8d76250155c375fa75ce80ce3862d8eb2445e106e3c99ed829c9acbc9eb728364082f938f96
-EBUILD i2pd-2.25.0-r1.ebuild 3225 BLAKE2B 5056da1dddef8151fb6117b173c7e97f91ea5ce5ed8a026926542abe863d13002b1282b819dbf87a724074a44edf8e260dff4fc2dbfe89f27a97cdeda72f4b03 SHA512 91b3e132cd61c4f06ac4c6fea8621e1ea7ac91a191908e9a5edc8e1a08fabb9cd26235736c76b65de424738f454ddd6c662ed449a22a2efcf9bfea0eebe33510
+DIST i2pd-2.28.0.tar.gz 1079208 BLAKE2B 2cc84ff156c05395ce13fd0cbabb667d44d88df252c02775dee3af0ea2715487ea35614175a4dcd6f4af8a2f8fc071857beb67e85620d32e952341db04b3be7d SHA512 9bcae8dfb5a2c77b03e4c4d4816b1666f2a0d95e0c806f952a095182dfc62bdc142f5cde6a9643f7a3c6d385f906c00011b4d291fe53ab177d36d63b6a698599
 EBUILD i2pd-2.26.0.ebuild 3132 BLAKE2B 9ebf7f1c1046cf3c3793a51ac5a1c23b133e2a082fd4b60e678776bd4c5edeb0e1112c46cef57c4e646f5c83e10857a95d4a3d3b9140efcf1aae13895e56d8b8 SHA512 9ce758d0d2166d7a146cde4755a4854ed2881feba1e0b86ddb02445c20ab6f4ac51bcb36a2b1aa5e7988b3f5e1ce598d126ebd5fcebb462d2bd393cd3353e572
 EBUILD i2pd-2.27.0.ebuild 2768 BLAKE2B 6c08929e7a01c02e7eefe9c264c2784d2ee250d9b4fe0152fd81357df611d8d93e9095be7c97347b03668157ef40e236876abdacdb5d7569f08cd74ee291364c SHA512 5b22c670e45988103cdb92c8262986ef45afac858b19a4be78662e481ded61653a4898fc612c40cb6f067e1feabefc9af04a3de5d8df3bf3877c2024bb02e8a0
+EBUILD i2pd-2.28.0.ebuild 2768 BLAKE2B 6c08929e7a01c02e7eefe9c264c2784d2ee250d9b4fe0152fd81357df611d8d93e9095be7c97347b03668157ef40e236876abdacdb5d7569f08cd74ee291364c SHA512 5b22c670e45988103cdb92c8262986ef45afac858b19a4be78662e481ded61653a4898fc612c40cb6f067e1feabefc9af04a3de5d8df3bf3877c2024bb02e8a0
 MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8
diff --git a/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild b/net-vpn/i2pd/i2pd-2.28.0.ebuild
index 43a6b4401bdf..e00594467145 100644
--- a/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild
+++ b/net-vpn/i2pd/i2pd-2.28.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd user cmake-utils toolchain-funcs
+inherit systemd cmake-utils toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -15,6 +15,8 @@ IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp we
 
 # if using libressl, require >=boost-1.65, see #597798
 RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
 	!static? (
 		dev-libs/boost:=[threads]
 		!libressl? ( dev-libs/openssl:0=[-bindist] )
@@ -37,15 +39,11 @@ DEPEND="${RDEPEND}
 	)
 	websocket? ( dev-cpp/websocketpp )"
 
-I2PD_USER=i2pd
-I2PD_GROUP=i2pd
-
 CMAKE_USE_DIR="${S}/build"
 
 DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
 
 PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch"
-	"${FILESDIR}/i2pd-2.25.0-link.patch"
 	"${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
 
 pkg_pretend() {
@@ -80,20 +78,9 @@ src_install() {
 	doins contrib/i2pd.conf
 	doins contrib/tunnels.conf
 
-	# grant i2pd group read and write access to config files
-	fowners "root:${I2PD_GROUP}" \
-		/etc/i2pd/i2pd.conf \
-		/etc/i2pd/tunnels.conf
-	fperms 660 \
-		/etc/i2pd/i2pd.conf \
-		/etc/i2pd/tunnels.conf
-
 	# working directory
-	keepdir /var/lib/i2pd
 	insinto /var/lib/i2pd
 	doins -r contrib/certificates
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
 
 	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
 	doenvd "${FILESDIR}/99i2pd"
@@ -108,11 +95,6 @@ src_install() {
 	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
 }
 
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
-}
-
 pkg_postinst() {
 	if [[ -f ${EROOT%/}/etc/i2pd/subscriptions.txt ]]; then
 		ewarn
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 871e8a178867..8a12ed72ba0a 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,9 +1,7 @@
 AUX libreswan-3.28-barf-syntax.patch 732 BLAKE2B 1d98339ca0b63ad4dfd7c14e01464e21f7101de9c551b9aff64d58066a6a44528a5d664e4a900f0ca671146a5c550f37f440a8c731fc4f636fae2210b2a86317 SHA512 a20386e9d8e63b7824ebce5d48b0247e453937e00a8704f5b22c40da57e72ae81c2bbf511a9fdef99671ce0afc64d8faeb27a4533182d840779efccc726c4702
 AUX libreswan-3.28-xfrm-detection.patch 7504 BLAKE2B f02c79dedfef07b8ae06b5d5106639095f4a74506ffc0d1f06e8c8b70d447a94adfac1f8ae0c90257d22aabb401e5444dc94aae790df3b7c8cc303d58b08d12d SHA512 27b333a1481f58f1e7b38729c46eb13e51c4d7faeddfffe5eb632da30d5ef134ac81cca4a761e18912dcdfe71761a5e30cfc78939353fb74cb875a6516f9a3a1
 DIST libreswan-3.27.tar.gz 3720103 BLAKE2B 51ee792cd3fb8330a9cfee0b1a27e48c9a8c8fd3346e8c06fe0a911c813c400ef62d68b1d06bb849695aad5f4d5a496dc444b2543aa9ffbc59d373081c0b85e5 SHA512 b92ecfd08b9d19dc801032176eff3dd07f625223d4f0dd07ff10f639644573430a55f7aebfcc8b9d2424e194ca9d06b17ad5a13dad5dc6f659d19bc5d32520f5
-DIST libreswan-3.28.tar.gz 3842828 BLAKE2B 7e78f3c6d1d6a22a64f1316bb63366823ce763a3eb236e2cd64dc7f3fa9a84caff7a31cb65a6583521280e5ee84ac220c1770d230ba0b7098a1582613751c456 SHA512 aeb3ea723f2ca10098f2626172166cddea59b3bc084f0fefc823fd784d8986b12adc5a5b0965f2c7ecdfff5ac8029a922b8357debf79ff43605783d80e144983
 DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535
 EBUILD libreswan-3.27.ebuild 2811 BLAKE2B 04ac4dc887783fcadd8aaa444ec59c71b9221b4f968d6ab13305866d26f5025208c806307b63874607de8617ad64e69fce54b7a08d3e958b20e5331531048f94 SHA512 e3b7a8b50f17f426cdab73fc237ef555e8d0d89d06546a60d0c38d01001620e9b03ec4e8e933aa587561019057aa71ee80250b8c3ae6aac502a93e5c6a5cd77b
-EBUILD libreswan-3.28-r1.ebuild 3131 BLAKE2B f767654d1f1559f19eee212bc8d014341ce626578b6a6e50390867d0fc30b40a415643c3026b0da77275528b67b5a48ca8708f8a4c21f0542ed1cffc9ea191e7 SHA512 091be1b1c399bd0e215eb162c0bbc4e670624847f0b5c3ca91536c1539a7e269cd58ecdf9f99e1cebc2b3ed6fc64a2ce2f5b5191d88adb26197c8470399cff9e
 EBUILD libreswan-3.29.ebuild 3034 BLAKE2B a6090d25ece09914c2e19fd9053723da4194ade3fa81672bd76298ef9b384d03afe8d34d70d8ba4a49c8e8a381e57df7bab1fd81fc7ad8af0db94fca3bcec6ca SHA512 301339b30907e081873f2170308d5f1baa96bea8ae3a216209d78f26aece50dd8c6d4959bdb1ac0b1c8705180ee35298258ad900108160b8b14e6b3730f82760
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.28-r1.ebuild b/net-vpn/libreswan/libreswan-3.28-r1.ebuild
deleted file mode 100644
index ee813e6e8443..000000000000
--- a/net-vpn/libreswan/libreswan-3.28-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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
-	>=dev-libs/nss-3.42
-	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() {
-	eapply "${FILESDIR}/${P}-barf-syntax.patch"
-	eapply -l "${FILESDIR}/${P}-xfrm-detection.patch"
-
-	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-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index bba7a7ea404b..3f55279e32cf 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,9 +1,5 @@
 DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155
 DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86
-<<<<<<< HEAD
-EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 937 BLAKE2B 33513300bdd65cb15781efe51c1a4f2cd15e8102112af14d94ef1341742be99f1a237f84ef53e1062d2f47342e2a79cf35a8fa1388561f614e4712b25c7d5493 SHA512 5d0ffc3d027cc723d1ecce7e70d85939ce2bc31a145acff4f36c6d1abdccf7ba4a52eb5a496e836ccc3e7ffb19bab77ac289149c7168b685315c3eed3e87b3c2
-=======
 EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 936 BLAKE2B 78207ea40d5d41d8bda68ba8f6b17f1ffdcd7e32bd38eea7969a3cbc7963eba1f1b5b37edaddd7b62013519813b066f0836563222f470a46bac7d70713876e8b SHA512 a075b1a11aabfdcbf77643341b821e7dd2dd42985326939fea165348d89374c1c9a331b084b88bfc20755ae4dc2fca83b35cd016df732e8e8906073788e1d581
->>>>>>> next
 EBUILD networkmanager-strongswan-1.4.5.ebuild 938 BLAKE2B 724227fcc4b69c3349ef731d40961012185b0493b813d7d6a1d12cf6d8af7b62c142502b01c693e6c7f12b29d326e7fb7c50dc2ee5be4085c8460cafe7e735b4 SHA512 d4cb58a862f228c0bdfccdf9f88f4473b8ca42c5b4a9a5d3a9415489d49c6f8f13d2328536fb2c1e24b41250c5db06d26047fc95691bd34b90b52c98381a1ed4
 MISC metadata.xml 444 BLAKE2B 99927d1d0c6beeab7cd31eb4ac9dcc7afa038b54ac270cfb671fdcd6543e828147a7220854aeccada6823c5b7d32dfc3bd37924366896014c0341908b4b890d7 SHA512 5dc220ebf57644553266caa7e83d4478b6c7c665199b2bd26943afcb5680a0ed7597e4565043a2098fbad20cd9f5f3991877a4c171288f9ed2572923a7913c73
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 524478c5e706..44b031fbd538 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -12,6 +12,6 @@ DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f
 EBUILD openconnect-7.08-r1.ebuild 3720 BLAKE2B 8fff58b2aa115deab2eb95cc397ec5cfb97fa196320a48439484ffda5aa63fe5a057f26ed56e4ee27506f446432ed4c8c738e0834f7ac4f77395427e18bc0456 SHA512 0b6c4e0590b5de04fad4be0b08306bca4359812f6521cdbd5ced8c83567591b5ed32761d9d9562c1b784203eda0f323046b79c40f91bbd2adfa835cf4e3ee672
 EBUILD openconnect-8.02.ebuild 3637 BLAKE2B 9ed3a5704bf71fb5267b130b81474cbedecdbbd4f8d581d13e0c34de89669045412b3a902d1c6612af0f2f88b57457453aaa31e252b2e3ff63f4cf4aabe9f503 SHA512 8d6aea2fd2d98bc8c2efdf1ebb3c5762c1b702a9c9c197cc0d9e54788c29e13d7bf5cd684aa7f731b6dc0908544e6c5a3ef9a32981ea4177022feacc20a982df
 EBUILD openconnect-8.03.ebuild 3652 BLAKE2B 68b4751d07f76012a0d9d8bc82b95964ea7a07ea22cab13cb1341b0b135bef7d2130996b595bafe169d1fd2c762a72f19fb2a5691b84d0921ea2d96f39b65da7 SHA512 97fa1d1e602f167e38d2975feb8e360edc73971867056beb2460c953de3384d5f907c0bb3e98e64ef51a85d1c96f28316bc474d34e1ead3fbf512c35140c868a
-EBUILD openconnect-8.05.ebuild 3652 BLAKE2B ac70d76584cd14439234b062d36cf5ddb845b1afacebc918c5a192b34e323870c42784817513a396349389156a4c06cf6879f0fc4013150bf104bc3446c8cd8f SHA512 dd769d358266f197be0edacba22863db42fb4f47752955e984579fbfee403fb12f26529e8c29a36ff96542eaeacaa920593824bfed630568b389ec7775224b92
+EBUILD openconnect-8.05.ebuild 3648 BLAKE2B 78bee0588b9c732c8981109f23cb0857e3f7a340fa0637bf8ab6c0ef7ad4e27a385f15703007dd06741dc9594fdaf34f4153b89b5c4b49863c4bd3b342207d59 SHA512 6f1228f2a90d84ebaab8594704bd923e7bbda6db30c7053ca3fe655be5346ba97a93f70fbfec844b529daafb2e11e0f5cc230f3030ed43d10f987aefc6636042
 EBUILD openconnect-9999.ebuild 3652 BLAKE2B ac70d76584cd14439234b062d36cf5ddb845b1afacebc918c5a192b34e323870c42784817513a396349389156a4c06cf6879f0fc4013150bf104bc3446c8cd8f SHA512 dd769d358266f197be0edacba22863db42fb4f47752955e984579fbfee403fb12f26529e8c29a36ff96542eaeacaa920593824bfed630568b389ec7775224b92
 MISC metadata.xml 581 BLAKE2B 488e0e33a9dd9a0fd7565b64928544f1aaa2c7f75967727a6f92d6757ebe180346ddd50e0359c53d408165fafa69e2443fbfc554dfbc2f3681773eb38d812127 SHA512 f59ce889438b4d5398c30a0f733abd17706b98acb583be80cbc1dce235f851671d6d2486c53d211176c97ca326233d3175d061a3862f416397fa7b75463d2de5
diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild
index d6159955545a..61a28e66bad7 100644
--- a/net-vpn/openconnect/openconnect-8.05.ebuild
+++ b/net-vpn/openconnect/openconnect-8.05.ebuild
@@ -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=20190611
 SRC_URI="${ARCHIVE_URI}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 8d3721587349..c1cf2612d84a 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -9,8 +9,8 @@ AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 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 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
+EBUILD openvpn-2.4.6-r1.ebuild 4561 BLAKE2B 8bb7876808b993701acccfb4ce2bca6e88a566380eb681a22f11f5a4a09902bc7e0dfd13d0f8371c22a34ce067db19552a6add4dc37828267234eb6c129382d2 SHA512 daf592fcfe9633a54d336a4af0d27ec1357f33c4a4f557bea6f6d0552c73839a0ed90d21ac6663f0a9dc60fdafe4ad775a1dbd1e6645532a27c425a461673a9a
+EBUILD openvpn-2.4.6.ebuild 4552 BLAKE2B 418d572088e35f81fb5ad8d2b91916e2deff62fd8aa93aca07cb63abe906570943c41633c062a38bf41ed71b27674d4102b36ac86b4fc4bed8c0eedaa55e6bea SHA512 0d9e9f4a95179403f208f90ee3e9a6992fae304101ada17af99a94d08ede7a6d0dc7f80e74eafa84c6efb6b153b11fcac1cd1ee5e21e43eb025a2b3b36ec9e68
+EBUILD openvpn-2.4.7-r1.ebuild 4606 BLAKE2B 3cba793d5ea20b6e75c5c7d1503526d98c27e59e5ca40e504fc0a42a77a8a57c816e2348dc3f9b0c2aa50d28eff399991e290e963a6454e0efbac48dbbd94b49 SHA512 f95c83945012af880491acf424357ef8bb22f2fa2248a333b4e80fae50cb76876d2bd3f30bf3b10596ddc91df42ed955d0dfd45fb3a3459e5c67901aaeec8272
+EBUILD openvpn-9999.ebuild 4304 BLAKE2B 403fb4496acb04862235a9343b6ad79cd0de5fa2dc97f3c55120cefec7b07073e9a4186d1aa0f74c87fc2c86f798538e7fa62e248125c0a622a96265725dc4bf SHA512 1aa5fd864118a9ee3affd25af55ca9bb8283eba19d275ee8c83774eb0dae18951807624a2161ebe605db604937b74f5eb212c12680faaafc621eecaf09bf4bf1
 MISC metadata.xml 998 BLAKE2B 800c147b67d26d0ae3856c3aebfd7bec9326aaa67ffcb16b57e00ad722b8154bcd4cd6daef741ebb0f12032ef986e0b3b5a4cf99014df1fbd54699a98ed13a0c SHA512 d7e07e98986611dc410a3ab1b0bf2bb3925fcc9f3388c9649ce7a01baa2fa076d7766b4e1b9749048aa1d1850cb9053e8822ce7a1870002805c176c6a60e6db8
diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
index d90a72c8b4e0..69eaf0a206a5 100644
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.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 ~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"
@@ -27,7 +27,7 @@ CDEPEND="
 		iproute2? ( sys-apps/iproute2[-minimal] )
 		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? (
 		!mbedtls? (
 			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 015f8bcb94b6..5ef21b855e46 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 ~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"
@@ -27,7 +27,7 @@ CDEPEND="
 		iproute2? ( sys-apps/iproute2[-minimal] )
 		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? (
 		!mbedtls? (
 			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 47ecc313e5d0..cc69013ad766 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.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 ~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"
@@ -27,7 +27,7 @@ CDEPEND="
 		iproute2? ( sys-apps/iproute2[-minimal] )
 		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? (
 		!mbedtls? (
 			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 8cf7c4dc8093..543d67a230e2 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
 		iproute2? ( sys-apps/iproute2[-minimal] )
 		!iproute2? ( sys-apps/net-tools )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? (
 		!mbedtls? (
 			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index f70a43447dcb..393e3d56b95e 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,9 +5,9 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-DIST tor-0.4.1.5.tar.gz 7378436 BLAKE2B 33e4cd5958f4b0e1ece2cc035f87d6ccd255fcc9d0d1d92d05a9d469997f39120cddf700a614b80c83dbc4f57a80e270178ea3c04159b96aec248405654a6a5b SHA512 33d30f5fd2a92dfcb28d97c76c9d396d3eda27036b01c3a678428e878f046e45a87c2d42de0c1b8ba672568d75b08ba4cbf56d1aa50acd34c0d174180faace6e
 DIST tor-0.4.1.6.tar.gz 7390096 BLAKE2B b98f06b771953de781f446528096ff3c688599bae4c141f14a6be06373deebf11f6c15faf2168aee672bf75fcd25f42e2142e469046cd0a442b558c7cf41b28b SHA512 9e4625216e25b9498d6054a9920e5a8932ca7b28c5131062eac637b69c80cdf05bc3fd008b833e5359d8849e256f1f405abd56b07f50fd91077b153ba60503da
+DIST tor-0.4.2.2-alpha.tar.gz 7532174 BLAKE2B 330726ed996f6778f6a3277b84e7a3c17e265cd69279d3b937feda5cb95bcf6393a07b8ba79671611b6ec9983cb578e777fc5b99e2585b24f75bd281c13a37d3 SHA512 b4dc18855decc82539a124be3456724b79f23858e5c62f6a4d0b85cf9f5198ef5c979f75db561019c6946951202924213aaae4da710dfeb551aefd47f822eb11
 EBUILD tor-0.4.0.5.ebuild 2232 BLAKE2B fed112e92aa7b11f4646ea94db9fea5ef81a80dd57a4b95990d906142991ee8f4b900601a011246ff6e707069c255555195041929c97e753d16a16bc8d820719 SHA512 44a4958239f006307178121e4cb49f79ca2063561dc593af840456895eaa4f7d272592a1a3658645b29fe9e82a71e73a731eccbc7cab0ebbbfe37b41068f1c1b
-EBUILD tor-0.4.1.5.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
-EBUILD tor-0.4.1.6.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
+EBUILD tor-0.4.1.6.ebuild 2239 BLAKE2B 39c3e2a21e9f906c345dee3ae273ee1e852048e143fe7abe7435492eff04eca387adf27a3675c5e280aaed6152a47250120d308a8befd1b724ae80861ed529c4 SHA512 e01822b58b6d3338b16b8a733225f806e6d2158535cfac1f34b7aca20709f955dee41effa3b5522d2a6fe40869d1b2a725bae0be251ddd4dbca266f356d7e631
+EBUILD tor-0.4.2.2_alpha.ebuild 2295 BLAKE2B 92e7ecc2f02306ca006556ba43c7dd965a571a08e0b58494e31c12fb74fdfbf6b669c33c6bb958b978a6cacad78e51aba77508e970a21d1932d7ff188cf575b3 SHA512 e19e6925c717bbff7fb175895178e1aeb091f155d5affa452675e8b220d8779f8433df58d74b5e49b2c2a34898ca8cd53f2215ba4049f7c02da9a0a2c857071a
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.1.6.ebuild b/net-vpn/tor/tor-0.4.1.6.ebuild
index 5260bac68c8c..e7de4099e1b9 100644
--- a/net-vpn/tor/tor-0.4.1.6.ebuild
+++ b/net-vpn/tor/tor-0.4.1.6.ebuild
@@ -19,7 +19,7 @@ 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="
-	dev-libs/libevent[ssl]
+	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
diff --git a/net-vpn/tor/tor-0.4.1.5.ebuild b/net-vpn/tor/tor-0.4.2.2_alpha.ebuild
index 5260bac68c8c..6d81ed7168e8 100644
--- a/net-vpn/tor/tor-0.4.1.5.ebuild
+++ b/net-vpn/tor/tor-0.4.2.2_alpha.ebuild
@@ -19,7 +19,7 @@ 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="
-	dev-libs/libevent[ssl]
+	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
@@ -52,6 +52,7 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var" \
 		--enable-system-torrc \
 		--disable-android \
+		--disable-html-manual \
 		--disable-libfuzzer \
 		--disable-module-dirauth \
 		--enable-pic \
@@ -59,6 +60,7 @@ src_configure() {
 		--disable-restart-debugging \
 		--disable-zstd-advanced-apis  \
 		$(use_enable man asciidoc) \
+		$(use_enable man manpage) \
 		$(use_enable lzma) \
 		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 873625c10120..55a726931ca1 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20190913.tar.xz 330788 BLAKE2B 8119f4f2605877bd308d491f5d7db748e0790d26f637d1601e69d288fc7fbf02b802968dde348007541c3c172c126136c8b453f5122b4b466fb8366b88d943f3 SHA512 0d6e754df2f919c288ffe46131df29624e9958d39220369558089218c386450733f2baf97eb5d14154aa17a8d6b01bb0c34e3a1c4587830ed0d792d6ef06aa05
-EBUILD wireguard-0.0.20190913.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
+DIST WireGuard-0.0.20191012.tar.xz 331812 BLAKE2B 63abc538611d8d9775e2e7fe4c848aae9a4ed93c55db669076452f8997ba036fd4dca9735062f52888240cf3aefbdb0b999fc3bec78ce211d65c124f28d96938 SHA512 b15424036f26298d8511ca0d0d6a485ff0992726d61fabff8bf6dd64d0a65423bf901e5eb14d3080372017390b05d25faff89a72128932c7408f93f59165c321
+EBUILD wireguard-0.0.20191012.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.20190913.ebuild b/net-vpn/wireguard/wireguard-0.0.20191012.ebuild
index e4113ef8fb96..e4113ef8fb96 100644
--- a/net-vpn/wireguard/wireguard-0.0.20190913.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20191012.ebuild