2017-03-17 14:04:07 UTC

66 files changed, 89 insertions, 89 deletions

diff --git a/metadata/md5-cache/app-crypt/easy-rsa-2.2.2 b/metadata/md5-cache/app-crypt/easy-rsa-2.2.2
index 2ed544a79939..437a42f2d908 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-2.2.2
+++ b/metadata/md5-cache/app-crypt/easy-rsa-2.2.2
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://openvpn.net/
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-0.9.6:0 !<net-misc/openvpn-2.3
+RDEPEND=>=dev-libs/openssl-0.9.6:0 !<net-vpn/openvpn-2.3
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/2.2.2/EasyRSA-2.2.2.tgz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=78adfd5df02e6731b772ea4fbe0ea04a
+_md5_=cb713f7ed97be24a1fcc88fa885eedcd
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-2.2.2-r1 b/metadata/md5-cache/app-crypt/easy-rsa-2.2.2-r1
index 49a75e87dec3..647a130b6116 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-2.2.2-r1
+++ b/metadata/md5-cache/app-crypt/easy-rsa-2.2.2-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://openvpn.net/
 IUSE=libressl
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-misc/openvpn-2.3
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-vpn/openvpn-2.3
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/2.2.2/EasyRSA-2.2.2.tgz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=b8602302f3e470f0f5327e201984e977
+_md5_=0e8e95d79c92c40e177286c22523c073
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
index 70dc65b6b5ab..157e6ffede5a 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://openvpn.net/
 IUSE=libressl
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-misc/openvpn-2.3
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) !<net-vpn/openvpn-2.3
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/3.0.1/EasyRSA-3.0.1.tgz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=551fcbcbe5965a70c7a15dbef21c544a
+_md5_=09a34da6723a116136ff5cc0436e1173
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.5
index 37178b0eedc8..e8250a0513a4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) sys-devel/make >=dev-util/cmake-3.6.3 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.6.3 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.8.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.8.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:- src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	dd1d263f83f0791bd433b134f40db39b	eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	kde5	dff0f6dcdbfeaf03dac4c286032f1622	kde5-functions	4d549f753da6d754874f9f755e2d6794	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=d17c431d943268cdae7f6079244b60ab
+_md5_=de7528d2741473bbe168594a40db5543
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6 b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6
index 160a46bd51b0..aa93a8edcb64 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.8.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) sys-devel/make >=dev-util/cmake-3.6.3 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.6.3 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.8.6:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.6.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.6.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.8.6:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.8.6/plasma-nm-5.8.6.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:- src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	dd1d263f83f0791bd433b134f40db39b	eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	kde5	dff0f6dcdbfeaf03dac4c286032f1622	kde5-functions	4d549f753da6d754874f9f755e2d6794	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6dc531f620eb2b8b0e07245a413715e6
+_md5_=3e200c267b55d7edef959a34d2925139
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.9.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.9.3
index 666a048bf6b8..ab1748a44ba1 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.9.3
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) sys-devel/make >=dev-util/cmake-3.6.3 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.6.3 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.29.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-misc/openconnect:= ) >=kde-plasma/plasma-workspace-5.9.3:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.29.0:5 >=kde-frameworks/kconfig-5.29.0:5 >=kde-frameworks/kconfigwidgets-5.29.0:5 >=kde-frameworks/kcoreaddons-5.29.0:5 >=kde-frameworks/kdbusaddons-5.29.0:5 >=kde-frameworks/kdeclarative-5.29.0:5 >=kde-frameworks/kdelibs4support-5.29.0:5 >=kde-frameworks/ki18n-5.29.0:5 >=kde-frameworks/kiconthemes-5.29.0:5 >=kde-frameworks/kio-5.29.0:5 >=kde-frameworks/kitemviews-5.29.0:5 >=kde-frameworks/knotifications-5.29.0:5 >=kde-frameworks/kservice-5.29.0:5 >=kde-frameworks/kwallet-5.29.0:5 >=kde-frameworks/kwidgetsaddons-5.29.0:5 >=kde-frameworks/kwindowsystem-5.29.0:5 >=kde-frameworks/kxmlgui-5.29.0:5 >=kde-frameworks/networkmanager-qt-5.29.0:5[teamd=] >=kde-frameworks/plasma-5.29.0:5 >=kde-frameworks/solid-5.29.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.29.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.9.3:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.9.3/plasma-nm-5.9.3.tar.xz
 _eclass_exported_funcs=pkg_preinst:kde5 pkg_postrm:kde5 pkg_postinst:kde5 pkg_setup:kde5 src_unpack:kde5 src_prepare:kde5 src_configure:- src_compile:kde5 src_test:kde5 src_install:kde5
 _eclasses_=cmake-utils	dd1d263f83f0791bd433b134f40db39b	eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	kde5	dff0f6dcdbfeaf03dac4c286032f1622	kde5-functions	4d549f753da6d754874f9f755e2d6794	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=6dc531f620eb2b8b0e07245a413715e6
