165 files changed, 83 insertions, 57 deletions
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild
index bf75b979eb5c..cc316f8f1984 100644
--- a/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="libressl"
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
 	libressl? ( dev-libs/libressl )"
 RDEPEND="${DEPEND}
-	!<net-misc/openvpn-2.3"
+	!<net-vpn/openvpn-2.3"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
index a8a8946eb679..c0dc72838fc6 100644
--- a/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.6:0"
 RDEPEND="${DEPEND}
-	!<net-misc/openvpn-2.3"
+	!<net-vpn/openvpn-2.3"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
index 1a682004001b..393d4f048431 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="libressl"
 DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
 	libressl? ( dev-libs/libressl )"
 RDEPEND="${DEPEND}
-	!<net-misc/openvpn-2.3"
+	!<net-vpn/openvpn-2.3"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.5.ebuild
index d294e3ae1c28..461acd01a25b 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.8.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.8.5.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 	openconnect? (
 		$(add_qt_dep qtxml)
 		net-misc/networkmanager-openconnect
-		net-misc/openconnect:=
+		net-vpn/openconnect:=
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild
index 8c9baeb2e3e0..5783a52a471f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 	openconnect? (
 		$(add_qt_dep qtxml)
 		net-misc/networkmanager-openconnect
-		net-misc/openconnect:=
+		net-vpn/openconnect:=
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.9.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.9.3.ebuild
index 8c9baeb2e3e0..5783a52a471f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.9.3.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.9.3.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 	openconnect? (
 		$(add_qt_dep qtxml)
 		net-misc/networkmanager-openconnect
-		net-misc/openconnect:=
+		net-vpn/openconnect:=
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
index 3bd43e2b9430..a73f7bc1f8d9 100644
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/m2crypto[$PYTHON_USEDEP]
 	net-dns/unbound[python,$PYTHON_USEDEP]
 	virtual/python-dnspython[$PYTHON_USEDEP]
-	ipsec? ( net-misc/libreswan[dnssec] )
+	ipsec? ( net-vpn/libreswan[dnssec] )
 	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
 	ssh? ( net-misc/openssh )
 "
diff --git a/net-dns/hash-slinger/hash-slinger-2.7.ebuild b/net-dns/hash-slinger/hash-slinger-2.7.ebuild
index 3bd43e2b9430..a73f7bc1f8d9 100644
--- a/net-dns/hash-slinger/hash-slinger-2.7.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.7.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/m2crypto[$PYTHON_USEDEP]
 	net-dns/unbound[python,$PYTHON_USEDEP]
 	virtual/python-dnspython[$PYTHON_USEDEP]
-	ipsec? ( net-misc/libreswan[dnssec] )
+	ipsec? ( net-vpn/libreswan[dnssec] )
 	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
 	ssh? ( net-misc/openssh )
 "
diff --git a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
index 7abe8cd0dd50..aec310f408f8 100644
--- a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
+++ b/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="openconnect"
 CDEPEND="
 	>=dev-libs/glib-2.0:2
 	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-misc/openconnect-5.99 )
+	openconnect? ( >=net-vpn/openconnect-5.99 )
 "
 RDEPEND="${CDEPEND}
 	net-misc/connman
diff --git a/net-misc/connman-gtk/connman-gtk-1.0.ebuild b/net-misc/connman-gtk/connman-gtk-1.0.ebuild
index 73bc7b31b551..3b4065d4628f 100644
--- a/net-misc/connman-gtk/connman-gtk-1.0.ebuild
+++ b/net-misc/connman-gtk/connman-gtk-1.0.ebuild
@@ -17,7 +17,7 @@ IUSE="openconnect"
 CDEPEND="
 	>=dev-libs/glib-2.0:2
 	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-misc/openconnect-5.99 )
+	openconnect? ( >=net-vpn/openconnect-5.99 )
 "
 RDEPEND="${CDEPEND}
 	net-misc/connman
diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
index e50beaca39bd..dae310961eab 100644
--- a/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
+++ b/net-misc/connman-gtk/connman-gtk-1.1.1.ebuild
@@ -17,7 +17,7 @@ IUSE="openconnect"
 CDEPEND="
 	>=dev-libs/glib-2.0:2
 	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-misc/openconnect-5.99 )
+	openconnect? ( >=net-vpn/openconnect-5.99 )
 "
 RDEPEND="${CDEPEND}
 	net-misc/connman
diff --git a/net-misc/connman/connman-1.29.ebuild b/net-misc/connman/connman-1.29.ebuild
index d9434361de05..329ac55f1db8 100644
--- a/net-misc/connman/connman-1.29.ebuild
+++ b/net-misc/connman/connman-1.29.ebuild
@@ -19,11 +19,11 @@ RDEPEND=">=dev-libs/glib-2.16
 	bluetooth? ( net-wireless/bluez )
 	l2tp? ( net-dialup/xl2tpd )
 	ofono? ( net-misc/ofono )
-	openconnect? ( net-misc/openconnect )
-	openvpn? ( net-misc/openvpn )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
 	policykit? ( sys-auth/polkit )
 	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-misc/vpnc )
+	vpnc? ( net-vpn/vpnc )
 	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
 	wispr? ( net-libs/gnutls )"
 
diff --git a/net-misc/connman/connman-1.33-r1.ebuild b/net-misc/connman/connman-1.33-r1.ebuild
index acbf02f36403..5ed702794719 100644
--- a/net-misc/connman/connman-1.33-r1.ebuild
+++ b/net-misc/connman/connman-1.33-r1.ebuild
@@ -19,11 +19,11 @@ RDEPEND=">=dev-libs/glib-2.16
 	bluetooth? ( net-wireless/bluez )
 	l2tp? ( net-dialup/xl2tpd )
 	ofono? ( net-misc/ofono )
-	openconnect? ( net-misc/openconnect )
-	openvpn? ( net-misc/openvpn )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
 	policykit? ( sys-auth/polkit )
 	pptp? ( net-dialup/pptpclient )
-	vpnc? ( net-misc/vpnc )
+	vpnc? ( net-vpn/vpnc )
 	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
 	wispr? ( net-libs/gnutls )"
 
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 178258075700..8de394c42c57 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -14,11 +14,11 @@
 		<flag name="ethernet">Enable ethernet support.</flag>
 		<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
-		<flag name="openconnect">Use <pkg>net-misc/openconnect</pkg> for VPN support.</flag>
-		<flag name="openvpn">Use <pkg>net-misc/openvpn</pkg> for openvpn support.</flag>
+		<flag name="openconnect">Use <pkg>net-vpn/openconnect</pkg> for VPN support.</flag>
+		<flag name="openvpn">Use <pkg>net-vpn/openvpn</pkg> for openvpn support.</flag>
 		<flag name="pptp">Use <pkg>net-dialup/pptpclient</pkg> for PPTP VPN support.</flag>
 		<flag name="tools">Enable testing tools.</flag>
