Move VPN packages into net-vpn/

10 files changed, 27 insertions, 10 deletions

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