+_md5_=3e200c267b55d7edef959a34d2925139
diff --git a/metadata/md5-cache/net-dns/hash-slinger-2.6-r1 b/metadata/md5-cache/net-dns/hash-slinger-2.6-r1
index eb4dbfa380bd..9d788e848677 100644
--- a/metadata/md5-cache/net-dns/hash-slinger-2.6-r1
+++ b/metadata/md5-cache/net-dns/hash-slinger-2.6-r1
@@ -5,10 +5,10 @@ HOMEPAGE=https://people.redhat.com/pwouters/hash-slinger/
 IUSE=ipsec +openpgp +ssh python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/unbound[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ipsec? ( net-misc/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssh? ( net-misc/openssh )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/unbound[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ipsec? ( net-vpn/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssh? ( net-misc/openssh )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.6.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	4f8aa7196c2c9a5630e66c2113ae46c3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4e94ea5b42a0b0a91ffd9ea25db6de89
+_md5_=8e332df82c5d84f5dea205d2bbcef390
diff --git a/metadata/md5-cache/net-dns/hash-slinger-2.7 b/metadata/md5-cache/net-dns/hash-slinger-2.7
index 257d3d27688a..1d3bf6c70178 100644
--- a/metadata/md5-cache/net-dns/hash-slinger-2.7
+++ b/metadata/md5-cache/net-dns/hash-slinger-2.7
@@ -5,10 +5,10 @@ HOMEPAGE=https://people.redhat.com/pwouters/hash-slinger/
 IUSE=ipsec +openpgp +ssh python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/unbound[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ipsec? ( net-misc/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssh? ( net-misc/openssh )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/unbound[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ipsec? ( net-vpn/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssh? ( net-misc/openssh )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.7.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	4f8aa7196c2c9a5630e66c2113ae46c3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4e94ea5b42a0b0a91ffd9ea25db6de89
+_md5_=8e332df82c5d84f5dea205d2bbcef390
diff --git a/metadata/md5-cache/net-misc/connman-1.29 b/metadata/md5-cache/net-misc/connman-1.29
index ffbe4287932c..96e96eb1dd3e 100644
--- a/metadata/md5-cache/net-misc/connman-1.29
+++ b/metadata/md5-cache/net-misc/connman-1.29
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig
 DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=5
 HOMEPAGE=https://01.org/connman
 IUSE=bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
+RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.29.tar.xz
 _eclass_exported_funcs=src_unpack:base src_prepare:base src_configure:- src_compile:base src_install:-
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=9045d7c9a3abeb78b972ee9f1724a935
+_md5_=f5f3537512e1cc1ed7a92f748b437e03
diff --git a/metadata/md5-cache/net-misc/connman-1.33-r1 b/metadata/md5-cache/net-misc/connman-1.33-r1
index 719f10b5dc70..e66cbc345386 100644
--- a/metadata/md5-cache/net-misc/connman-1.33-r1
+++ b/metadata/md5-cache/net-misc/connman-1.33-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls ) >=sys-kernel/linux-headers-2.6.39 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Provides a daemon for managing internet connections
 EAPI=6
 HOMEPAGE=https://01.org/connman
 IUSE=bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-misc/openconnect ) openvpn? ( net-misc/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
+RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 bluetooth? ( net-wireless/bluez ) l2tp? ( net-dialup/xl2tpd ) ofono? ( net-misc/ofono ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) wispr? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.33.tar.xz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=fe51d26a9dfb972169cebe3c4dbdf78e
+_md5_=79c6120134820d0b388b4efba2dea713
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.0 b/metadata/md5-cache/net-misc/connman-gtk-1.0
index fda4b3f50d5e..d332b80abcb9 100644
--- a/metadata/md5-cache/net-misc/connman-gtk-1.0
+++ b/metadata/md5-cache/net-misc/connman-gtk-1.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/jgke/connman-gtk
 IUSE=openconnect
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-misc/openconnect-5.99 ) net-misc/connman
+RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.0.tar.gz -> connman-gtk-1.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d5fae5697e7ed1310388d1768a64f41b
+_md5_=cf398cac7514eb72cf5ecbdb089dd203
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.0-r1 b/metadata/md5-cache/net-misc/connman-gtk-1.0-r1
index c7bd1565ba94..8296bda6460f 100644
--- a/metadata/md5-cache/net-misc/connman-gtk-1.0-r1
+++ b/metadata/md5-cache/net-misc/connman-gtk-1.0-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/jgke/connman-gtk
 IUSE=openconnect
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-misc/openconnect-5.99 ) net-misc/connman
+RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.0.tar.gz -> connman-gtk-1.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=67756a74d884e3a4c9de15c857b9fc4f
+_md5_=942c4f776dfb50bcb7cb82e0523ac225
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.1.1 b/metadata/md5-cache/net-misc/connman-gtk-1.1.1
index 747d7adb3087..188eec4e086f 100644
--- a/metadata/md5-cache/net-misc/connman-gtk-1.1.1
+++ b/metadata/md5-cache/net-misc/connman-gtk-1.1.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/jgke/connman-gtk
 IUSE=openconnect
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-misc/openconnect-5.99 ) net-misc/connman
+RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
 SLOT=0
 SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.1.1.tar.gz -> connman-gtk-1.1.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1395be06e8271bf8961c6c7903b09f4b
+_md5_=1174dca13fae6f91280a06cdbc773d95
diff --git a/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.2 b/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.2
index a1bc1d9bda90..a32583ace743 100644
--- a/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.2
+++ b/metadata/md5-cache/net-misc/networkmanager-fortisslvpn-1.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.1:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-misc/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=net-misc/networkmanager-1.1:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=NetworkManager Fortinet SSLVPN compatible plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.1:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-misc/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.1:= >=dev-libs/glib-2.32:2 net-dialup/ppp:= >=net-vpn/openfortivpn-1.2.0 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.2/NetworkManager-fortisslvpn-1.2.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=1bceedae0275a68807ede97f9fddf7c8
+_md5_=8f525e684f7b729e2194c0d7199084cd
diff --git a/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4 b/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4
index e12fdc0d55b9..42e9a9a94a76 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4
+++ b/metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-misc/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager OpenConnect plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-misc/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.4.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=5b0b21256a7061b0d218fc00d1dbbd9b
+_md5_=65b2bcbeff7714429567a95d22d5ee85
diff --git a/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.6 b/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.6
index 969ddc9bb0e7..531f4bc77222 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.6
+++ b/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager Openswan plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openswan/1.0/NetworkManager-openswan-1.0.6.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ce3f3a92a40933f859a56afc253c4392
+_md5_=a74aa4e3a81afa7cb9f6188825f02379
diff --git a/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8 b/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
index 91e32c626fec..a0db0d5365aa 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
+++ b/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager Openswan plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-vpn/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openswan/1.0/NetworkManager-openswan-1.0.8.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=ce3f3a92a40933f859a56afc253c4392
+_md5_=a74aa4e3a81afa7cb9f6188825f02379
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.6 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.6
index 79a46506d6a8..c2b5d2eda534 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.6
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-misc/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-vpn/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-misc/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-vpn/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.2/NetworkManager-openvpn-1.2.6.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=e124c464e87937c2a03f8c20f94c6bdd
+_md5_=d246bd95e496e1ce69d96d0f12e6cdb0
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.8 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.8
index 5fac8df4d9aa..05789ff68110 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.8
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.2.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-misc/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-vpn/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-misc/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2.0:= >=net-vpn/openvpn-2.1_rc9 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.2/NetworkManager-openvpn-1.2.8.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=b81c3dc44f3e8853b85720464a36488e
+_md5_=a0d0217c6d4ffa61942bcd5b5e6b6a1e
diff --git a/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.4 b/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.4
index 8b85d8e02c79..c6df997042a0 100644
--- a/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.4
+++ b/metadata/md5-cache/net-misc/networkmanager-vpnc-1.2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-misc/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=NetworkManager VPNC plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-misc/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
+RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.2.0 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.4.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	d37ffcd1731600f2d196e77cd77ed727	gnome2-utils	fe8e9099c6fc74a40946623c593c7236	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=bfe03cc4afda5e3a9f6a48645d1aa9bb
+_md5_=56e99d46f44d059153a1636a22da9d74
diff --git a/metadata/md5-cache/net-misc/openvpn-auth-ldap-2.0.4_pre20131110 b/metadata/md5-cache/net-misc/openvpn-auth-ldap-2.0.4_pre20131110
index 7f23b5bfb6be..ccbe3e5f08bc 100644
--- a/metadata/md5-cache/net-misc/openvpn-auth-ldap-2.0.4_pre20131110
+++ b/metadata/md5-cache/net-misc/openvpn-auth-ldap-2.0.4_pre20131110
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-util/re2c sys-devel/gcc[objc] net-misc/openvpn net-nds/openldap !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-util/re2c sys-devel/gcc[objc] net-vpn/openvpn net-nds/openldap !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=LDAP authentication and authorization plugin for OpenVPN 2.x
 EAPI=5
 HOMEPAGE=https://github.com/threerings/openvpn-auth-ldap
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=net-misc/openvpn net-nds/openldap
+RDEPEND=net-vpn/openvpn net-nds/openldap
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=bad7888a4f29ecfec4b3128ea4336ff3
+_md5_=0612b5030f8f73ea1459501238512c82
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.126 b/metadata/md5-cache/net-vpn/badvpn-1.999.126
index daadfefee365..daadfefee365 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.126
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.126
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.127 b/metadata/md5-cache/net-vpn/badvpn-1.999.127
index 211934202825..211934202825 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.127
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.127
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.128 b/metadata/md5-cache/net-vpn/badvpn-1.999.128
index c97f07b77fbc..c97f07b77fbc 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.128
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.128
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.129 b/metadata/md5-cache/net-vpn/badvpn-1.999.129
index d9a157ea87ea..d9a157ea87ea 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.129
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.129
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.130 b/metadata/md5-cache/net-vpn/badvpn-1.999.130
index a5d73757317f..a5d73757317f 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.130
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.130
diff --git a/metadata/md5-cache/net-misc/freelan-2.0 b/metadata/md5-cache/net-vpn/freelan-2.0
index f87144b0c4a8..f87144b0c4a8 100644
--- a/metadata/md5-cache/net-misc/freelan-2.0
+++ b/metadata/md5-cache/net-vpn/freelan-2.0
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.2-r5 b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
index 9c6c85310a0f..f39387292e45 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.2-r5
+++ b/metadata/md5-cache/net-vpn/ipsec-tools-0.8.2-r5
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.2.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	48b1b9f6194d2842456514d1184ca72e	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9eb3bdfc5707d52db292a659b15d150b
+_md5_=76df0e1b4d169e90af3e8f3f11d6a692
diff --git a/metadata/md5-cache/net-misc/kvpnc-0.9.6a-r2 b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
index 922e95a47a3f..922e95a47a3f 100644
--- a/metadata/md5-cache/net-misc/kvpnc-0.9.6a-r2
+++ b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
diff --git a/metadata/md5-cache/net-misc/libreswan-3.18 b/metadata/md5-cache/net-vpn/libreswan-3.18
index c792b76f0a62..b65c6e37b1e1 100644
--- a/metadata/md5-cache/net-misc/libreswan-3.18
+++ b/metadata/md5-cache/net-vpn/libreswan-3.18
@@ -6,9 +6,9 @@ HOMEPAGE=https://libreswan.org/
 IUSE=caps curl dnssec ldap pam systemd
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=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= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
+RDEPEND=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= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-3.18.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=e10cd775260e6c9eacc75f09424f4a36
+_md5_=9430e469e042485cea68fa716ff85a7d
diff --git a/metadata/md5-cache/net-misc/libreswan-9999 b/metadata/md5-cache/net-vpn/libreswan-9999
index 590004a6a777..e9503b1f56a0 100644
--- a/metadata/md5-cache/net-misc/libreswan-9999
+++ b/metadata/md5-cache/net-vpn/libreswan-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://libreswan.org/
 IUSE=caps curl dnssec ldap pam systemd
 LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=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= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
+RDEPEND=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= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan
 SLOT=0
 _eclass_exported_funcs=pkg_postinst:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	git-r3	08c5be5f8bdc203ed54d5ff5fef3c34d	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=fc2250b241ae8986b9fc8d2ffb13f8a6
+_md5_=9cbbc89e590b9992beaf8cd177a2ec83
diff --git a/metadata/md5-cache/net-misc/logmein-hamachi-2.1.0.139 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.139
index 3b7ea28379ea..3b7ea28379ea 100644
--- a/metadata/md5-cache/net-misc/logmein-hamachi-2.1.0.139
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.139
diff --git a/metadata/md5-cache/net-misc/logmein-hamachi-2.1.0.174 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
index 66409028575f..66409028575f 100644
--- a/metadata/md5-cache/net-misc/logmein-hamachi-2.1.0.174
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06-r1 b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
index 7cbe952ea2ad..7cbe952ea2ad 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06-r1
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06-r4 b/metadata/md5-cache/net-vpn/openconnect-7.06-r4
index 66edc8d18c1d..66edc8d18c1d 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06-r4
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06-r4
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06_p20160614 b/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
index 3c335e130eab..3c335e130eab 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06_p20160614
+++ b/metadata/md5-cache/net-vpn/openconnect-7.06_p20160614
diff --git a/metadata/md5-cache/net-misc/openconnect-7.07-r1 b/metadata/md5-cache/net-vpn/openconnect-7.07-r1
index 400a108ad119..400a108ad119 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.07-r1
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r1
diff --git a/metadata/md5-cache/net-misc/openconnect-7.07-r2 b/metadata/md5-cache/net-vpn/openconnect-7.07-r2
index dbd63309751b..dbd63309751b 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.07-r2
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r2
diff --git a/metadata/md5-cache/net-misc/openconnect-7.07-r3 b/metadata/md5-cache/net-vpn/openconnect-7.07-r3
index e8ac8d1f49da..e8ac8d1f49da 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.07-r3
+++ b/metadata/md5-cache/net-vpn/openconnect-7.07-r3
diff --git a/metadata/md5-cache/net-misc/openconnect-7.08 b/metadata/md5-cache/net-vpn/openconnect-7.08
index 6121394bd937..6121394bd937 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.08
+++ b/metadata/md5-cache/net-vpn/openconnect-7.08
diff --git a/metadata/md5-cache/net-misc/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index 1457bcd3ff03..1457bcd3ff03 100644
--- a/metadata/md5-cache/net-misc/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
diff --git a/metadata/md5-cache/net-misc/openfortivpn-1.3.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.3.0
index d50e036efe8f..d50e036efe8f 100644
--- a/metadata/md5-cache/net-misc/openfortivpn-1.3.0
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.3.0
diff --git a/metadata/md5-cache/net-misc/openvpn-2.3.12 b/metadata/md5-cache/net-vpn/openvpn-2.3.12
index 7e6d1462cbc1..7e6d1462cbc1 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.3.12
+++ b/metadata/md5-cache/net-vpn/openvpn-2.3.12
diff --git a/metadata/md5-cache/net-misc/openvpn-2.3.14 b/metadata/md5-cache/net-vpn/openvpn-2.3.14
index 71657cc21f04..71657cc21f04 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.3.14
+++ b/metadata/md5-cache/net-vpn/openvpn-2.3.14
diff --git a/metadata/md5-cache/net-misc/openvpn-2.4.0 b/metadata/md5-cache/net-vpn/openvpn-2.4.0
index c4fd8aeccc7d..c4fd8aeccc7d 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.4.0
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.0
diff --git a/metadata/md5-cache/net-misc/openvpn-2.4.0-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.0-r1
index 7a2dac828ec8..7a2dac828ec8 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.4.0-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.0-r1
diff --git a/metadata/md5-cache/net-misc/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index f99e99551c3f..f99e99551c3f 100644
--- a/metadata/md5-cache/net-misc/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
diff --git a/metadata/md5-cache/net-misc/peervpn-0.044-r2 b/metadata/md5-cache/net-vpn/peervpn-0.044-r2
index 411f007f7a97..411f007f7a97 100644
--- a/metadata/md5-cache/net-misc/peervpn-0.044-r2
+++ b/metadata/md5-cache/net-vpn/peervpn-0.044-r2
diff --git a/metadata/md5-cache/net-misc/strongswan-5.3.4 b/metadata/md5-cache/net-vpn/strongswan-5.3.4
index c365f4d2f639..a2dc1d12ebdf 100644
--- a/metadata/md5-cache/net-misc/strongswan-5.3.4
+++ b/metadata/md5-cache/net-vpn/strongswan-5.3.4
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.strongswan.org/
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
 KEYWORDS=amd64 arm ppc ~ppc64 x86
 LICENSE=GPL-2 RSA DES
-RDEPEND=!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 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/logger sys-apps/iproute2 !net-misc/libreswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=!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 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=http://download.strongswan.org/strongswan-5.3.4.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=923701d83bbd0d60cd6b9dad4a26eca4
+_md5_=9c59253a5d1d2a93923dc968e5f34f55
diff --git a/metadata/md5-cache/net-misc/strongswan-5.5.1 b/metadata/md5-cache/net-vpn/strongswan-5.5.1
index 26d9038622fb..1c939ba93d39 100644
--- a/metadata/md5-cache/net-misc/strongswan-5.5.1
+++ b/metadata/md5-cache/net-vpn/strongswan-5.5.1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.strongswan.org/
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_ctr strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_unbound strongswan_plugins_whitelist
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 RSA DES
-RDEPEND=!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 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-misc/libreswan selinux? ( sec-policy/selinux-ipsec )
+RDEPEND=!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 ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=http://download.strongswan.org/strongswan-5.5.1.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c043a8baa3cc8e73f40fef35872695a5
+_md5_=0288ad9858e44bfc29d81421dfdc534f
diff --git a/metadata/md5-cache/net-misc/tinc-1.0.29 b/metadata/md5-cache/net-vpn/tinc-1.0.29
index d91c658e985a..d91c658e985a 100644
--- a/metadata/md5-cache/net-misc/tinc-1.0.29
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.29
diff --git a/metadata/md5-cache/net-misc/tinc-1.0.30 b/metadata/md5-cache/net-vpn/tinc-1.0.30
index f835f29873cd..f835f29873cd 100644
--- a/metadata/md5-cache/net-misc/tinc-1.0.30
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.30
diff --git a/metadata/md5-cache/net-misc/tinc-1.0.31 b/metadata/md5-cache/net-vpn/tinc-1.0.31
index 78c85dccd4ec..78c85dccd4ec 100644
--- a/metadata/md5-cache/net-misc/tinc-1.0.31
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.31
diff --git a/metadata/md5-cache/net-misc/tinc-1.1_pre14-r3 b/metadata/md5-cache/net-vpn/tinc-1.1_pre14-r3
index 77d01ac4b687..77d01ac4b687 100644
--- a/metadata/md5-cache/net-misc/tinc-1.1_pre14-r3
+++ b/metadata/md5-cache/net-vpn/tinc-1.1_pre14-r3
diff --git a/metadata/md5-cache/net-misc/vpnc-0.5.3_p550 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
index 1349a6031780..1349a6031780 100644
--- a/metadata/md5-cache/net-misc/vpnc-0.5.3_p550
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550
diff --git a/metadata/md5-cache/net-misc/vpncwatch-1.8 b/metadata/md5-cache/net-vpn/vpncwatch-1.8
index a6afea156535..98cb57e11e3c 100644
--- a/metadata/md5-cache/net-misc/vpncwatch-1.8
+++ b/metadata/md5-cache/net-vpn/vpncwatch-1.8
@@ -4,9 +4,9 @@ EAPI=4
 HOMEPAGE=https://github.com/dcantrell/vpncwatch/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=net-misc/vpnc
+RDEPEND=net-vpn/vpnc
 SLOT=0
 SRC_URI=https://github.com/downloads/dcantrell/vpncwatch/vpncwatch-1.8.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=2a0f884d7d9fd068773aa181da3d9464
+_md5_=c3d00492e510e34d589b3042fdcabef7
diff --git a/metadata/md5-cache/net-misc/vpncwatch-1.8.1 b/metadata/md5-cache/net-vpn/vpncwatch-1.8.1
index fc9d98bfae28..457cd609d27a 100644
--- a/metadata/md5-cache/net-misc/vpncwatch-1.8.1
+++ b/metadata/md5-cache/net-vpn/vpncwatch-1.8.1
@@ -4,9 +4,9 @@ EAPI=5
 HOMEPAGE=https://github.com/dcantrell/vpncwatch/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=net-misc/vpnc
+RDEPEND=net-vpn/vpnc
 SLOT=0
 SRC_URI=https://github.com/downloads/dcantrell/vpncwatch/vpncwatch-1.8.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=d524a15586c03b4d0695673bc9fcf64b
+_md5_=268358bbd04fa3cfb5c992e3f69956bb
diff --git a/metadata/md5-cache/net-misc/wireguard-0.0.20170223 b/metadata/md5-cache/net-vpn/wireguard-0.0.20170223
index 0c410cc9375e..0c410cc9375e 100644
--- a/metadata/md5-cache/net-misc/wireguard-0.0.20170223
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20170223
diff --git a/metadata/md5-cache/net-misc/wireguard-9999 b/metadata/md5-cache/net-vpn/wireguard-9999
index b6767cbf1ae3..b6767cbf1ae3 100644
--- a/metadata/md5-cache/net-misc/wireguard-9999
+++ b/metadata/md5-cache/net-vpn/wireguard-9999
diff --git a/metadata/md5-cache/sys-apps/openrc-0.21.7 b/metadata/md5-cache/sys-apps/openrc-0.21.7
index fff3d3fb3cb0..91ac1f518cc0 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.21.7
+++ b/metadata/md5-cache/sys-apps/openrc-0.21.7
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://dev.gentoo.org/~williamh/dist/openrc-0.21.7.tar.bz2
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=036456ae28713a51a8f8404345d77ff5
+_md5_=43ad29e0c5ce1e1b73a18ca1bdf12634
diff --git a/metadata/md5-cache/sys-apps/openrc-0.22.4 b/metadata/md5-cache/sys-apps/openrc-0.22.4
index 9e53291a7a9f..1f10ff3f68b3 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.22.4
+++ b/metadata/md5-cache/sys-apps/openrc-0.22.4
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.22.4.tar.gz -> openrc-0.22.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=81e776115fd6647390e3683d3b3e608f
+_md5_=a2227a03f9d3823761b3905a5da739e9
diff --git a/metadata/md5-cache/sys-apps/openrc-0.23.2 b/metadata/md5-cache/sys-apps/openrc-0.23.2
index 8a77a3979253..ebfb003d36fd 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.23.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.23.2
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.23.2.tar.gz -> openrc-0.23.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=93609541723b591bd76f45625af8737f
+_md5_=db1bed93fd936158af161f100afb9ca8
diff --git a/metadata/md5-cache/sys-apps/openrc-0.24.1 b/metadata/md5-cache/sys-apps/openrc-0.24.1
index b7949824baa7..44af8d2ce687 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.24.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.24.1
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.24.1.tar.gz -> openrc-0.24.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=16183040e72002de1ac987e4b4e898b7
+_md5_=7b5128c9bab23881e363dd3238d8c442
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index b5098aafffad..da762d1fab27 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -10,4 +10,4 @@ RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fus
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- pkg_postinst:- src_unpack:git-r3 src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	08c5be5f8bdc203ed54d5ff5fef3c34d	multilib	0236be304ee52e7f179ed2f337075515	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=16183040e72002de1ac987e4b4e898b7
+_md5_=7b5128c9bab23881e363dd3238d8c442
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index d38fbbcfb616..617888cc7f9b 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -14495,7 +14495,6 @@ net-firewall/fwipsec 0.4.2-r1: Firewall scripts that control iptables, FreeS/WAN
 net-firewall/fwknop 2.6.9: Single Packet Authorization and Port Knocking application
 net-firewall/gshield 2.8-r4: iptables firewall configuration system
 net-firewall/ipkungfu 0.5.2-r2 0.6.1-r1: A nice iptables firewall script
-net-firewall/ipsec-tools 0.8.2-r5: A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
 net-firewall/ipset 6.15 6.16 6.16.1 6.17 6.19 6.20.1 6.21.1 6.24 6.29 6.30: IPset tool for iptables, successor to ippool
 net-firewall/ipt_netflow 2.2-r1: Netflow iptables module
 net-firewall/iptables 1.4.21-r1 1.4.21-r4 1.6.0-r1 1.6.1-r1: Linux kernel (2.4+) firewall, NAT and packet mangling tools
@@ -15017,7 +15016,6 @@ net-misc/astmanproxy 1.28.2: Proxy for the Asterisk manager interface
 net-misc/autossh 1.4e: Automatically restart SSH sessions and tunnels
 net-misc/autoupnp 0.4.6 0.4.7 9999: Automatic open port forwarder using UPnP
 net-misc/axel 2.4-r3 2.12 9999: Light Unix download accelerator
-net-misc/badvpn 1.999.126 1.999.127 1.999.128 1.999.129 1.999.130: Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
 net-misc/balance 3.57: TCP Load Balancing Port Forwarder
 net-misc/batctl 2013.4.0 2014.2.0: BATMAN advanced control and management tool
 net-misc/batman-adv 2013.4.0 2014.2.0: Better approach to mobile Ad-Hoc networking on layer 2 kernel module
@@ -15083,7 +15081,6 @@ net-misc/fakeidentd 2.6-r1: A static, secure identd. One source file only!
 net-misc/fatrat 1.2.0_beta2 1.2.0_beta2_p20150803: Qt4-based download/upload manager
 net-misc/flexget 1.2.315 1.2.346-r1 9999: Multipurpose automation tool for content like torrents, nzbs, podcasts, comics
 net-misc/fmirror 0.8.4-r2: FTP mirror utility
-net-misc/freelan 2.0: Peer-to-peer VPN software that abstracts a LAN over the Internet
 net-misc/freerdp 1.2.1_pre20150326-r1 2.0.0_pre20160722 2.0.0_pre20161219 9999: Free implementation of the Remote Desktop Protocol
 net-misc/gcap 0.1.1-r1: Command line tool for downloading Youtube closed captions
 net-misc/geoipupdate 2.2.2 2.3.1: performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
@@ -15146,7 +15143,6 @@ net-misc/keychain 2.8.1 2.8.2 2.8.3: Agent manager for OpenSSH, ssh.com, Sun SSH
 net-misc/knemo 0.8.0_pre20161211: Plasma Network Monitor
 net-misc/knock 0.6 0.7: A simple port-knocking daemon
 net-misc/knutclient 1.0.5: A visual KDE client for UPS systems
-net-misc/kvpnc 0.9.6a-r2: KDE frontend for various VPN clients
 net-misc/l7-filter-userspace 0.11 0.12_beta1: Userspace utilities for layer 7 iptables QoS
 net-misc/l7-protocols 2009.05.28: Protocol definitions of l7-filter kernel modules
 net-misc/lambdamoo 1.8.1-r3: networked mud that can be used for different types of collaborative software
@@ -15154,7 +15150,6 @@ net-misc/lanmap 81-r1 81-r2: lanmap sits quietly on a network and builds a pictu
 net-misc/lcr 9999: Linux Call Router
 net-misc/leapcast 0.1.3-r1 9999: Simple ChromeCast emulation app
 net-misc/libres3 1.2 1.3: Skylable LibreS3 - Amazon S3 open source replacement
-net-misc/libreswan 3.18 9999: IPsec implementation for Linux, fork of Openswan
 net-misc/libss7 1.0.2: Signalling System 7 (SS7) protocol library
 net-misc/libteam 1.22: Library and tools set for controlling team network device
 net-misc/linux-eoip 0.5: Linux support for proprietary MIkrotik EoIP protocol
@@ -15164,7 +15159,6 @@ net-misc/liveice 2000530-r1: Live Source Client For IceCast
 net-misc/livestreamer 1.11.1 1.12.1 1.12.2: CLI tool that pipes video streams from services like twitch.tv into a video player
 net-misc/lksctp-tools 1.0.13 1.0.16 1.0.17: Tools for Linux Kernel Stream Control Transmission Protocol implementation
 net-misc/lldpd 0.9.3-r1 0.9.4 0.9.5-r1 0.9.6: Implementation of IEEE 802.1ab (LLDP)
-net-misc/logmein-hamachi 2.1.0.139 2.1.0.174: LogMeIn Hamachi VPN tunneling engine
 net-misc/mediatomb 0.12.1-r8 0.12.2_pre20160522: MediaTomb is an open source UPnP MediaServer
 net-misc/megatools 1.9.97 1.9.98: Command line tools and C library for accessing Mega cloud storage
 net-misc/memcached 1.4.33 1.4.33-r1 1.4.34 1.4.35: High-performance, distributed memory object caching system
@@ -15229,14 +15223,11 @@ net-misc/ofono 1.16 1.17 1.18 1.19: Open Source mobile telephony (GSM/UMTS) daem
 net-misc/oidentd 2.0.8-r5: Another (RFC1413 compliant) ident daemon
 net-misc/olsrd 0.9.0.2 0.9.6 0.9.6.1: An implementation of the Optimized Link State Routing protocol
 net-misc/omniORB 4.1.4-r2 4.2.1_p2: A robust, high-performance CORBA 2 ORB
-net-misc/openconnect 7.06-r1 7.06-r4 7.06_p20160614 7.07-r1 7.07-r2 7.07-r3 7.08 9999: Free client for Cisco AnyConnect SSL VPN software
-net-misc/openfortivpn 1.3.0: A Fortinet compatible VPN client
 net-misc/openntpd 6.0_p1: Lightweight NTP server ported from OpenBSD
 net-misc/openr2 1.3.0: An open implementation of the MFC/R2 telephony signaling protocol
 net-misc/openrdate 1.2: use TCP or UDP to retrieve the current time of another machine
 net-misc/openssh 7.3_p1-r7 7.3_p1-r8 7.4_p1: Port of OpenBSD's free SSH release
 net-misc/openssh-blacklist 0.4.1: Source files of vuln Debian keys
-net-misc/openvpn 2.3.12 2.3.14 2.4.0 2.4.0-r1 9999: Robust and highly flexible tunneling application compatible with many OSes
 net-misc/openvpn-auth-ldap 2.0.4_pre20131110: LDAP authentication and authorization plugin for OpenVPN 2.x
 net-misc/openvswitch 1.11.0 2.0.0-r3 2.1.3 2.5.0 2.6.1 2.7.0: Production quality, multilayer virtual switch
 net-misc/orbited 0.7.10-r1 0.7.10-r3: Real-time communication for the browser.
@@ -15245,7 +15236,6 @@ net-misc/packETH 1.7.2 1.7.3 1.8: Packet generator tool for ethernet
 net-misc/pavuk 0.9.36_pre20120215-r2: Web spider and website mirroring tool
 net-misc/pcapfix 0.7: Repair and fix broken pcap files
 net-misc/pedro 1.6: Pedro is a subscription/notification communications system
-net-misc/peervpn 0.044-r2: P2P mesh VPN
 net-misc/pen 0.25.1: TCP Load Balancing Port Forwarder
 net-misc/pimpd 0.8: RFC1413-compliant identd server supporting masqueraded connections
 net-misc/pipes 1.16.1: Very versatile TCP pipes
@@ -15330,7 +15320,6 @@ net-misc/stargazer 2.408: Billing system for small home and office networks
 net-misc/stone 2.3e-r1: A simple TCP/IP packet repeater
 net-misc/streamlink 0.1.0 0.4.0 9999: CLI for extracting streams from websites to a video player of your choice
 net-misc/streamtuner 0.99.99-r5: Stream directory browser for browsing internet radio streams
-net-misc/strongswan 5.3.4 5.5.1: IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE
 net-misc/stunnel 5.36 5.37 5.38 5.39 5.40: TLS/SSL - Port Wrapper
 net-misc/stuntman 1.2.7 1.2.9: STUNTMAN is an open source implementation of the STUN protocol
 net-misc/suite3270 3.3.15_p9 3.4_p9 3.4_p10 3.5_p8 3.5_p9 3.5_p10: Complete 3270 access package
@@ -15344,7 +15333,6 @@ net-misc/termpkg 3.3.9.1-r2: Termpkg, the Poor Man's Terminal Server
 net-misc/throttle 1.2: Bandwidth limiting pipe
 net-misc/tiers 1.1: Random network topography generator
 net-misc/tigervnc 1.7.1 1.7.1-r1 1.7.1-r2: Remote desktop viewer display system
-net-misc/tinc 1.0.29 1.0.30 1.0.31 1.1_pre14-r3: tinc is an easy to configure VPN implementation
 net-misc/tipcutils 2.0.0 2.0.3: Utilities for TIPC (Transparent Inter-Process Communication)
 net-misc/tlsdate 0.0.13: Update local time over HTTPS
 net-misc/tn5250 0.17.4-r1 0.17.4-r2: IBM AS/400 telnet client which emulates 5250 terminals/printers
@@ -15369,8 +15357,6 @@ net-misc/vmnet 0.4: A simple virtual networking program - SLIP over stdin/out
 net-misc/vmpsd 1.4: An open-source VLAN management system
 net-misc/vncrec 0.2-r1: VNC session recorder and player
 net-misc/vncsnapshot 1.2a: A command-line tool for taking JPEG snapshots of VNC servers
-net-misc/vpnc 0.5.3_p550: Free client for Cisco VPN routing software
-net-misc/vpncwatch 1.8 1.8.1: Keepalive daemon for vpnc on Linux systems
 net-misc/vrrpd 1.0 1.9: Virtual Router Redundancy Protocol Daemon
 net-misc/vtun 3.0.3: Create tunnels over TCP/IP networks with shaping, encryption, and compression
 net-misc/wakeonlan 0.41-r2: Client for Wake-On-LAN
@@ -15379,7 +15365,6 @@ net-misc/whatmask 1.2-r1: little C program to compute different subnet mask nota
 net-misc/whatportis 0.2 0.3 0.4 0.5 0.6: A command to search port names and numbers
 net-misc/whois 5.2.12 5.2.14 5.2.15: improved Whois Client
 net-misc/wicd 1.7.3-r2 1.7.4-r1 1.7.4-r2: A lightweight wired and wireless network manager for Linux
-net-misc/wireguard 0.0.20170223 9999: Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
 net-misc/wol 0.7.1-r1: Wake up hardware that is Magic Packet compliant
 net-misc/wput 0.6.1: A tiny, wget-alike program, that is designed to upload files/whole directories to remote ftp-servers
 net-misc/x11-ssh-askpass 1.2.4.1-r1: X11-based passphrase dialog for use with OpenSSH
@@ -15595,6 +15580,21 @@ net-voip/telepathy-rakia 0.8.0: A SIP connection manager for Telepathy based aro
 net-voip/telepathy-salut 0.8.1: A link-local XMPP connection manager for Telepathy
 net-voip/vidyodesktop 3.6.3.017 3.6.7.010: Enterprise video conferencing platform
 net-voip/yate 5.4.0-r1 5.5.0-r1 9999: The Yate AV Suite
+net-vpn/badvpn 1.999.126 1.999.127 1.999.128 1.999.129 1.999.130: Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
+net-vpn/freelan 2.0: Peer-to-peer VPN software that abstracts a LAN over the Internet
+net-vpn/ipsec-tools 0.8.2-r5: A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
+net-vpn/kvpnc 0.9.6a-r2: KDE frontend for various VPN clients
+net-vpn/libreswan 3.18 9999: IPsec implementation for Linux, fork of Openswan
+net-vpn/logmein-hamachi 2.1.0.139 2.1.0.174: LogMeIn Hamachi VPN tunneling engine
+net-vpn/openconnect 7.06-r1 7.06-r4 7.06_p20160614 7.07-r1 7.07-r2 7.07-r3 7.08 9999: Free client for Cisco AnyConnect SSL VPN software
+net-vpn/openfortivpn 1.3.0: A Fortinet compatible VPN client
+net-vpn/openvpn 2.3.12 2.3.14 2.4.0 2.4.0-r1 9999: Robust and highly flexible tunneling application compatible with many OSes
+net-vpn/peervpn 0.044-r2: P2P mesh VPN
+net-vpn/strongswan 5.3.4 5.5.1: IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE
+net-vpn/tinc 1.0.29 1.0.30 1.0.31 1.1_pre14-r3: tinc is an easy to configure VPN implementation
+net-vpn/vpnc 0.5.3_p550: Free client for Cisco VPN routing software
+net-vpn/vpncwatch 1.8 1.8.1: Keepalive daemon for vpnc on Linux systems
+net-vpn/wireguard 0.0.20170223 9999: Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
 net-wireless/adm8211 20060111: IEEE 802.11 wireless LAN driver for adm8211 based cards
 net-wireless/aircrack-ng 1.2_rc1-r1 1.2_rc4-r1 9999: WLAN tools for breaking 802.11 WEP/WPA keys
 net-wireless/airpwn 1.4-r2: Tool for generic packet injection on 802.11
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 43152800ea58..5c8b7cf9c414 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2017 13:48:15 +0000
+Fri, 17 Mar 2017 14:04:08 +0000