commit: 7f68c86d93d5f69d775bceb3941b3a3b46672eb1
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 13:49:18 2017 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 13:56:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f68c86d
Move VPN packages into net-vpn/
app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild | 2 +-
app-crypt/easy-rsa/easy-rsa-2.2.2.ebuild | 2 +-
app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild | 2 +-
kde-plasma/plasma-nm/plasma-nm-5.8.5.ebuild | 2 +-
kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild | 2 +-
kde-plasma/plasma-nm/plasma-nm-5.9.3.ebuild | 2 +-
net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild | 2 +-
net-dns/hash-slinger/hash-slinger-2.7.ebuild | 2 +-
net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild | 2 +-
net-misc/connman-gtk/connman-gtk-1.0.ebuild | 2 +-
net-misc/connman-gtk/connman-gtk-1.1.1.ebuild | 2 +-
net-misc/connman/connman-1.29.ebuild | 6 +++---
net-misc/connman/connman-1.33-r1.ebuild | 6 +++---
net-misc/connman/metadata.xml | 6 +++---
.../networkmanager-fortisslvpn-1.2.2.ebuild | 2 +-
.../networkmanager-openconnect-1.2.4.ebuild | 2 +-
.../networkmanager-openswan-1.0.6.ebuild | 2 +-
.../networkmanager-openswan-1.0.8.ebuild | 2 +-
.../networkmanager-openvpn-1.2.6.ebuild | 2 +-
.../networkmanager-openvpn-1.2.8.ebuild | 2 +-
.../networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild | 2 +-
.../openvpn-auth-ldap-2.0.4_pre20131110.ebuild | 2 +-
{net-misc => net-vpn}/badvpn/Manifest | 0
{net-misc => net-vpn}/badvpn/badvpn-1.999.126.ebuild | 0
{net-misc => net-vpn}/badvpn/badvpn-1.999.127.ebuild | 0
{net-misc => net-vpn}/badvpn/badvpn-1.999.128.ebuild | 0
{net-misc => net-vpn}/badvpn/badvpn-1.999.129.ebuild | 0
{net-misc => net-vpn}/badvpn/badvpn-1.999.130.ebuild | 0
.../badvpn/files/badvpn-1.999.127-ncd.init | 0
{net-misc => net-vpn}/badvpn/files/badvpn-ncd.conf | 0
{net-misc => net-vpn}/badvpn/files/badvpn-ncd.init | 0
{net-misc => net-vpn}/badvpn/files/badvpn-ncd.service | 0
{net-misc => net-vpn}/badvpn/files/badvpn-server.conf | 0
{net-misc => net-vpn}/badvpn/files/badvpn-server.init | 0
{net-misc => net-vpn}/badvpn/metadata.xml | 0
{net-misc => net-vpn}/freelan/Manifest | 0
{net-misc => net-vpn}/freelan/files/boost158.patch | 0
{net-misc => net-vpn}/freelan/files/boost163.patch | 0
{net-misc => net-vpn}/freelan/files/mf.patch | 0
{net-misc => net-vpn}/freelan/files/openrc/freelan.initd | 0
{net-misc => net-vpn}/freelan/files/prefix.patch | 0
{net-misc => net-vpn}/freelan/freelan-2.0.ebuild | 0
{net-misc => net-vpn}/freelan/metadata.xml | 0
{net-firewall => net-vpn}/ipsec-tools/Manifest | 0
.../ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch | 0
.../ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch | 0
.../ipsec-tools/files/ipsec-tools-def-psk.patch | 0
.../files/ipsec-tools-include-vendoridh.patch | 0
.../ipsec-tools/files/ipsec-tools.conf | 0
.../ipsec-tools/files/ipsec-tools.service | 0
{net-firewall => net-vpn}/ipsec-tools/files/psk.txt | 0
{net-firewall => net-vpn}/ipsec-tools/files/racoon.conf | 0
.../ipsec-tools/files/racoon.conf.d-r2 | 0
.../ipsec-tools/files/racoon.init.d-r3 | 0
{net-firewall => net-vpn}/ipsec-tools/files/racoon.pam.d | 0
.../ipsec-tools/files/racoon.service | 0
.../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild | 8 ++++----
{net-firewall => net-vpn}/ipsec-tools/metadata.xml | 0
{net-misc => net-vpn}/kvpnc/Manifest | 0
.../kvpnc/files/kvpnc-0.9.6a-gcc47.patch | 0
.../kvpnc/files/kvpnc-0.9.6a-ifconfig.patch | 0
.../kvpnc/files/kvpnc-0.9.6a-scriptsec.patch | 0
{net-misc => net-vpn}/kvpnc/kvpnc-0.9.6a-r2.ebuild | 0
{net-misc => net-vpn}/kvpnc/metadata.xml | 0
{net-misc => net-vpn}/libreswan/Manifest | 0
{net-misc => net-vpn}/libreswan/libreswan-3.18.ebuild | 2 +-
{net-misc => net-vpn}/libreswan/libreswan-9999.ebuild | 2 +-
{net-misc => net-vpn}/libreswan/metadata.xml | 0
{net-misc => net-vpn}/logmein-hamachi/Manifest | 0
.../logmein-hamachi/files/logmein-hamachi.confd | 0
.../logmein-hamachi/files/logmein-hamachi.initd | 0
.../logmein-hamachi/files/logmein-hamachi.service | 0
.../logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild | 0
.../logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild | 0
{net-misc => net-vpn}/logmein-hamachi/metadata.xml | 0
net-vpn/metadata.xml | 9 +++++++++
{net-misc => net-vpn}/openconnect/Manifest | 0
.../openconnect/files/openconnect-7.07-libressl.patch | 0
.../files/openconnect-7.07-mimic-pulse-client.patch | 0
.../openconnect/files/openconnect.conf.in | 0
.../openconnect/files/openconnect.init.in | 0
.../openconnect/files/openconnect.init.in-r4 | 0
.../openconnect/files/openconnect.logrotate | 0
{net-misc => net-vpn}/openconnect/metadata.xml | 0
.../openconnect/openconnect-7.06-r1.ebuild | 0
.../openconnect/openconnect-7.06-r4.ebuild | 0
.../openconnect/openconnect-7.06_p20160614.ebuild | 0
.../openconnect/openconnect-7.07-r1.ebuild | 0
.../openconnect/openconnect-7.07-r2.ebuild | 0
.../openconnect/openconnect-7.07-r3.ebuild | 0
.../openconnect/openconnect-7.08.ebuild | 0
.../openconnect/openconnect-9999.ebuild | 0
{net-misc => net-vpn}/openfortivpn/Manifest | 0
{net-misc => net-vpn}/openfortivpn/metadata.xml | 0
.../openfortivpn/openfortivpn-1.3.0.ebuild | 0
{net-misc => net-vpn}/openvpn/Manifest | 0
{net-misc => net-vpn}/openvpn/files/down.sh | 0
{net-misc => net-vpn}/openvpn/files/openvpn-2.1.conf | 0
{net-misc => net-vpn}/openvpn/files/openvpn-2.1.init | 0
.../openvpn/files/openvpn-2.4.0-fix-libressl.patch | 0
.../openvpn/files/openvpn-external-cmocka.patch | 0
{net-misc => net-vpn}/openvpn/files/openvpn.tmpfile | 0
{net-misc => net-vpn}/openvpn/files/up.sh | 0
{net-misc => net-vpn}/openvpn/metadata.xml | 0
{net-misc => net-vpn}/openvpn/openvpn-2.3.12.ebuild | 0
{net-misc => net-vpn}/openvpn/openvpn-2.3.14.ebuild | 0
{net-misc => net-vpn}/openvpn/openvpn-2.4.0-r1.ebuild | 0
{net-misc => net-vpn}/openvpn/openvpn-2.4.0.ebuild | 0
{net-misc => net-vpn}/openvpn/openvpn-9999.ebuild | 0
{net-misc => net-vpn}/peervpn/Manifest | 0
{net-misc => net-vpn}/peervpn/files/peervpn.initd | 0
{net-misc => net-vpn}/peervpn/files/peervpn.logrotated | 0
{net-misc => net-vpn}/peervpn/files/peervpn.service | 0
{net-misc => net-vpn}/peervpn/metadata.xml | 0
{net-misc => net-vpn}/peervpn/peervpn-0.044-r2.ebuild | 0
{net-misc => net-vpn}/strongswan/Manifest | 0
{net-misc => net-vpn}/strongswan/files/ipsec | 0
{net-misc => net-vpn}/strongswan/metadata.xml | 0
{net-misc => net-vpn}/strongswan/strongswan-5.3.4.ebuild | 6 +++---
{net-misc => net-vpn}/strongswan/strongswan-5.5.1.ebuild | 6 +++---
{net-misc => net-vpn}/tinc/Manifest | 0
.../tinc/files/tinc-1.1-fix-paths.patch | 0
{net-misc => net-vpn}/tinc/files/tinc.networks | 0
{net-misc => net-vpn}/tinc/files/tincd-r1 | 0
{net-misc => net-vpn}/tinc/files/tincd-r2 | 0
{net-misc => net-vpn}/tinc/files/tincd.conf | 0
{net-misc => net-vpn}/tinc/files/tincd_at.service | 0
{net-misc => net-vpn}/tinc/metadata.xml | 0
{net-misc => net-vpn}/tinc/tinc-1.0.29.ebuild | 0
{net-misc => net-vpn}/tinc/tinc-1.0.30.ebuild | 0
{net-misc => net-vpn}/tinc/tinc-1.0.31.ebuild | 0
{net-misc => net-vpn}/tinc/tinc-1.1_pre14-r3.ebuild | 0
{net-misc => net-vpn}/vpnc/Manifest | 0
{net-misc => net-vpn}/vpnc/files/vpnc-3.init | 0
{net-misc => net-vpn}/vpnc/files/vpnc-tmpfiles.conf | 0
{net-misc => net-vpn}/vpnc/files/vpnc.confd | 0
{net-misc => net-vpn}/vpnc/files/vpnc.service | 0
{net-misc => net-vpn}/vpnc/metadata.xml | 0
{net-misc => net-vpn}/vpnc/vpnc-0.5.3_p550.ebuild | 0
{net-misc => net-vpn}/vpncwatch/Manifest | 0
.../vpncwatch/files/vpncwatch-1.8-Makefile.patch | 0
.../vpncwatch/files/vpncwatch-1.8.1-Makefile.patch | 0
{net-misc => net-vpn}/vpncwatch/metadata.xml | 0
{net-misc => net-vpn}/vpncwatch/vpncwatch-1.8.1.ebuild | 2 +-
{net-misc => net-vpn}/vpncwatch/vpncwatch-1.8.ebuild | 2 +-
{net-misc => net-vpn}/wireguard/Manifest | 0
.../wireguard/files/wireguard-openrc.sh | 0
{net-misc => net-vpn}/wireguard/metadata.xml | 0
.../wireguard/wireguard-0.0.20170223.ebuild | 0
{net-misc => net-vpn}/wireguard/wireguard-9999.ebuild | 0
profiles/arch/arm/package.use.mask | 6 +++---
profiles/arch/arm64/package.use.mask | 2 +-
profiles/arch/ia64/package.use.mask | 2 +-
profiles/arch/nios2/package.use.mask | 2 +-
profiles/arch/sh/package.use.mask | 2 +-
profiles/base/package.use.mask | 2 +-
profiles/categories | 1 +
profiles/default/bsd/package.use.mask | 2 +-
profiles/default/linux/sparc/13.0/package.use.mask | 2 +-
profiles/updates/1Q-2017 | 16 ++++++++++++++++
sys-apps/openrc/openrc-0.21.7.ebuild | 2 +-
sys-apps/openrc/openrc-0.22.4.ebuild | 2 +-
sys-apps/openrc/openrc-0.23.2.ebuild | 2 +-
sys-apps/openrc/openrc-0.24.1.ebuild | 2 +-
sys-apps/openrc/openrc-9999.ebuild | 2 +-
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 bf75b979eb5..cc316f8f198 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 a8a8946eb67..c0dc72838fc 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 1a682004001..393d4f04843 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 d294e3ae1c2..461acd01a25 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 8c9baeb2e3e..5783a52a471 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 8c9baeb2e3e..5783a52a471 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 3bd43e2b943..a73f7bc1f8d 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 3bd43e2b943..a73f7bc1f8d 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 7abe8cd0dd5..aec310f408f 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 73bc7b31b55..3b4065d4628 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 e50beaca39b..dae310961ea 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 d9434361de0..329ac55f1db 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 acbf02f3640..5ed70279471 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 17825807570..8de394c42c5 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 2e725126b67..8cae2a63466 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 71a45e40a31..d8c3b6555b5 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 6886f98acba..dcd10236ee5 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 6886f98acba..dcd10236ee5 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 9b727a1871c..2d450d05670 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 20783d71854..17fe3108517 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 11b9b21c3c8..4ac018da3dc 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 9515d16b55b..1e77248d32e 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
similarity index 100%
rename from net-misc/badvpn/Manifest
rename to net-vpn/badvpn/Manifest
diff --git a/net-misc/badvpn/badvpn-1.999.126.ebuild
b/net-vpn/badvpn/badvpn-1.999.126.ebuild
similarity index 100%
rename from net-misc/badvpn/badvpn-1.999.126.ebuild
rename to 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
similarity index 100%
rename from net-misc/badvpn/badvpn-1.999.127.ebuild
rename to 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
similarity index 100%
rename from net-misc/badvpn/badvpn-1.999.128.ebuild
rename to 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
similarity index 100%
rename from net-misc/badvpn/badvpn-1.999.129.ebuild
rename to 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
similarity index 100%
rename from net-misc/badvpn/badvpn-1.999.130.ebuild
rename to 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
similarity index 100%
rename from net-misc/badvpn/files/badvpn-1.999.127-ncd.init
rename to 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
similarity index 100%
rename from net-misc/badvpn/files/badvpn-ncd.conf
rename to 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
similarity index 100%
rename from net-misc/badvpn/files/badvpn-ncd.init
rename to 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
similarity index 100%
rename from net-misc/badvpn/files/badvpn-ncd.service
rename to 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
similarity index 100%
rename from net-misc/badvpn/files/badvpn-server.conf
rename to 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
similarity index 100%
rename from net-misc/badvpn/files/badvpn-server.init
rename to net-vpn/badvpn/files/badvpn-server.init
diff --git a/net-misc/badvpn/metadata.xml b/net-vpn/badvpn/metadata.xml
similarity index 100%
rename from net-misc/badvpn/metadata.xml
rename to net-vpn/badvpn/metadata.xml
diff --git a/net-misc/freelan/Manifest b/net-vpn/freelan/Manifest
similarity index 100%
rename from net-misc/freelan/Manifest
rename to net-vpn/freelan/Manifest
diff --git a/net-misc/freelan/files/boost158.patch
b/net-vpn/freelan/files/boost158.patch
similarity index 100%
rename from net-misc/freelan/files/boost158.patch
rename to net-vpn/freelan/files/boost158.patch
diff --git a/net-misc/freelan/files/boost163.patch
b/net-vpn/freelan/files/boost163.patch
similarity index 100%
rename from net-misc/freelan/files/boost163.patch
rename to net-vpn/freelan/files/boost163.patch
diff --git a/net-misc/freelan/files/mf.patch b/net-vpn/freelan/files/mf.patch
similarity index 100%
rename from net-misc/freelan/files/mf.patch
rename to net-vpn/freelan/files/mf.patch
diff --git a/net-misc/freelan/files/openrc/freelan.initd
b/net-vpn/freelan/files/openrc/freelan.initd
similarity index 100%
rename from net-misc/freelan/files/openrc/freelan.initd
rename to net-vpn/freelan/files/openrc/freelan.initd
diff --git a/net-misc/freelan/files/prefix.patch
b/net-vpn/freelan/files/prefix.patch
similarity index 100%
rename from net-misc/freelan/files/prefix.patch
rename to net-vpn/freelan/files/prefix.patch
diff --git a/net-misc/freelan/freelan-2.0.ebuild
b/net-vpn/freelan/freelan-2.0.ebuild
similarity index 100%
rename from net-misc/freelan/freelan-2.0.ebuild
rename to net-vpn/freelan/freelan-2.0.ebuild
diff --git a/net-misc/freelan/metadata.xml b/net-vpn/freelan/metadata.xml
similarity index 100%
rename from net-misc/freelan/metadata.xml
rename to net-vpn/freelan/metadata.xml
diff --git a/net-firewall/ipsec-tools/Manifest b/net-vpn/ipsec-tools/Manifest
similarity index 100%
rename from net-firewall/ipsec-tools/Manifest
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec-tools.conf
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec-tools.service
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/psk.txt
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/racoon.conf
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/racoon.conf.d-r2
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/racoon.init.d-r3
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/racoon.pam.d
rename to 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
similarity index 100%
rename from net-firewall/ipsec-tools/files/racoon.service
rename to 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
similarity index 97%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
rename to net-vpn/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
index e98bf283a11..1fd2ccbcc73 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
similarity index 100%
rename from net-firewall/ipsec-tools/metadata.xml
rename to net-vpn/ipsec-tools/metadata.xml
diff --git a/net-misc/kvpnc/Manifest b/net-vpn/kvpnc/Manifest
similarity index 100%
rename from net-misc/kvpnc/Manifest
rename to 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
similarity index 100%
rename from net-misc/kvpnc/files/kvpnc-0.9.6a-gcc47.patch
rename to 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
similarity index 100%
rename from net-misc/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch
rename to 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
similarity index 100%
rename from net-misc/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch
rename to 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
similarity index 100%
rename from net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild
rename to net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild
diff --git a/net-misc/kvpnc/metadata.xml b/net-vpn/kvpnc/metadata.xml
similarity index 100%
rename from net-misc/kvpnc/metadata.xml
rename to net-vpn/kvpnc/metadata.xml
diff --git a/net-misc/libreswan/Manifest b/net-vpn/libreswan/Manifest
similarity index 100%
rename from net-misc/libreswan/Manifest
rename to net-vpn/libreswan/Manifest
diff --git a/net-misc/libreswan/libreswan-3.18.ebuild
b/net-vpn/libreswan/libreswan-3.18.ebuild
similarity index 99%
rename from net-misc/libreswan/libreswan-3.18.ebuild
rename to net-vpn/libreswan/libreswan-3.18.ebuild
index c88e1ade396..c7115661250 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
similarity index 99%
rename from net-misc/libreswan/libreswan-9999.ebuild
rename to net-vpn/libreswan/libreswan-9999.ebuild
index aa259de5dc0..ac095ad3197 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
similarity index 100%
rename from net-misc/libreswan/metadata.xml
rename to net-vpn/libreswan/metadata.xml
diff --git a/net-misc/logmein-hamachi/Manifest
b/net-vpn/logmein-hamachi/Manifest
similarity index 100%
rename from net-misc/logmein-hamachi/Manifest
rename to 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
similarity index 100%
rename from net-misc/logmein-hamachi/files/logmein-hamachi.confd
rename to 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
similarity index 100%
rename from net-misc/logmein-hamachi/files/logmein-hamachi.initd
rename to 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
similarity index 100%
rename from net-misc/logmein-hamachi/files/logmein-hamachi.service
rename to 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
similarity index 100%
rename from net-misc/logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild
rename to 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
similarity index 100%
rename from net-misc/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild
rename to 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
similarity index 100%
rename from net-misc/logmein-hamachi/metadata.xml
rename to net-vpn/logmein-hamachi/metadata.xml
diff --git a/net-vpn/metadata.xml b/net-vpn/metadata.xml
new file mode 100644
index 00000000000..b5449d0bcb2
--- /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
similarity index 100%
rename from net-misc/openconnect/Manifest
rename to 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
similarity index 100%
rename from net-misc/openconnect/files/openconnect-7.07-libressl.patch
rename to 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
similarity index 100%
rename from net-misc/openconnect/files/openconnect-7.07-mimic-pulse-client.patch
rename to 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
similarity index 100%
rename from net-misc/openconnect/files/openconnect.conf.in
rename to 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
similarity index 100%
rename from net-misc/openconnect/files/openconnect.init.in
rename to 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
similarity index 100%
rename from net-misc/openconnect/files/openconnect.init.in-r4
rename to net-vpn/openconnect/files/openconnect.init.in-r4
diff --git a/net-misc/openconnect/files/openconnect.logrotate
b/net-vpn/openconnect/files/openconnect.logrotate
similarity index 100%
rename from net-misc/openconnect/files/openconnect.logrotate
rename to net-vpn/openconnect/files/openconnect.logrotate
diff --git a/net-misc/openconnect/metadata.xml
b/net-vpn/openconnect/metadata.xml
similarity index 100%
rename from net-misc/openconnect/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.06-r1.ebuild
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.06-r4.ebuild
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.06_p20160614.ebuild
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.07-r1.ebuild
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.07-r2.ebuild
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.07-r3.ebuild
rename to 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
similarity index 100%
rename from net-misc/openconnect/openconnect-7.08.ebuild
rename to net-vpn/openconnect/openconnect-7.08.ebuild
diff --git a/net-misc/openconnect/openconnect-9999.ebuild
b/net-vpn/openconnect/openconnect-9999.ebuild
similarity index 100%
rename from net-misc/openconnect/openconnect-9999.ebuild
rename to net-vpn/openconnect/openconnect-9999.ebuild
diff --git a/net-misc/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
similarity index 100%
rename from net-misc/openfortivpn/Manifest
rename to net-vpn/openfortivpn/Manifest
diff --git a/net-misc/openfortivpn/metadata.xml
b/net-vpn/openfortivpn/metadata.xml
similarity index 100%
rename from net-misc/openfortivpn/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/openfortivpn/openfortivpn-1.3.0.ebuild
rename to net-vpn/openfortivpn/openfortivpn-1.3.0.ebuild
diff --git a/net-misc/openvpn/Manifest b/net-vpn/openvpn/Manifest
similarity index 100%
rename from net-misc/openvpn/Manifest
rename to net-vpn/openvpn/Manifest
diff --git a/net-misc/openvpn/files/down.sh b/net-vpn/openvpn/files/down.sh
similarity index 100%
rename from net-misc/openvpn/files/down.sh
rename to 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
similarity index 100%
rename from net-misc/openvpn/files/openvpn-2.1.conf
rename to 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
similarity index 100%
rename from net-misc/openvpn/files/openvpn-2.1.init
rename to 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
similarity index 100%
rename from net-misc/openvpn/files/openvpn-2.4.0-fix-libressl.patch
rename to 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
similarity index 100%
rename from net-misc/openvpn/files/openvpn-external-cmocka.patch
rename to net-vpn/openvpn/files/openvpn-external-cmocka.patch
diff --git a/net-misc/openvpn/files/openvpn.tmpfile
b/net-vpn/openvpn/files/openvpn.tmpfile
similarity index 100%
rename from net-misc/openvpn/files/openvpn.tmpfile
rename to net-vpn/openvpn/files/openvpn.tmpfile
diff --git a/net-misc/openvpn/files/up.sh b/net-vpn/openvpn/files/up.sh
similarity index 100%
rename from net-misc/openvpn/files/up.sh
rename to net-vpn/openvpn/files/up.sh
diff --git a/net-misc/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml
similarity index 100%
rename from net-misc/openvpn/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/openvpn/openvpn-2.3.12.ebuild
rename to 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
similarity index 100%
rename from net-misc/openvpn/openvpn-2.3.14.ebuild
rename to 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
similarity index 100%
rename from net-misc/openvpn/openvpn-2.4.0-r1.ebuild
rename to 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
similarity index 100%
rename from net-misc/openvpn/openvpn-2.4.0.ebuild
rename to net-vpn/openvpn/openvpn-2.4.0.ebuild
diff --git a/net-misc/openvpn/openvpn-9999.ebuild
b/net-vpn/openvpn/openvpn-9999.ebuild
similarity index 100%
rename from net-misc/openvpn/openvpn-9999.ebuild
rename to net-vpn/openvpn/openvpn-9999.ebuild
diff --git a/net-misc/peervpn/Manifest b/net-vpn/peervpn/Manifest
similarity index 100%
rename from net-misc/peervpn/Manifest
rename to net-vpn/peervpn/Manifest
diff --git a/net-misc/peervpn/files/peervpn.initd
b/net-vpn/peervpn/files/peervpn.initd
similarity index 100%
rename from net-misc/peervpn/files/peervpn.initd
rename to net-vpn/peervpn/files/peervpn.initd
diff --git a/net-misc/peervpn/files/peervpn.logrotated
b/net-vpn/peervpn/files/peervpn.logrotated
similarity index 100%
rename from net-misc/peervpn/files/peervpn.logrotated
rename to net-vpn/peervpn/files/peervpn.logrotated
diff --git a/net-misc/peervpn/files/peervpn.service
b/net-vpn/peervpn/files/peervpn.service
similarity index 100%
rename from net-misc/peervpn/files/peervpn.service
rename to net-vpn/peervpn/files/peervpn.service
diff --git a/net-misc/peervpn/metadata.xml b/net-vpn/peervpn/metadata.xml
similarity index 100%
rename from net-misc/peervpn/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/peervpn/peervpn-0.044-r2.ebuild
rename to net-vpn/peervpn/peervpn-0.044-r2.ebuild
diff --git a/net-misc/strongswan/Manifest b/net-vpn/strongswan/Manifest
similarity index 100%
rename from net-misc/strongswan/Manifest
rename to net-vpn/strongswan/Manifest
diff --git a/net-misc/strongswan/files/ipsec b/net-vpn/strongswan/files/ipsec
similarity index 100%
rename from net-misc/strongswan/files/ipsec
rename to net-vpn/strongswan/files/ipsec
diff --git a/net-misc/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
similarity index 100%
rename from net-misc/strongswan/metadata.xml
rename to 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
similarity index 98%
rename from net-misc/strongswan/strongswan-5.3.4.ebuild
rename to net-vpn/strongswan/strongswan-5.3.4.ebuild
index 38ea3d9ea98..0007796d7eb 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
similarity index 98%
rename from net-misc/strongswan/strongswan-5.5.1.ebuild
rename to net-vpn/strongswan/strongswan-5.5.1.ebuild
index 5521f3415d6..0b27b2034d3 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
similarity index 100%
rename from net-misc/tinc/Manifest
rename to 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
similarity index 100%
rename from net-misc/tinc/files/tinc-1.1-fix-paths.patch
rename to 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
similarity index 100%
rename from net-misc/tinc/files/tinc.networks
rename to net-vpn/tinc/files/tinc.networks
diff --git a/net-misc/tinc/files/tincd-r1 b/net-vpn/tinc/files/tincd-r1
similarity index 100%
rename from net-misc/tinc/files/tincd-r1
rename to net-vpn/tinc/files/tincd-r1
diff --git a/net-misc/tinc/files/tincd-r2 b/net-vpn/tinc/files/tincd-r2
similarity index 100%
rename from net-misc/tinc/files/tincd-r2
rename to net-vpn/tinc/files/tincd-r2
diff --git a/net-misc/tinc/files/tincd.conf b/net-vpn/tinc/files/tincd.conf
similarity index 100%
rename from net-misc/tinc/files/tincd.conf
rename to net-vpn/tinc/files/tincd.conf
diff --git a/net-misc/tinc/files/tincd_at.service
b/net-vpn/tinc/files/tincd_at.service
similarity index 100%
rename from net-misc/tinc/files/tincd_at.service
rename to net-vpn/tinc/files/tincd_at.service
diff --git a/net-misc/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
similarity index 100%
rename from net-misc/tinc/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/tinc/tinc-1.0.29.ebuild
rename to 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
similarity index 100%
rename from net-misc/tinc/tinc-1.0.30.ebuild
rename to 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
similarity index 100%
rename from net-misc/tinc/tinc-1.0.31.ebuild
rename to 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
similarity index 100%
rename from net-misc/tinc/tinc-1.1_pre14-r3.ebuild
rename to net-vpn/tinc/tinc-1.1_pre14-r3.ebuild
diff --git a/net-misc/vpnc/Manifest b/net-vpn/vpnc/Manifest
similarity index 100%
rename from net-misc/vpnc/Manifest
rename to net-vpn/vpnc/Manifest
diff --git a/net-misc/vpnc/files/vpnc-3.init b/net-vpn/vpnc/files/vpnc-3.init
similarity index 100%
rename from net-misc/vpnc/files/vpnc-3.init
rename to 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
similarity index 100%
rename from net-misc/vpnc/files/vpnc-tmpfiles.conf
rename to net-vpn/vpnc/files/vpnc-tmpfiles.conf
diff --git a/net-misc/vpnc/files/vpnc.confd b/net-vpn/vpnc/files/vpnc.confd
similarity index 100%
rename from net-misc/vpnc/files/vpnc.confd
rename to net-vpn/vpnc/files/vpnc.confd
diff --git a/net-misc/vpnc/files/vpnc.service b/net-vpn/vpnc/files/vpnc.service
similarity index 100%
rename from net-misc/vpnc/files/vpnc.service
rename to net-vpn/vpnc/files/vpnc.service
diff --git a/net-misc/vpnc/metadata.xml b/net-vpn/vpnc/metadata.xml
similarity index 100%
rename from net-misc/vpnc/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/vpnc/vpnc-0.5.3_p550.ebuild
rename to net-vpn/vpnc/vpnc-0.5.3_p550.ebuild
diff --git a/net-misc/vpncwatch/Manifest b/net-vpn/vpncwatch/Manifest
similarity index 100%
rename from net-misc/vpncwatch/Manifest
rename to 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
similarity index 100%
rename from net-misc/vpncwatch/files/vpncwatch-1.8-Makefile.patch
rename to 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
similarity index 100%
rename from net-misc/vpncwatch/files/vpncwatch-1.8.1-Makefile.patch
rename to net-vpn/vpncwatch/files/vpncwatch-1.8.1-Makefile.patch
diff --git a/net-misc/vpncwatch/metadata.xml b/net-vpn/vpncwatch/metadata.xml
similarity index 100%
rename from net-misc/vpncwatch/metadata.xml
rename to 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
similarity index 95%
rename from net-misc/vpncwatch/vpncwatch-1.8.1.ebuild
rename to net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
index da2a4ef2fe7..fc293fa8e4e 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
similarity index 95%
rename from net-misc/vpncwatch/vpncwatch-1.8.ebuild
rename to net-vpn/vpncwatch/vpncwatch-1.8.ebuild
index 74769b40a1f..d758a74b4f8 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
similarity index 100%
rename from net-misc/wireguard/Manifest
rename to net-vpn/wireguard/Manifest
diff --git a/net-misc/wireguard/files/wireguard-openrc.sh
b/net-vpn/wireguard/files/wireguard-openrc.sh
similarity index 100%
rename from net-misc/wireguard/files/wireguard-openrc.sh
rename to net-vpn/wireguard/files/wireguard-openrc.sh
diff --git a/net-misc/wireguard/metadata.xml b/net-vpn/wireguard/metadata.xml
similarity index 100%
rename from net-misc/wireguard/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/wireguard/wireguard-0.0.20170223.ebuild
rename to net-vpn/wireguard/wireguard-0.0.20170223.ebuild
diff --git a/net-misc/wireguard/wireguard-9999.ebuild
b/net-vpn/wireguard/wireguard-9999.ebuild
similarity index 100%
rename from net-misc/wireguard/wireguard-9999.ebuild
rename to net-vpn/wireguard/wireguard-9999.ebuild
diff --git a/profiles/arch/arm/package.use.mask
b/profiles/arch/arm/package.use.mask
index 6166543d801..624ee6b9117 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 <mae...@gentoo.org> (17 Jan 2015)
# Unkeyworded deps, bug #536226
-net-misc/strongswan strongswan_plugins_unbound
+net-vpn/strongswan strongswan_plugins_unbound
# Markus Meier <mae...@gentoo.org> (17 Jan 2015)
# Unkeyworded deps, bug #533404
@@ -363,7 +363,7 @@ media-gfx/pstoedit emf
# Rick Farina <zeroch...@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 <bluen...@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 <p...@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 5d17187bb1e..b7e56d497e2 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 <bluen...@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 <chutz...@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 2bef2dd7225..3bcfaf5aa71 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 <d...@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 <e...@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 dc2ea7002dc..3d77f788257 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 <bluen...@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 <klaus...@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 9ef38223029..dbb8669b720 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 <alo...@gentoo.org> (24 Jan 2007)
# pkcs11-helper is not keyworded
-net-misc/openvpn pkcs11
+net-vpn/openvpn pkcs11
# Christoph Mende <ange...@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 9805a381deb..ba2e61cfb3e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -356,7 +356,7 @@ media-video/rtmpdump polarssl
# Julian Ospald <hasuf...@gentoo.org> (06 Apr 2014)
# broken wrt #501582
-<net-misc/openvpn-9999 polarssl
+<net-vpn/openvpn-9999 polarssl
# Manuel Rüger <mr...@gentoo.org> (07 Mar 2014)
# Mask ruby18-only compatible flags
diff --git a/profiles/categories b/profiles/categories
index 3d47d6ca40a..b830c74deb7 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 94a0bd3d6d7..1dbd6a3a3a0 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 4f542d11e8b..5762f25bece 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 8f3d66c6d83..79b847c61ce 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 2cfa4a333d2..2bc11b9e538 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 1b226b2f008..31d979641e9 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 caa60493d14..015a422a623 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 7a8b5e860c2..1ce8145c500 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 7a8b5e860c2..1ce8145c500 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."