-		<flag name="vpnc">Use <pkg>net-misc/vpnc</pkg> for cisco VPN support.</flag>
+		<flag name="vpnc">Use <pkg>net-vpn/vpnc</pkg> for cisco VPN support.</flag>
 		<flag name="wispr">Enable support for WISPr hotspot logins.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild
index 2e725126b67d..8cae2a63466a 100644
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	>=net-misc/networkmanager-1.1:=
 	>=dev-libs/glib-2.32:2
 	net-dialup/ppp:=
-	>=net-misc/openfortivpn-1.2.0
+	>=net-vpn/openfortivpn-1.2.0
 	gtk? (
 		>=app-crypt/libsecret-0.18
 		>=gnome-extra/nm-applet-1.2.0
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
index 71a45e40a316..d8c3b6555b58 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/dbus-glib-0.74
 	dev-libs/libxml2:2
-	>=net-misc/openconnect-3.02:=
+	>=net-vpn/openconnect-3.02:=
 	gtk? (
 		>=app-crypt/libsecret-0.18
 		>=x11-libs/gtk+-3.4:3 )
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
index 6886f98acba3..dcd10236ee5c 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=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 )
+	|| ( net-misc/openswan net-vpn/libreswan )
 	gtk? (
 		app-crypt/libsecret
 		>=gnome-extra/nm-applet-0.9.10
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
index 6886f98acba3..dcd10236ee5c 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=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 )
+	|| ( net-misc/openswan net-vpn/libreswan )
 	gtk? (
 		app-crypt/libsecret
 		>=gnome-extra/nm-applet-0.9.10
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
index 9b727a1871c2..2d450d056704 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk test"
 RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=net-misc/networkmanager-1.2.0:=
-	>=net-misc/openvpn-2.1_rc9
+	>=net-vpn/openvpn-2.1_rc9
 	gtk? (
 		>=app-crypt/libsecret-0.18
 		>=gnome-extra/nm-applet-1.2.0
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild
index 20783d71854f..17fe3108517a 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk test"
 RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=net-misc/networkmanager-1.2.0:=
-	>=net-misc/openvpn-2.1_rc9
+	>=net-vpn/openvpn-2.1_rc9
 	gtk? (
 		>=app-crypt/libsecret-0.18
 		>=gnome-extra/nm-applet-1.2.0
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild
index 11b9b21c3c80..4ac018da3dcf 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild
@@ -18,7 +18,7 @@ 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
+	>=net-vpn/vpnc-0.5.3_p550
 	gtk? (
 		>=app-crypt/libsecret-0.18
 		>=gnome-extra/nm-applet-1.2.0
diff --git a/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild b/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild
index 9515d16b55b9..1e77248d32e5 100644
--- a/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild
+++ b/net-misc/openvpn-auth-ldap/openvpn-auth-ldap-2.0.4_pre20131110.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-RDEPEND="net-misc/openvpn
+RDEPEND="net-vpn/openvpn
 	net-nds/openldap"
 DEPEND="dev-util/re2c
 	sys-devel/gcc[objc]
diff --git a/net-misc/badvpn/Manifest b/net-vpn/badvpn/Manifest
index 7e8dc8fbecf9..7e8dc8fbecf9 100644
--- a/net-misc/badvpn/Manifest
+++ b/net-vpn/badvpn/Manifest
diff --git a/net-misc/badvpn/badvpn-1.999.126.ebuild b/net-vpn/badvpn/badvpn-1.999.126.ebuild
index 56e19578c566..56e19578c566 100644
--- a/net-misc/badvpn/badvpn-1.999.126.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.126.ebuild
diff --git a/net-misc/badvpn/badvpn-1.999.127.ebuild b/net-vpn/badvpn/badvpn-1.999.127.ebuild
index f8b68ce72105..f8b68ce72105 100644
--- a/net-misc/badvpn/badvpn-1.999.127.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.127.ebuild
diff --git a/net-misc/badvpn/badvpn-1.999.128.ebuild b/net-vpn/badvpn/badvpn-1.999.128.ebuild
index 879722ef31ba..879722ef31ba 100644
--- a/net-misc/badvpn/badvpn-1.999.128.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.128.ebuild
diff --git a/net-misc/badvpn/badvpn-1.999.129.ebuild b/net-vpn/badvpn/badvpn-1.999.129.ebuild
index 6183228f2ab0..6183228f2ab0 100644
--- a/net-misc/badvpn/badvpn-1.999.129.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.129.ebuild
diff --git a/net-misc/badvpn/badvpn-1.999.130.ebuild b/net-vpn/badvpn/badvpn-1.999.130.ebuild
index 8fc6bb47aa1e..8fc6bb47aa1e 100644
--- a/net-misc/badvpn/badvpn-1.999.130.ebuild
+++ b/net-vpn/badvpn/badvpn-1.999.130.ebuild
diff --git a/net-misc/badvpn/files/badvpn-1.999.127-ncd.init b/net-vpn/badvpn/files/badvpn-1.999.127-ncd.init
index 69f7ba45992a..69f7ba45992a 100644
--- a/net-misc/badvpn/files/badvpn-1.999.127-ncd.init
+++ b/net-vpn/badvpn/files/badvpn-1.999.127-ncd.init
diff --git a/net-misc/badvpn/files/badvpn-ncd.conf b/net-vpn/badvpn/files/badvpn-ncd.conf
index ad34c66f7ca3..ad34c66f7ca3 100644
--- a/net-misc/badvpn/files/badvpn-ncd.conf
+++ b/net-vpn/badvpn/files/badvpn-ncd.conf
diff --git a/net-misc/badvpn/files/badvpn-ncd.init b/net-vpn/badvpn/files/badvpn-ncd.init
index e408075128a4..e408075128a4 100644
--- a/net-misc/badvpn/files/badvpn-ncd.init
+++ b/net-vpn/badvpn/files/badvpn-ncd.init
diff --git a/net-misc/badvpn/files/badvpn-ncd.service b/net-vpn/badvpn/files/badvpn-ncd.service
index 6ca7aa515e00..6ca7aa515e00 100644
--- a/net-misc/badvpn/files/badvpn-ncd.service
+++ b/net-vpn/badvpn/files/badvpn-ncd.service
diff --git a/net-misc/badvpn/files/badvpn-server.conf b/net-vpn/badvpn/files/badvpn-server.conf
index ed5103d3d0ef..ed5103d3d0ef 100644
--- a/net-misc/badvpn/files/badvpn-server.conf
+++ b/net-vpn/badvpn/files/badvpn-server.conf
diff --git a/net-misc/badvpn/files/badvpn-server.init b/net-vpn/badvpn/files/badvpn-server.init
index 32ee7fefe33e..32ee7fefe33e 100644
--- a/net-misc/badvpn/files/badvpn-server.init
+++ b/net-vpn/badvpn/files/badvpn-server.init
diff --git a/net-misc/badvpn/metadata.xml b/net-vpn/badvpn/metadata.xml
index e2a7803599c3..e2a7803599c3 100644
--- a/net-misc/badvpn/metadata.xml
+++ b/net-vpn/badvpn/metadata.xml
diff --git a/net-misc/freelan/Manifest b/net-vpn/freelan/Manifest
index ea577c9f03db..ea577c9f03db 100644
--- a/net-misc/freelan/Manifest
+++ b/net-vpn/freelan/Manifest
diff --git a/net-misc/freelan/files/boost158.patch b/net-vpn/freelan/files/boost158.patch
index 7d5bb740f7bd..7d5bb740f7bd 100644
--- a/net-misc/freelan/files/boost158.patch
+++ b/net-vpn/freelan/files/boost158.patch
diff --git a/net-misc/freelan/files/boost163.patch b/net-vpn/freelan/files/boost163.patch
index 33636ef0d0b1..33636ef0d0b1 100644
--- a/net-misc/freelan/files/boost163.patch
+++ b/net-vpn/freelan/files/boost163.patch
diff --git a/net-misc/freelan/files/mf.patch b/net-vpn/freelan/files/mf.patch
index c7e169f4e8a7..c7e169f4e8a7 100644
--- a/net-misc/freelan/files/mf.patch
+++ b/net-vpn/freelan/files/mf.patch
diff --git a/net-misc/freelan/files/openrc/freelan.initd b/net-vpn/freelan/files/openrc/freelan.initd
index bab116d3db06..bab116d3db06 100755
--- a/net-misc/freelan/files/openrc/freelan.initd
+++ b/net-vpn/freelan/files/openrc/freelan.initd
diff --git a/net-misc/freelan/files/prefix.patch b/net-vpn/freelan/files/prefix.patch
index ac75e87fb1d1..ac75e87fb1d1 100644
--- a/net-misc/freelan/files/prefix.patch
+++ b/net-vpn/freelan/files/prefix.patch
diff --git a/net-misc/freelan/freelan-2.0.ebuild b/net-vpn/freelan/freelan-2.0.ebuild
index 477b6f862c32..477b6f862c32 100644
--- a/net-misc/freelan/freelan-2.0.ebuild
+++ b/net-vpn/freelan/freelan-2.0.ebuild
diff --git a/net-misc/freelan/metadata.xml b/net-vpn/freelan/metadata.xml
index d8d5cc720330..d8d5cc720330 100644
--- a/net-misc/freelan/metadata.xml
+++ b/net-vpn/freelan/metadata.xml
diff --git a/net-firewall/ipsec-tools/Manifest b/net-vpn/ipsec-tools/Manifest
index 4d3d873ae56b..4d3d873ae56b 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-vpn/ipsec-tools/Manifest
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch b/net-vpn/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
index 5c69bbb2fa61..5c69bbb2fa61 100644
--- a/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
+++ b/net-vpn/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch b/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
index 58f72e109c40..58f72e109c40 100644
--- a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
+++ b/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch b/net-vpn/ipsec-tools/files/ipsec-tools-def-psk.patch
index f351860a84e9..f351860a84e9 100644
--- a/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch
+++ b/net-vpn/ipsec-tools/files/ipsec-tools-def-psk.patch
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch b/net-vpn/ipsec-tools/files/ipsec-tools-include-vendoridh.patch
index 2e22c82db478..2e22c82db478 100644
--- a/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch
+++ b/net-vpn/ipsec-tools/files/ipsec-tools-include-vendoridh.patch
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools.conf b/net-vpn/ipsec-tools/files/ipsec-tools.conf
index bfff04af069a..bfff04af069a 100644
--- a/net-firewall/ipsec-tools/files/ipsec-tools.conf
+++ b/net-vpn/ipsec-tools/files/ipsec-tools.conf
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools.service b/net-vpn/ipsec-tools/files/ipsec-tools.service
index 0341aa7e4ed9..0341aa7e4ed9 100644
--- a/net-firewall/ipsec-tools/files/ipsec-tools.service
+++ b/net-vpn/ipsec-tools/files/ipsec-tools.service
diff --git a/net-firewall/ipsec-tools/files/psk.txt b/net-vpn/ipsec-tools/files/psk.txt
index 97f5180f5ae5..97f5180f5ae5 100644
--- a/net-firewall/ipsec-tools/files/psk.txt
+++ b/net-vpn/ipsec-tools/files/psk.txt
diff --git a/net-firewall/ipsec-tools/files/racoon.conf b/net-vpn/ipsec-tools/files/racoon.conf
index 2e9206db9506..2e9206db9506 100644
--- a/net-firewall/ipsec-tools/files/racoon.conf
+++ b/net-vpn/ipsec-tools/files/racoon.conf
diff --git a/net-firewall/ipsec-tools/files/racoon.conf.d-r2 b/net-vpn/ipsec-tools/files/racoon.conf.d-r2
index c592d3584967..c592d3584967 100644
--- a/net-firewall/ipsec-tools/files/racoon.conf.d-r2
+++ b/net-vpn/ipsec-tools/files/racoon.conf.d-r2
diff --git a/net-firewall/ipsec-tools/files/racoon.init.d-r3 b/net-vpn/ipsec-tools/files/racoon.init.d-r3
index 66e10bb84d42..66e10bb84d42 100644
--- a/net-firewall/ipsec-tools/files/racoon.init.d-r3
+++ b/net-vpn/ipsec-tools/files/racoon.init.d-r3
diff --git a/net-firewall/ipsec-tools/files/racoon.pam.d b/net-vpn/ipsec-tools/files/racoon.pam.d
index b801aaafa0f9..b801aaafa0f9 100644
--- a/net-firewall/ipsec-tools/files/racoon.pam.d
+++ b/net-vpn/ipsec-tools/files/racoon.pam.d
diff --git a/net-firewall/ipsec-tools/files/racoon.service b/net-vpn/ipsec-tools/files/racoon.service
index df7f1bb8f8c0..df7f1bb8f8c0 100644
--- a/net-firewall/ipsec-tools/files/racoon.service
+++ b/net-vpn/ipsec-tools/files/racoon.service
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
index e98bf283a11b..1fd2ccbcc73f 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
+++ b/net-vpn/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -35,13 +35,13 @@ pkg_preinst() {
 		ewarn
 		ewarn "\033[1;33m**************************************************\033[00m"
 		ewarn
-		if ! has_version "net-misc/strongswan" &&
+		if ! has_version "net-vpn/strongswan" &&
 			! has_version "net-misc/openswan" &&
-			! has_version "net-misc/libreswan"; then
+			! has_version "net-vpn/libreswan"; then
 			ewarn "We found an earlier version of ${PN} installed."
 			ewarn "As of ${PN}-0.8.0-r5, the old configuration file,"
 			ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid"
-			ewarn "a conflict with net-misc/strongswan; bug #436144.  We will"
+			ewarn "a conflict with net-vpn/strongswan; bug #436144.  We will"
 			ewarn "rename this file for you with this upgrade.  However, if"
 			ewarn "you later downgrade, you'll have to rename the file to"
 			ewarn "its orignal manually or change /etc/conf.d/racoon to point"
@@ -57,7 +57,7 @@ pkg_preinst() {
 			fi
 		else
 			ewarn "You had both an earlier version of ${PN} and"
-			ewarn "net-misc/strongswan installed.  I can't tell whether"
+			ewarn "net-vpn/strongswan installed.  I can't tell whether"
 			ewarn "the configuration file, ipsec.conf, belongs to one"
 			ewarn "package or the other due to a file conflict; bug #436144."
 			ewarn "The current version of ${PN} uses ipsec-tools.conf"
diff --git a/net-firewall/ipsec-tools/metadata.xml b/net-vpn/ipsec-tools/metadata.xml
index b9c2c832a41d..b9c2c832a41d 100644
--- a/net-firewall/ipsec-tools/metadata.xml
+++ b/net-vpn/ipsec-tools/metadata.xml
diff --git a/net-misc/kvpnc/Manifest b/net-vpn/kvpnc/Manifest
index ec31aecf928d..ec31aecf928d 100644
--- a/net-misc/kvpnc/Manifest
+++ b/net-vpn/kvpnc/Manifest
diff --git a/net-misc/kvpnc/files/kvpnc-0.9.6a-gcc47.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch
index db59b5baaf86..db59b5baaf86 100644
--- a/net-misc/kvpnc/files/kvpnc-0.9.6a-gcc47.patch
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch
diff --git a/net-misc/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch
index 1413bccc97e1..1413bccc97e1 100644
--- a/net-misc/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch
diff --git a/net-misc/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch
index 4e8b4d6d92b7..4e8b4d6d92b7 100644
--- a/net-misc/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch
diff --git a/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild
index 88172fb18463..88172fb18463 100644
--- a/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild
+++ b/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild
diff --git a/net-misc/kvpnc/metadata.xml b/net-vpn/kvpnc/metadata.xml
index bddd8b4a2053..bddd8b4a2053 100644
--- a/net-misc/kvpnc/metadata.xml
+++ b/net-vpn/kvpnc/metadata.xml
diff --git a/net-misc/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 39cc9c8a0701..39cc9c8a0701 100644
--- a/net-misc/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
diff --git a/net-misc/libreswan/libreswan-3.18.ebuild b/net-vpn/libreswan/libreswan-3.18.ebuild
index c88e1ade3961..c7115661250f 100644
--- a/net-misc/libreswan/libreswan-3.18.ebuild
+++ b/net-vpn/libreswan/libreswan-3.18.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-libs/nss[utils(+)]
 	sys-apps/iproute2
 	!net-misc/openswan
-	!net-misc/strongswan
+	!net-vpn/strongswan
 "
 
 usetf() {
diff --git a/net-misc/libreswan/libreswan-9999.ebuild b/net-vpn/libreswan/libreswan-9999.ebuild
index aa259de5dc01..ac095ad3197a 100644
--- a/net-misc/libreswan/libreswan-9999.ebuild
+++ b/net-vpn/libreswan/libreswan-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-libs/nss[utils(+)]
 	sys-apps/iproute2
 	!net-misc/openswan
-	!net-misc/strongswan
+	!net-vpn/strongswan
 "
 
 usetf() {
diff --git a/net-misc/libreswan/metadata.xml b/net-vpn/libreswan/metadata.xml
index 258e65f32b14..258e65f32b14 100644
--- a/net-misc/libreswan/metadata.xml
+++ b/net-vpn/libreswan/metadata.xml
diff --git a/net-misc/logmein-hamachi/Manifest b/net-vpn/logmein-hamachi/Manifest
index 8c17adedb56f..8c17adedb56f 100644
--- a/net-misc/logmein-hamachi/Manifest
+++ b/net-vpn/logmein-hamachi/Manifest
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.confd b/net-vpn/logmein-hamachi/files/logmein-hamachi.confd
index 73523ee3e3de..73523ee3e3de 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.confd
+++ b/net-vpn/logmein-hamachi/files/logmein-hamachi.confd
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-vpn/logmein-hamachi/files/logmein-hamachi.initd
index 4bff7452ebcc..4bff7452ebcc 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.initd
+++ b/net-vpn/logmein-hamachi/files/logmein-hamachi.initd
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.service b/net-vpn/logmein-hamachi/files/logmein-hamachi.service
index 609447e16373..609447e16373 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.service
+++ b/net-vpn/logmein-hamachi/files/logmein-hamachi.service
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild b/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild
index 719f37c44aae..719f37c44aae 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild
+++ b/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild b/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild
index d340b702289f..d340b702289f 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild
+++ b/net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild
diff --git a/net-misc/logmein-hamachi/metadata.xml b/net-vpn/logmein-hamachi/metadata.xml
index 14dde2333ec1..14dde2333ec1 100644
--- a/net-misc/logmein-hamachi/metadata.xml
+++ b/net-vpn/logmein-hamachi/metadata.xml
diff --git a/net-vpn/metadata.xml b/net-vpn/metadata.xml
new file mode 100644
index 000000000000..b5449d0bcb22
--- /dev/null
+++ b/net-vpn/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-vpn category contains packages related to virtual private
+		networks and tunneling utilities.
+	</longdescription>
+</catmetadata>
+
diff --git a/net-misc/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 5a16aa54f257..5a16aa54f257 100644
--- a/net-misc/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
diff --git a/net-misc/openconnect/files/openconnect-7.07-libressl.patch b/net-vpn/openconnect/files/openconnect-7.07-libressl.patch
index 4f9d34bceee1..4f9d34bceee1 100644
--- a/net-misc/openconnect/files/openconnect-7.07-libressl.patch
+++ b/net-vpn/openconnect/files/openconnect-7.07-libressl.patch
diff --git a/net-misc/openconnect/files/openconnect-7.07-mimic-pulse-client.patch b/net-vpn/openconnect/files/openconnect-7.07-mimic-pulse-client.patch
index 5cfeca6ec52d..5cfeca6ec52d 100644
--- a/net-misc/openconnect/files/openconnect-7.07-mimic-pulse-client.patch
+++ b/net-vpn/openconnect/files/openconnect-7.07-mimic-pulse-client.patch
diff --git a/net-misc/openconnect/files/openconnect.conf.in b/net-vpn/openconnect/files/openconnect.conf.in
index 53b14e61378e..53b14e61378e 100644
--- a/net-misc/openconnect/files/openconnect.conf.in
+++ b/net-vpn/openconnect/files/openconnect.conf.in
diff --git a/net-misc/openconnect/files/openconnect.init.in b/net-vpn/openconnect/files/openconnect.init.in
index c4497956d8a3..c4497956d8a3 100644
--- a/net-misc/openconnect/files/openconnect.init.in
+++ b/net-vpn/openconnect/files/openconnect.init.in
diff --git a/net-misc/openconnect/files/openconnect.init.in-r4 b/net-vpn/openconnect/files/openconnect.init.in-r4
index 040edc76f637..040edc76f637 100644
--- a/net-misc/openconnect/files/openconnect.init.in-r4
+++ b/net-vpn/openconnect/files/openconnect.init.in-r4
diff --git a/net-misc/openconnect/files/openconnect.logrotate b/net-vpn/openconnect/files/openconnect.logrotate
index 0455e6845b28..0455e6845b28 100644
--- a/net-misc/openconnect/files/openconnect.logrotate
+++ b/net-vpn/openconnect/files/openconnect.logrotate
diff --git a/net-misc/openconnect/metadata.xml b/net-vpn/openconnect/metadata.xml
index 392587d6e70e..392587d6e70e 100644
--- a/net-misc/openconnect/metadata.xml
+++ b/net-vpn/openconnect/metadata.xml
diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-vpn/openconnect/openconnect-7.06-r1.ebuild
index 05a2ee85629a..05a2ee85629a 100644
--- a/net-misc/openconnect/openconnect-7.06-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-7.06-r1.ebuild
diff --git a/net-misc/openconnect/openconnect-7.06-r4.ebuild b/net-vpn/openconnect/openconnect-7.06-r4.ebuild
index 8e558096c0e6..8e558096c0e6 100644
--- a/net-misc/openconnect/openconnect-7.06-r4.ebuild
+++ b/net-vpn/openconnect/openconnect-7.06-r4.ebuild
diff --git a/net-misc/openconnect/openconnect-7.06_p20160614.ebuild b/net-vpn/openconnect/openconnect-7.06_p20160614.ebuild
index 8702eba983c5..8702eba983c5 100644
--- a/net-misc/openconnect/openconnect-7.06_p20160614.ebuild
+++ b/net-vpn/openconnect/openconnect-7.06_p20160614.ebuild
diff --git a/net-misc/openconnect/openconnect-7.07-r1.ebuild b/net-vpn/openconnect/openconnect-7.07-r1.ebuild
index fac6e34d7ead..fac6e34d7ead 100644
--- a/net-misc/openconnect/openconnect-7.07-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-7.07-r1.ebuild
diff --git a/net-misc/openconnect/openconnect-7.07-r2.ebuild b/net-vpn/openconnect/openconnect-7.07-r2.ebuild
index 5c8982b1bca5..5c8982b1bca5 100644
--- a/net-misc/openconnect/openconnect-7.07-r2.ebuild
+++ b/net-vpn/openconnect/openconnect-7.07-r2.ebuild
diff --git a/net-misc/openconnect/openconnect-7.07-r3.ebuild b/net-vpn/openconnect/openconnect-7.07-r3.ebuild
index f0b04fd6c339..f0b04fd6c339 100644
--- a/net-misc/openconnect/openconnect-7.07-r3.ebuild
+++ b/net-vpn/openconnect/openconnect-7.07-r3.ebuild
diff --git a/net-misc/openconnect/openconnect-7.08.ebuild b/net-vpn/openconnect/openconnect-7.08.ebuild
index bb489f015356..bb489f015356 100644
--- a/net-misc/openconnect/openconnect-7.08.ebuild
+++ b/net-vpn/openconnect/openconnect-7.08.ebuild
diff --git a/net-misc/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index bb489f015356..bb489f015356 100644
--- a/net-misc/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
diff --git a/net-misc/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 0777d3289094..0777d3289094 100644
--- a/net-misc/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
diff --git a/net-misc/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml
index b7fa921dff8f..b7fa921dff8f 100644
--- a/net-misc/openfortivpn/metadata.xml
+++ b/net-vpn/openfortivpn/metadata.xml
diff --git a/net-misc/openfortivpn/openfortivpn-1.3.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.3.0.ebuild
index 0027219ec510..0027219ec510 100644
--- a/net-misc/openfortivpn/openfortivpn-1.3.0.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.3.0.ebuild
diff --git a/net-misc/openvpn/Manifest b/net-vpn/openvpn/Manifest
index e7602758a309..e7602758a309 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
diff --git a/net-misc/openvpn/files/down.sh b/net-vpn/openvpn/files/down.sh
index 1c70db0ec653..1c70db0ec653 100644
--- a/net-misc/openvpn/files/down.sh
+++ b/net-vpn/openvpn/files/down.sh
diff --git a/net-misc/openvpn/files/openvpn-2.1.conf b/net-vpn/openvpn/files/openvpn-2.1.conf
index 72510c34aed3..72510c34aed3 100644
--- a/net-misc/openvpn/files/openvpn-2.1.conf
+++ b/net-vpn/openvpn/files/openvpn-2.1.conf
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-vpn/openvpn/files/openvpn-2.1.init
index b42aa13d20de..b42aa13d20de 100644
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ b/net-vpn/openvpn/files/openvpn-2.1.init
diff --git a/net-misc/openvpn/files/openvpn-2.4.0-fix-libressl.patch b/net-vpn/openvpn/files/openvpn-2.4.0-fix-libressl.patch
index 4c3aca5d5a92..4c3aca5d5a92 100644
--- a/net-misc/openvpn/files/openvpn-2.4.0-fix-libressl.patch
+++ b/net-vpn/openvpn/files/openvpn-2.4.0-fix-libressl.patch
diff --git a/net-misc/openvpn/files/openvpn-external-cmocka.patch b/net-vpn/openvpn/files/openvpn-external-cmocka.patch
index eecc5076b4e8..eecc5076b4e8 100644
--- a/net-misc/openvpn/files/openvpn-external-cmocka.patch
+++ b/net-vpn/openvpn/files/openvpn-external-cmocka.patch
diff --git a/net-misc/openvpn/files/openvpn.tmpfile b/net-vpn/openvpn/files/openvpn.tmpfile
index d5fca71a00a0..d5fca71a00a0 100644
--- a/net-misc/openvpn/files/openvpn.tmpfile
+++ b/net-vpn/openvpn/files/openvpn.tmpfile
diff --git a/net-misc/openvpn/files/up.sh b/net-vpn/openvpn/files/up.sh
index 6ce82d6113cd..6ce82d6113cd 100644
--- a/net-misc/openvpn/files/up.sh
+++ b/net-vpn/openvpn/files/up.sh
diff --git a/net-misc/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml
index d6c211a689c5..d6c211a689c5 100644
--- a/net-misc/openvpn/metadata.xml
+++ b/net-vpn/openvpn/metadata.xml
diff --git a/net-misc/openvpn/openvpn-2.3.12.ebuild b/net-vpn/openvpn/openvpn-2.3.12.ebuild
index a537ed2b3032..a537ed2b3032 100644
--- a/net-misc/openvpn/openvpn-2.3.12.ebuild
+++ b/net-vpn/openvpn/openvpn-2.3.12.ebuild
diff --git a/net-misc/openvpn/openvpn-2.3.14.ebuild b/net-vpn/openvpn/openvpn-2.3.14.ebuild
index 479a497b5f49..479a497b5f49 100644
--- a/net-misc/openvpn/openvpn-2.3.14.ebuild
+++ b/net-vpn/openvpn/openvpn-2.3.14.ebuild
diff --git a/net-misc/openvpn/openvpn-2.4.0-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.0-r1.ebuild
index 74666528ab2b..74666528ab2b 100644
--- a/net-misc/openvpn/openvpn-2.4.0-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.0-r1.ebuild
diff --git a/net-misc/openvpn/openvpn-2.4.0.ebuild b/net-vpn/openvpn/openvpn-2.4.0.ebuild
index 2e088f6891d6..2e088f6891d6 100644
--- a/net-misc/openvpn/openvpn-2.4.0.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.0.ebuild
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 398cf8fad2ad..398cf8fad2ad 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
diff --git a/net-misc/peervpn/Manifest b/net-vpn/peervpn/Manifest
index 0f3a680efa4f..0f3a680efa4f 100644
--- a/net-misc/peervpn/Manifest
+++ b/net-vpn/peervpn/Manifest
diff --git a/net-misc/peervpn/files/peervpn.initd b/net-vpn/peervpn/files/peervpn.initd
index b02458ae16ca..b02458ae16ca 100644
--- a/net-misc/peervpn/files/peervpn.initd
+++ b/net-vpn/peervpn/files/peervpn.initd
diff --git a/net-misc/peervpn/files/peervpn.logrotated b/net-vpn/peervpn/files/peervpn.logrotated
index e99669c91358..e99669c91358 100644
--- a/net-misc/peervpn/files/peervpn.logrotated
+++ b/net-vpn/peervpn/files/peervpn.logrotated
diff --git a/net-misc/peervpn/files/peervpn.service b/net-vpn/peervpn/files/peervpn.service
index 13c5310f517b..13c5310f517b 100644
--- a/net-misc/peervpn/files/peervpn.service
+++ b/net-vpn/peervpn/files/peervpn.service
diff --git a/net-misc/peervpn/metadata.xml b/net-vpn/peervpn/metadata.xml
index d4216eaa7140..d4216eaa7140 100644
--- a/net-misc/peervpn/metadata.xml
+++ b/net-vpn/peervpn/metadata.xml
diff --git a/net-misc/peervpn/peervpn-0.044-r2.ebuild b/net-vpn/peervpn/peervpn-0.044-r2.ebuild
index 47b338de404b..47b338de404b 100644
--- a/net-misc/peervpn/peervpn-0.044-r2.ebuild
+++ b/net-vpn/peervpn/peervpn-0.044-r2.ebuild
diff --git a/net-misc/strongswan/Manifest b/net-vpn/strongswan/Manifest
index a5dbdc5ac99f..a5dbdc5ac99f 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
diff --git a/net-misc/strongswan/files/ipsec b/net-vpn/strongswan/files/ipsec
index ac942a926366..ac942a926366 100644
--- a/net-misc/strongswan/files/ipsec
+++ b/net-vpn/strongswan/files/ipsec
diff --git a/net-misc/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 9e6793b9791f..9e6793b9791f 100644
--- a/net-misc/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
diff --git a/net-misc/strongswan/strongswan-5.3.4.ebuild b/net-vpn/strongswan/strongswan-5.3.4.ebuild
index 38ea3d9ea98f..0007796d7ebb 100644
--- a/net-misc/strongswan/strongswan-5.3.4.ebuild
+++ b/net-vpn/strongswan/strongswan-5.3.4.ebuild
@@ -41,7 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	sys-apps/iproute2
-	!net-misc/libreswan
+	!net-vpn/libreswan
 	selinux? ( sec-policy/selinux-ipsec )"
 
 UGID="ipsec"
@@ -208,10 +208,10 @@ src_install() {
 }
 
 pkg_preinst() {
-	has_version "<net-misc/strongswan-4.3.6-r1"
+	has_version "<net-vpn/strongswan-4.3.6-r1"
 	upgrade_from_leq_4_3_6=$(( !$? ))
 
-	has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
 	previous_4_3_6_with_caps=$(( !$? ))
 }
 
diff --git a/net-misc/strongswan/strongswan-5.5.1.ebuild b/net-vpn/strongswan/strongswan-5.5.1.ebuild
index 5521f3415d6d..0b27b2034d3a 100644
--- a/net-misc/strongswan/strongswan-5.5.1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.5.1.ebuild
@@ -41,7 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	sys-apps/iproute2
-	!net-misc/libreswan
+	!net-vpn/libreswan
 	selinux? ( sec-policy/selinux-ipsec )"
 
 UGID="ipsec"
@@ -208,10 +208,10 @@ src_install() {
 }
 
 pkg_preinst() {
-	has_version "<net-misc/strongswan-4.3.6-r1"
+	has_version "<net-vpn/strongswan-4.3.6-r1"
 	upgrade_from_leq_4_3_6=$(( !$? ))
 
-	has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
 	previous_4_3_6_with_caps=$(( !$? ))
 }
 
diff --git a/net-misc/tinc/Manifest b/net-vpn/tinc/Manifest
index c760c97d47a8..c760c97d47a8 100644
--- a/net-misc/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
diff --git a/net-misc/tinc/files/tinc-1.1-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
index 519677dd5034..519677dd5034 100644
--- a/net-misc/tinc/files/tinc-1.1-fix-paths.patch
+++ b/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
diff --git a/net-misc/tinc/files/tinc.networks b/net-vpn/tinc/files/tinc.networks
index e1844ce2ba24..e1844ce2ba24 100644
--- a/net-misc/tinc/files/tinc.networks
+++ b/net-vpn/tinc/files/tinc.networks
diff --git a/net-misc/tinc/files/tincd-r1 b/net-vpn/tinc/files/tincd-r1
index ecfb24a6a64f..ecfb24a6a64f 100644
--- a/net-misc/tinc/files/tincd-r1
+++ b/net-vpn/tinc/files/tincd-r1
diff --git a/net-misc/tinc/files/tincd-r2 b/net-vpn/tinc/files/tincd-r2
index 55728bec2c78..55728bec2c78 100644
--- a/net-misc/tinc/files/tincd-r2
+++ b/net-vpn/tinc/files/tincd-r2
diff --git a/net-misc/tinc/files/tincd.conf b/net-vpn/tinc/files/tincd.conf
index cedca60c42ad..cedca60c42ad 100644
--- a/net-misc/tinc/files/tincd.conf
+++ b/net-vpn/tinc/files/tincd.conf
diff --git a/net-misc/tinc/files/tincd_at.service b/net-vpn/tinc/files/tincd_at.service
index 71f358a39d95..71f358a39d95 100644
--- a/net-misc/tinc/files/tincd_at.service
+++ b/net-vpn/tinc/files/tincd_at.service
diff --git a/net-misc/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index 02dd537c6e68..02dd537c6e68 100644
--- a/net-misc/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
diff --git a/net-misc/tinc/tinc-1.0.29.ebuild b/net-vpn/tinc/tinc-1.0.29.ebuild
index 3a34c96cb985..3a34c96cb985 100644
--- a/net-misc/tinc/tinc-1.0.29.ebuild
+++ b/net-vpn/tinc/tinc-1.0.29.ebuild
diff --git a/net-misc/tinc/tinc-1.0.30.ebuild b/net-vpn/tinc/tinc-1.0.30.ebuild
index 3a34c96cb985..3a34c96cb985 100644
--- a/net-misc/tinc/tinc-1.0.30.ebuild
+++ b/net-vpn/tinc/tinc-1.0.30.ebuild
diff --git a/net-misc/tinc/tinc-1.0.31.ebuild b/net-vpn/tinc/tinc-1.0.31.ebuild
index c8adaa0c7d3e..c8adaa0c7d3e 100644
--- a/net-misc/tinc/tinc-1.0.31.ebuild
+++ b/net-vpn/tinc/tinc-1.0.31.ebuild
diff --git a/net-misc/tinc/tinc-1.1_pre14-r3.ebuild b/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
index ccc843d8305a..ccc843d8305a 100644
--- a/net-misc/tinc/tinc-1.1_pre14-r3.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
diff --git a/net-misc/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 36e1f433dacd..36e1f433dacd 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
diff --git a/net-misc/vpnc/files/vpnc-3.init b/net-vpn/vpnc/files/vpnc-3.init
index f76538f1630e..f76538f1630e 100644
--- a/net-misc/vpnc/files/vpnc-3.init
+++ b/net-vpn/vpnc/files/vpnc-3.init
diff --git a/net-misc/vpnc/files/vpnc-tmpfiles.conf b/net-vpn/vpnc/files/vpnc-tmpfiles.conf
index 67224ac3ef2d..67224ac3ef2d 100644
--- a/net-misc/vpnc/files/vpnc-tmpfiles.conf
+++ b/net-vpn/vpnc/files/vpnc-tmpfiles.conf
diff --git a/net-misc/vpnc/files/vpnc.confd b/net-vpn/vpnc/files/vpnc.confd
index 62789bd407ec..62789bd407ec 100644
--- a/net-misc/vpnc/files/vpnc.confd
+++ b/net-vpn/vpnc/files/vpnc.confd
diff --git a/net-misc/vpnc/files/vpnc.service b/net-vpn/vpnc/files/vpnc.service
index ce1e3683f4ec..ce1e3683f4ec 100644
--- a/net-misc/vpnc/files/vpnc.service
+++ b/net-vpn/vpnc/files/vpnc.service
diff --git a/net-misc/vpnc/metadata.xml b/net-vpn/vpnc/metadata.xml
index 2bec55dcc3ff..2bec55dcc3ff 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-vpn/vpnc/metadata.xml
diff --git a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
index 7b4fb313fd26..7b4fb313fd26 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
diff --git a/net-misc/vpncwatch/Manifest b/net-vpn/vpncwatch/Manifest
index b9db5ef429b6..b9db5ef429b6 100644
--- a/net-misc/vpncwatch/Manifest
+++ b/net-vpn/vpncwatch/Manifest
diff --git a/net-misc/vpncwatch/files/vpncwatch-1.8-Makefile.patch b/net-vpn/vpncwatch/files/vpncwatch-1.8-Makefile.patch
index cab556c95352..cab556c95352 100644
--- a/net-misc/vpncwatch/files/vpncwatch-1.8-Makefile.patch
+++ b/net-vpn/vpncwatch/files/vpncwatch-1.8-Makefile.patch
diff --git a/net-misc/vpncwatch/files/vpncwatch-1.8.1-Makefile.patch b/net-vpn/vpncwatch/files/vpncwatch-1.8.1-Makefile.patch
index 1f982ee76a3f..1f982ee76a3f 100644
--- a/net-misc/vpncwatch/files/vpncwatch-1.8.1-Makefile.patch
+++ b/net-vpn/vpncwatch/files/vpncwatch-1.8.1-Makefile.patch
diff --git a/net-misc/vpncwatch/metadata.xml b/net-vpn/vpncwatch/metadata.xml
index f126bf28f5b5..f126bf28f5b5 100644
--- a/net-misc/vpncwatch/metadata.xml
+++ b/net-vpn/vpncwatch/metadata.xml
diff --git a/net-misc/vpncwatch/vpncwatch-1.8.1.ebuild b/net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
index da2a4ef2fe70..fc293fa8e4e3 100644
--- a/net-misc/vpncwatch/vpncwatch-1.8.1.ebuild
+++ b/net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-misc/vpnc"
+RDEPEND="net-vpn/vpnc"
 
 src_prepare() {
 	epatch \
diff --git a/net-misc/vpncwatch/vpncwatch-1.8.ebuild b/net-vpn/vpncwatch/vpncwatch-1.8.ebuild
index 74769b40a1f3..d758a74b4f85 100644
--- a/net-misc/vpncwatch/vpncwatch-1.8.ebuild
+++ b/net-vpn/vpncwatch/vpncwatch-1.8.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-misc/vpnc"
+RDEPEND="net-vpn/vpnc"
 
 src_prepare() {
 	epatch \
diff --git a/net-misc/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 726997c48e06..726997c48e06 100644
--- a/net-misc/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
diff --git a/net-misc/wireguard/files/wireguard-openrc.sh b/net-vpn/wireguard/files/wireguard-openrc.sh
index 9c53ef0ffa72..9c53ef0ffa72 100644
--- a/net-misc/wireguard/files/wireguard-openrc.sh
+++ b/net-vpn/wireguard/files/wireguard-openrc.sh
diff --git a/net-misc/wireguard/metadata.xml b/net-vpn/wireguard/metadata.xml
index d5c30b1930c0..d5c30b1930c0 100644
--- a/net-misc/wireguard/metadata.xml
+++ b/net-vpn/wireguard/metadata.xml
diff --git a/net-misc/wireguard/wireguard-0.0.20170223.ebuild b/net-vpn/wireguard/wireguard-0.0.20170223.ebuild
index e19eabcaa9ce..e19eabcaa9ce 100644
--- a/net-misc/wireguard/wireguard-0.0.20170223.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20170223.ebuild
diff --git a/net-misc/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
index e19eabcaa9ce..e19eabcaa9ce 100644
--- a/net-misc/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 6166543d8010..624ee6b91178 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -168,7 +168,7 @@ www-client/chromium widevine
 
 # Markus Meier <maekke@gentoo.org> (17 Jan 2015)
 # Unkeyworded deps, bug #536226
-net-misc/strongswan strongswan_plugins_unbound
+net-vpn/strongswan strongswan_plugins_unbound
 
 # Markus Meier <maekke@gentoo.org> (17 Jan 2015)
 # Unkeyworded deps, bug #533404
@@ -363,7 +363,7 @@ media-gfx/pstoedit emf
 
 # Rick Farina <zerochaos@gentoo.org> (05 Feb 2013)
 # masking all stable packages with java use flag
-net-misc/openconnect java
+net-vpn/openconnect java
 dev-util/oprofile java
 =dev-db/qdbm-1.8.78-r1 java
 dev-libs/beecrypt java
@@ -441,7 +441,7 @@ app-admin/syslog-ng json
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
-net-misc/tinc vde
+net-vpn/tinc vde
 
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # The QML (V4) and JSC JITs are supported only on amd64/arm/x86,
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 5d17187bb1e4..b7e56d497e26 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -222,7 +222,7 @@ net-libs/webkit-gtk -jit
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
-net-misc/tinc vde
+net-vpn/tinc vde
 
 # Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
 # mask conntrack USE flag for dnsmasq as dep is not keyworded
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 2bef2dd72250..3bcfaf5aa713 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -207,7 +207,7 @@ media-libs/phonon zeitgeist
 
 # Dirkjan Ochtman <djc@gentoo.org> (3 May 2013)
 # depends on net-libs/polarssl
->=net-misc/openvpn-2.3.1 polarssl
+>=net-vpn/openvpn-2.3.1 polarssl
 
 # Gilles Dartiguelongue <eva@gentoo.org> (1 Apr 2013)
 # missing keyword on media-libs/tremor, bug #453200
diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
index dc2ea7002dcb..3d77f7882570 100644
--- a/profiles/arch/nios2/package.use.mask
+++ b/profiles/arch/nios2/package.use.mask
@@ -169,7 +169,7 @@ net-libs/webkit-gtk -jit
 # Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
-net-misc/tinc vde
+net-vpn/tinc vde
 
 # Tobias Klausmann <klausman@gentoo.org> (02 Nov 2011)
 # libpcre jit is not supported on alpha
diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask
index 9ef38223029b..dbb8669b7204 100644
--- a/profiles/arch/sh/package.use.mask
+++ b/profiles/arch/sh/package.use.mask
@@ -45,7 +45,7 @@ media-libs/mesa gallium
 
 # Alon Bar-Lev <alonbl@gentoo.org> (24 Jan 2007)
 # pkcs11-helper is not keyworded
-net-misc/openvpn pkcs11
+net-vpn/openvpn pkcs11
 
 # Christoph Mende <angelos@gentoo.org> (14 May 2008)
 # media-sound/wavpack is not keyworded
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 9805a381deb7..ba2e61cfb3e2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -356,7 +356,7 @@ media-video/rtmpdump polarssl
 
 # Julian Ospald <hasufell@gentoo.org> (06 Apr 2014)
 # broken wrt #501582
-<net-misc/openvpn-9999 polarssl
+<net-vpn/openvpn-9999 polarssl
 
 # Manuel Rüger <mrueg@gentoo.org> (07 Mar 2014)
 # Mask ruby18-only compatible flags
diff --git a/profiles/categories b/profiles/categories
index 3d47d6ca40a0..b830c74deb71 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -113,6 +113,7 @@ net-p2p
 net-print
 net-proxy
 net-voip
+net-vpn
 net-wireless
 perl-core
 ros-meta
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 94a0bd3d6d7e..1dbd6a3a3a05 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -26,7 +26,7 @@ net-analyzer/tcpdump drop-root
 app-text/asciidoc test highlight
 
 # iproute2 - linux only
-net-misc/openvpn iproute2
+net-vpn/openvpn iproute2
 
 app-admin/sshguard -ipfilter
 media-video/ffmpeg ieee1394 iec61883
diff --git a/profiles/default/linux/sparc/13.0/package.use.mask b/profiles/default/linux/sparc/13.0/package.use.mask
index 4f542d11e8b7..5762f25bece2 100644
--- a/profiles/default/linux/sparc/13.0/package.use.mask
+++ b/profiles/default/linux/sparc/13.0/package.use.mask
@@ -11,4 +11,4 @@ mail-mta/exim redis
 #
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for sparc
-net-misc/tinc vde
+net-vpn/tinc vde
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 8f3d66c6d831..79b847c61ce5 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -4,3 +4,19 @@ move dev-libs/uchardet app-i18n/uchardet
 move net-libs/libkgapi kde-apps/libkgapi
 slotmove =dev-ruby/typhoeus-1.1.2 0 1
 move app-cdr/k3b kde-apps/k3b
+move net-misc/badvpn net-vpn/badvpn
+move net-misc/freelan net-vpn/freelan
+move net-firewall/ipsec-tools net-vpn/ipsec-tools
+move net-misc/kvpnc net-vpn/kvpnc
+move net-misc/libreswan net-vpn/libreswan
+move net-misc/logmein-hamachi net-vpn/logmein-hamachi
+move net-misc/metadata.xml net-vpn/metadata.xml
+move net-misc/openconnect net-vpn/openconnect
+move net-misc/openfortivpn net-vpn/openfortivpn
+move net-misc/openvpn net-vpn/openvpn
+move net-misc/peervpn net-vpn/peervpn
+move net-misc/strongswan net-vpn/strongswan
+move net-misc/tinc net-vpn/tinc
+move net-misc/vpnc net-vpn/vpnc
+move net-misc/vpncwatch net-vpn/vpncwatch
+move net-misc/wireguard net-vpn/wireguard
diff --git a/sys-apps/openrc/openrc-0.21.7.ebuild b/sys-apps/openrc/openrc-0.21.7.ebuild
index 2cfa4a333d27..2bc11b9e538c 100644
--- a/sys-apps/openrc/openrc-0.21.7.ebuild
+++ b/sys-apps/openrc/openrc-0.21.7.ebuild
@@ -313,7 +313,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-0.22.4.ebuild b/sys-apps/openrc/openrc-0.22.4.ebuild
index 1b226b2f0080..31d979641e92 100644
--- a/sys-apps/openrc/openrc-0.22.4.ebuild
+++ b/sys-apps/openrc/openrc-0.22.4.ebuild
@@ -313,7 +313,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-0.23.2.ebuild b/sys-apps/openrc/openrc-0.23.2.ebuild
index caa60493d148..015a422a623d 100644
--- a/sys-apps/openrc/openrc-0.23.2.ebuild
+++ b/sys-apps/openrc/openrc-0.23.2.ebuild
@@ -315,7 +315,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-0.24.1.ebuild b/sys-apps/openrc/openrc-0.24.1.ebuild
index 7a8b5e860c2c..1ce8145c5005 100644
--- a/sys-apps/openrc/openrc-0.24.1.ebuild
+++ b/sys-apps/openrc/openrc-0.24.1.ebuild
@@ -313,7 +313,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 7a8b5e860c2c..1ce8145c5005 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -313,7 +313,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."