Second half of net-vpn/ move

116 files changed, 27 insertions, 14 deletions

diff --git a/net-libs/stem/stem-1.3.0.ebuild b/net-libs/stem/stem-1.3.0.ebuild
index 7570c252e822..2a3864161696 100644
--- a/net-libs/stem/stem-1.3.0.ebuild
+++ b/net-libs/stem/stem-1.3.0.ebuild
@@ -17,10 +17,10 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
-	net-misc/tor )
+	net-vpn/tor )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-RDEPEND="net-misc/tor"
+RDEPEND="net-vpn/tor"
 
 DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
 
diff --git a/net-libs/stem/stem-1.4.0.ebuild b/net-libs/stem/stem-1.4.0.ebuild
index 08b4fb426f18..63e61e8dbcd7 100644
--- a/net-libs/stem/stem-1.4.0.ebuild
+++ b/net-libs/stem/stem-1.4.0.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
-	net-misc/tor )
+	net-vpn/tor )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-RDEPEND="net-misc/tor"
+RDEPEND="net-vpn/tor"
 
 DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
 
diff --git a/net-libs/stem/stem-1.4.1.ebuild b/net-libs/stem/stem-1.4.1.ebuild
index 08b4fb426f18..63e61e8dbcd7 100644
--- a/net-libs/stem/stem-1.4.1.ebuild
+++ b/net-libs/stem/stem-1.4.1.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
-	net-misc/tor )
+	net-vpn/tor )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-RDEPEND="net-misc/tor"
+RDEPEND="net-vpn/tor"
 
 DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
 
diff --git a/net-libs/stem/stem-1.5.4.ebuild b/net-libs/stem/stem-1.5.4.ebuild
index 49eb44f8104f..5dbeb5e8928e 100644
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ b/net-libs/stem/stem-1.5.4.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
-	net-misc/tor )
+	net-vpn/tor )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-RDEPEND="net-misc/tor"
+RDEPEND="net-vpn/tor"
 
 DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
 
diff --git a/net-libs/txtorcon/txtorcon-0.13.0.ebuild b/net-libs/txtorcon/txtorcon-0.13.0.ebuild
index 5d2a430a3628..2493b1e207bf 100644
--- a/net-libs/txtorcon/txtorcon-0.13.0.ebuild
+++ b/net-libs/txtorcon/txtorcon-0.13.0.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 RDEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
-	net-misc/tor
+	net-vpn/tor
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	dev-python/geoip-python[${PYTHON_USEDEP}]"
 
diff --git a/net-misc/arm/arm-1.4.5.0-r2.ebuild b/net-misc/arm/arm-1.4.5.0-r2.ebuild
index 190464f1b870..69b319c282dc 100644
--- a/net-misc/arm/arm-1.4.5.0-r2.ebuild
+++ b/net-misc/arm/arm-1.4.5.0-r2.ebuild
@@ -18,10 +18,10 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
-# Note: While we depend on net-misc/tor, we strictly speaking
+# Note: While we depend on net-vpn/tor, we strictly speaking
 # don't have to because it could run on a different machine.
 RDEPEND="
-	>=net-misc/tor-0.2.1.27
+	>=net-vpn/tor-0.2.1.27
 	app-admin/sudo
 	sys-process/lsof
 	net-dns/bind-tools
diff --git a/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild b/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild
index f4b4fefe73ad..2a05500a0067 100644
--- a/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild
+++ b/net-misc/arm/arm-1.4.5.0_p20140714-r2.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=">=net-libs/stem-1.2.2_p20140718[${PYTHON_USEDEP}]
-	net-misc/tor"
+	net-vpn/tor"
 
 python_prepare_all() {
 	sed -i -e "s/.version import VERSION/ import __version__ as VERSION/"\
diff --git a/net-misc/6tunnel/6tunnel-0.10.ebuild b/net-vpn/6tunnel/6tunnel-0.10.ebuild
index 0b4cadb97a0e..0b4cadb97a0e 100644
--- a/net-misc/6tunnel/6tunnel-0.10.ebuild
+++ b/net-vpn/6tunnel/6tunnel-0.10.ebuild
diff --git a/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild b/net-vpn/6tunnel/6tunnel-0.11_rc1.ebuild
index c650cdba07b4..c650cdba07b4 100644
--- a/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild
+++ b/net-vpn/6tunnel/6tunnel-0.11_rc1.ebuild
diff --git a/net-misc/6tunnel/6tunnel-0.12.ebuild b/net-vpn/6tunnel/6tunnel-0.12.ebuild
index 1fedcca11208..1fedcca11208 100644
--- a/net-misc/6tunnel/6tunnel-0.12.ebuild
+++ b/net-vpn/6tunnel/6tunnel-0.12.ebuild
diff --git a/net-misc/6tunnel/Manifest b/net-vpn/6tunnel/Manifest
index c989f86e246f..c989f86e246f 100644
--- a/net-misc/6tunnel/Manifest
+++ b/net-vpn/6tunnel/Manifest
diff --git a/net-misc/6tunnel/metadata.xml b/net-vpn/6tunnel/metadata.xml
index 6f49eba8f496..6f49eba8f496 100644
--- a/net-misc/6tunnel/metadata.xml
+++ b/net-vpn/6tunnel/metadata.xml
diff --git a/net-misc/aiccu/Manifest b/net-vpn/aiccu/Manifest
index d3919d5dc977..d3919d5dc977 100644
--- a/net-misc/aiccu/Manifest
+++ b/net-vpn/aiccu/Manifest
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild b/net-vpn/aiccu/aiccu-2007.01.15-r5.ebuild
index 4c92c3258bda..4c92c3258bda 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
+++ b/net-vpn/aiccu/aiccu-2007.01.15-r5.ebuild
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-Makefile.patch
index c0eabbefd906..c0eabbefd906 100644
--- a/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch
+++ b/net-vpn/aiccu/files/aiccu-2007.01.15-Makefile.patch
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
index ee637a761029..ee637a761029 100644
--- a/net-misc/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
+++ b/net-vpn/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
index 35ca2b8a6719..35ca2b8a6719 100644
--- a/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
+++ b/net-vpn/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-setupscript.patch
index 8981530435f3..8981530435f3 100644
--- a/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch
+++ b/net-vpn/aiccu/files/aiccu-2007.01.15-setupscript.patch
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-systemd.patch
index e8616d04b3fc..e8616d04b3fc 100644
--- a/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch
+++ b/net-vpn/aiccu/files/aiccu-2007.01.15-systemd.patch
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-uclibc.patch
index 56341dea72f4..56341dea72f4 100644
--- a/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch
+++ b/net-vpn/aiccu/files/aiccu-2007.01.15-uclibc.patch
diff --git a/net-misc/aiccu/metadata.xml b/net-vpn/aiccu/metadata.xml
index a535b8852829..a535b8852829 100644
--- a/net-misc/aiccu/metadata.xml
+++ b/net-vpn/aiccu/metadata.xml
diff --git a/net-misc/corkscrew/Manifest b/net-vpn/corkscrew/Manifest
index 3cb1d976bd02..3cb1d976bd02 100644
--- a/net-misc/corkscrew/Manifest
+++ b/net-vpn/corkscrew/Manifest
diff --git a/net-misc/corkscrew/corkscrew-2.0.ebuild b/net-vpn/corkscrew/corkscrew-2.0.ebuild
index 2982c2a8fddf..2982c2a8fddf 100644
--- a/net-misc/corkscrew/corkscrew-2.0.ebuild
+++ b/net-vpn/corkscrew/corkscrew-2.0.ebuild
diff --git a/net-misc/corkscrew/metadata.xml b/net-vpn/corkscrew/metadata.xml
index 306c354edf5b..306c354edf5b 100644
--- a/net-misc/corkscrew/metadata.xml
+++ b/net-vpn/corkscrew/metadata.xml
diff --git a/net-misc/httptunnel/Manifest b/net-vpn/httptunnel/Manifest
index baa7722c26ba..baa7722c26ba 100644
--- a/net-misc/httptunnel/Manifest
+++ b/net-vpn/httptunnel/Manifest
diff --git a/net-misc/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch b/net-vpn/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
index 904df6f91159..904df6f91159 100644
--- a/net-misc/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
+++ b/net-vpn/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
diff --git a/net-misc/httptunnel/httptunnel-3.3-r2.ebuild b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
index 74bc2848e259..74bc2848e259 100644
--- a/net-misc/httptunnel/httptunnel-3.3-r2.ebuild
+++ b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
diff --git a/net-misc/httptunnel/metadata.xml b/net-vpn/httptunnel/metadata.xml
index 6f49eba8f496..6f49eba8f496 100644
--- a/net-misc/httptunnel/metadata.xml
+++ b/net-vpn/httptunnel/metadata.xml
diff --git a/net-misc/htun/Manifest b/net-vpn/htun/Manifest
index 355750f42f01..355750f42f01 100644
--- a/net-misc/htun/Manifest
+++ b/net-vpn/htun/Manifest
diff --git a/net-misc/htun/files/README.gentoo b/net-vpn/htun/files/README.gentoo
index 1710c726723a..1710c726723a 100644
--- a/net-misc/htun/files/README.gentoo
+++ b/net-vpn/htun/files/README.gentoo
diff --git a/net-misc/htun/files/htun-0.9.6-glibc.patch b/net-vpn/htun/files/htun-0.9.6-glibc.patch
index 3f281c526388..3f281c526388 100644
--- a/net-misc/htun/files/htun-0.9.6-glibc.patch
+++ b/net-vpn/htun/files/htun-0.9.6-glibc.patch
diff --git a/net-misc/htun/files/htun-0.9.6-makefile.patch b/net-vpn/htun/files/htun-0.9.6-makefile.patch
index c1f0b76bfa14..c1f0b76bfa14 100644
--- a/net-misc/htun/files/htun-0.9.6-makefile.patch
+++ b/net-vpn/htun/files/htun-0.9.6-makefile.patch
diff --git a/net-misc/htun/htun-0.9.6.ebuild b/net-vpn/htun/htun-0.9.6.ebuild
index a04679b6af39..a04679b6af39 100644
--- a/net-misc/htun/htun-0.9.6.ebuild
+++ b/net-vpn/htun/htun-0.9.6.ebuild
diff --git a/net-misc/htun/metadata.xml b/net-vpn/htun/metadata.xml
index 6f49eba8f496..6f49eba8f496 100644
--- a/net-misc/htun/metadata.xml
+++ b/net-vpn/htun/metadata.xml
diff --git a/net-p2p/i2p/Manifest b/net-vpn/i2p/Manifest
index b9bde310e97b..b9bde310e97b 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
diff --git a/net-p2p/i2p/files/i2p-0.9.26-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.26-add_libs.patch
index 945366966ca4..945366966ca4 100644
--- a/net-p2p/i2p/files/i2p-0.9.26-add_libs.patch
+++ b/net-vpn/i2p/files/i2p-0.9.26-add_libs.patch
diff --git a/net-p2p/i2p/files/i2p-0.9.26.initd b/net-vpn/i2p/files/i2p-0.9.26.initd
index ae4774e2051c..ae4774e2051c 100644
--- a/net-p2p/i2p/files/i2p-0.9.26.initd
+++ b/net-vpn/i2p/files/i2p-0.9.26.initd
diff --git a/net-p2p/i2p/files/i2p-0.9.26.service b/net-vpn/i2p/files/i2p-0.9.26.service
index ccbadbd4d167..ccbadbd4d167 100644
--- a/net-p2p/i2p/files/i2p-0.9.26.service
+++ b/net-vpn/i2p/files/i2p-0.9.26.service
diff --git a/net-p2p/i2p/files/i2p-0.9.27-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.27-add_libs.patch
index 0ea3149a3628..0ea3149a3628 100644
--- a/net-p2p/i2p/files/i2p-0.9.27-add_libs.patch
+++ b/net-vpn/i2p/files/i2p-0.9.27-add_libs.patch
diff --git a/net-p2p/i2p/files/i2p-0.9.27.initd b/net-vpn/i2p/files/i2p-0.9.27.initd
index 216d19474cb8..216d19474cb8 100644
--- a/net-p2p/i2p/files/i2p-0.9.27.initd
+++ b/net-vpn/i2p/files/i2p-0.9.27.initd
diff --git a/net-p2p/i2p/files/i2p-0.9.27.service b/net-vpn/i2p/files/i2p-0.9.27.service
index ccbadbd4d167..ccbadbd4d167 100644
--- a/net-p2p/i2p/files/i2p-0.9.27.service
+++ b/net-vpn/i2p/files/i2p-0.9.27.service
diff --git a/net-p2p/i2p/files/i2p-0.9.28-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch
index 0ea3149a3628..0ea3149a3628 100644
--- a/net-p2p/i2p/files/i2p-0.9.28-add_libs.patch
+++ b/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch
diff --git a/net-p2p/i2p/files/i2p-0.9.28.initd b/net-vpn/i2p/files/i2p-0.9.28.initd
index 216d19474cb8..216d19474cb8 100644
--- a/net-p2p/i2p/files/i2p-0.9.28.initd
+++ b/net-vpn/i2p/files/i2p-0.9.28.initd
diff --git a/net-p2p/i2p/files/i2p-0.9.28.service b/net-vpn/i2p/files/i2p-0.9.28.service
index ccbadbd4d167..ccbadbd4d167 100644
--- a/net-p2p/i2p/files/i2p-0.9.28.service
+++ b/net-vpn/i2p/files/i2p-0.9.28.service
diff --git a/net-p2p/i2p/i2p-0.9.26.ebuild b/net-vpn/i2p/i2p-0.9.26.ebuild
index 6514c7a98dcd..6514c7a98dcd 100644
--- a/net-p2p/i2p/i2p-0.9.26.ebuild
+++ b/net-vpn/i2p/i2p-0.9.26.ebuild
diff --git a/net-p2p/i2p/i2p-0.9.27.ebuild b/net-vpn/i2p/i2p-0.9.27.ebuild
index 6514c7a98dcd..6514c7a98dcd 100644
--- a/net-p2p/i2p/i2p-0.9.27.ebuild
+++ b/net-vpn/i2p/i2p-0.9.27.ebuild
diff --git a/net-p2p/i2p/i2p-0.9.28.ebuild b/net-vpn/i2p/i2p-0.9.28.ebuild
index 103ad6ed5e12..103ad6ed5e12 100644
--- a/net-p2p/i2p/i2p-0.9.28.ebuild
+++ b/net-vpn/i2p/i2p-0.9.28.ebuild
diff --git a/net-p2p/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 52ff64217713..52ff64217713 100644
--- a/net-p2p/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
diff --git a/net-misc/i2pd/Manifest b/net-vpn/i2pd/Manifest
index b322a15a60c6..b322a15a60c6 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
diff --git a/net-misc/i2pd/files/99i2pd b/net-vpn/i2pd/files/99i2pd
index 3cf3b46797c4..3cf3b46797c4 100644
--- a/net-misc/i2pd/files/99i2pd
+++ b/net-vpn/i2pd/files/99i2pd
diff --git a/net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch b/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
index 0416901117c5..0416901117c5 100644
--- a/net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
+++ b/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.confd b/net-vpn/i2pd/files/i2pd-2.6.0-r3.confd
index d2ef16b0f61c..d2ef16b0f61c 100644
--- a/net-misc/i2pd/files/i2pd-2.6.0-r3.confd
+++ b/net-vpn/i2pd/files/i2pd-2.6.0-r3.confd
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.initd b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd
index 09c83927b206..09c83927b206 100644
--- a/net-misc/i2pd/files/i2pd-2.6.0-r3.initd
+++ b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate b/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
index 251128b7be78..251128b7be78 100644
--- a/net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate
+++ b/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.service b/net-vpn/i2pd/files/i2pd-2.6.0-r3.service
index 6821a00552df..6821a00552df 100644
--- a/net-misc/i2pd/files/i2pd-2.6.0-r3.service
+++ b/net-vpn/i2pd/files/i2pd-2.6.0-r3.service
diff --git a/net-misc/i2pd/i2pd-2.11.0.ebuild b/net-vpn/i2pd/i2pd-2.11.0.ebuild
index 64023985fd56..64023985fd56 100644
--- a/net-misc/i2pd/i2pd-2.11.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.11.0.ebuild
diff --git a/net-misc/i2pd/i2pd-2.12.0.ebuild b/net-vpn/i2pd/i2pd-2.12.0.ebuild
index 64023985fd56..64023985fd56 100644
--- a/net-misc/i2pd/i2pd-2.12.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.12.0.ebuild
diff --git a/net-misc/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
index 80f4f859ab46..80f4f859ab46 100644
--- a/net-misc/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
diff --git a/net-misc/iodine/Manifest b/net-vpn/iodine/Manifest
index 080608ceadf0..080608ceadf0 100644
--- a/net-misc/iodine/Manifest
+++ b/net-vpn/iodine/Manifest
diff --git a/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch b/net-vpn/iodine/files/iodine-0.7.0-TestMessage.patch
index 6b814b6f2d74..6b814b6f2d74 100644
--- a/net-misc/iodine/files/iodine-0.7.0-TestMessage.patch
+++ b/net-vpn/iodine/files/iodine-0.7.0-TestMessage.patch
diff --git a/net-misc/iodine/files/iodine-0.7.0-new-systemd.patch b/net-vpn/iodine/files/iodine-0.7.0-new-systemd.patch
index e18b64a086fe..e18b64a086fe 100644
--- a/net-misc/iodine/files/iodine-0.7.0-new-systemd.patch
+++ b/net-vpn/iodine/files/iodine-0.7.0-new-systemd.patch
diff --git a/net-misc/iodine/files/iodined-1.init b/net-vpn/iodine/files/iodined-1.init
index edee6c6ac31a..edee6c6ac31a 100644
--- a/net-misc/iodine/files/iodined-1.init
+++ b/net-vpn/iodine/files/iodined-1.init
diff --git a/net-misc/iodine/files/iodined.conf b/net-vpn/iodine/files/iodined.conf
index 7889b0892eea..7889b0892eea 100644
--- a/net-misc/iodine/files/iodined.conf
+++ b/net-vpn/iodine/files/iodined.conf
diff --git a/net-misc/iodine/iodine-0.7.0-r2.ebuild b/net-vpn/iodine/iodine-0.7.0-r2.ebuild
index a45c117fe2a1..a45c117fe2a1 100644
--- a/net-misc/iodine/iodine-0.7.0-r2.ebuild
+++ b/net-vpn/iodine/iodine-0.7.0-r2.ebuild
diff --git a/net-misc/iodine/metadata.xml b/net-vpn/iodine/metadata.xml
index 073848fe4147..073848fe4147 100644
--- a/net-misc/iodine/metadata.xml
+++ b/net-vpn/iodine/metadata.xml
diff --git a/net-misc/isatapd/Manifest b/net-vpn/isatapd/Manifest
index e74c4cf5662d..e74c4cf5662d 100644
--- a/net-misc/isatapd/Manifest
+++ b/net-vpn/isatapd/Manifest
diff --git a/net-misc/isatapd/files/isatapd.service-r2 b/net-vpn/isatapd/files/isatapd.service-r2
index 8d695eda35ca..8d695eda35ca 100644
--- a/net-misc/isatapd/files/isatapd.service-r2
+++ b/net-vpn/isatapd/files/isatapd.service-r2
diff --git a/net-misc/isatapd/files/isatapd.service.conf b/net-vpn/isatapd/files/isatapd.service.conf
index 87fe0be4a23d..87fe0be4a23d 100644
--- a/net-misc/isatapd/files/isatapd.service.conf
+++ b/net-vpn/isatapd/files/isatapd.service.conf
diff --git a/net-misc/isatapd/isatapd-0.9.7-r2.ebuild b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
index 9474bf9461e8..9474bf9461e8 100644
--- a/net-misc/isatapd/isatapd-0.9.7-r2.ebuild
+++ b/net-vpn/isatapd/isatapd-0.9.7-r2.ebuild
diff --git a/net-misc/isatapd/metadata.xml b/net-vpn/isatapd/metadata.xml
index a535b8852829..a535b8852829 100644
--- a/net-misc/isatapd/metadata.xml
+++ b/net-vpn/isatapd/metadata.xml
diff --git a/net-misc/miredo/Manifest b/net-vpn/miredo/Manifest
index 3eb6bd6e06be..3eb6bd6e06be 100644
--- a/net-misc/miredo/Manifest
+++ b/net-vpn/miredo/Manifest
diff --git a/net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff b/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff
index cffdbf1e562e..cffdbf1e562e 100644
--- a/net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff
+++ b/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff
diff --git a/net-misc/miredo/files/miredo-1.2.5-ip-path.patch b/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch
index 1d7b0fc39f6e..1d7b0fc39f6e 100644
--- a/net-misc/miredo/files/miredo-1.2.5-ip-path.patch
+++ b/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch
diff --git a/net-misc/miredo/files/miredo.conf.2 b/net-vpn/miredo/files/miredo.conf.2
index f4ef08a23112..f4ef08a23112 100644
--- a/net-misc/miredo/files/miredo.conf.2
+++ b/net-vpn/miredo/files/miredo.conf.2
diff --git a/net-misc/miredo/files/miredo.rc.2 b/net-vpn/miredo/files/miredo.rc.2
index c0ae6d0d1495..c0ae6d0d1495 100644
--- a/net-misc/miredo/files/miredo.rc.2
+++ b/net-vpn/miredo/files/miredo.rc.2
diff --git a/net-misc/miredo/metadata.xml b/net-vpn/miredo/metadata.xml
index 52ee8970cb99..52ee8970cb99 100644
--- a/net-misc/miredo/metadata.xml
+++ b/net-vpn/miredo/metadata.xml
diff --git a/net-misc/miredo/miredo-1.2.5-r2.ebuild b/net-vpn/miredo/miredo-1.2.5-r2.ebuild
index 74773d853de8..74773d853de8 100644
--- a/net-misc/miredo/miredo-1.2.5-r2.ebuild
+++ b/net-vpn/miredo/miredo-1.2.5-r2.ebuild
diff --git a/net-misc/miredo/miredo-1.2.6.ebuild b/net-vpn/miredo/miredo-1.2.6.ebuild
index 63494b5abd31..63494b5abd31 100644
--- a/net-misc/miredo/miredo-1.2.6.ebuild
+++ b/net-vpn/miredo/miredo-1.2.6.ebuild
diff --git a/net-misc/nstx/Manifest b/net-vpn/nstx/Manifest
index ee371c6c8439..ee371c6c8439 100644
--- a/net-misc/nstx/Manifest
+++ b/net-vpn/nstx/Manifest
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_00-linux-tuntap.patch b/net-vpn/nstx/files/nstx-1.1_beta6_00-linux-tuntap.patch
index 524fd705a86e..524fd705a86e 100644
--- a/net-misc/nstx/files/nstx-1.1_beta6_00-linux-tuntap.patch
+++ b/net-vpn/nstx/files/nstx-1.1_beta6_00-linux-tuntap.patch
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_01-bind-interface-name.patch b/net-vpn/nstx/files/nstx-1.1_beta6_01-bind-interface-name.patch
index 0d65f0f6d68b..0d65f0f6d68b 100644
--- a/net-misc/nstx/files/nstx-1.1_beta6_01-bind-interface-name.patch
+++ b/net-vpn/nstx/files/nstx-1.1_beta6_01-bind-interface-name.patch
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_02-warn-on-frag.patch b/net-vpn/nstx/files/nstx-1.1_beta6_02-warn-on-frag.patch
index 251ad583150b..251ad583150b 100644
--- a/net-misc/nstx/files/nstx-1.1_beta6_02-warn-on-frag.patch
+++ b/net-vpn/nstx/files/nstx-1.1_beta6_02-warn-on-frag.patch
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_03-delete-dwrite.patch b/net-vpn/nstx/files/nstx-1.1_beta6_03-delete-dwrite.patch
index e943fa106b73..e943fa106b73 100644
--- a/net-misc/nstx/files/nstx-1.1_beta6_03-delete-dwrite.patch
+++ b/net-vpn/nstx/files/nstx-1.1_beta6_03-delete-dwrite.patch
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_04-delete-werror.patch b/net-vpn/nstx/files/nstx-1.1_beta6_04-delete-werror.patch
index 35f7d0199b9d..35f7d0199b9d 100644
--- a/net-misc/nstx/files/nstx-1.1_beta6_04-delete-werror.patch
+++ b/net-vpn/nstx/files/nstx-1.1_beta6_04-delete-werror.patch
diff --git a/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch b/net-vpn/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch
index 47edb029edb9..47edb029edb9 100644
--- a/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch
+++ b/net-vpn/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch
diff --git a/net-misc/nstx/files/nstxcd.conf b/net-vpn/nstx/files/nstxcd.conf
index a04b9d09571e..a04b9d09571e 100644
--- a/net-misc/nstx/files/nstxcd.conf
+++ b/net-vpn/nstx/files/nstxcd.conf
diff --git a/net-misc/nstx/files/nstxcd.init b/net-vpn/nstx/files/nstxcd.init
index 444358970731..444358970731 100644
--- a/net-misc/nstx/files/nstxcd.init
+++ b/net-vpn/nstx/files/nstxcd.init
diff --git a/net-misc/nstx/files/nstxd.conf b/net-vpn/nstx/files/nstxd.conf
index 4d3365a7142d..4d3365a7142d 100644
--- a/net-misc/nstx/files/nstxd.conf
+++ b/net-vpn/nstx/files/nstxd.conf
diff --git a/net-misc/nstx/files/nstxd.init b/net-vpn/nstx/files/nstxd.init
index 2bf2a4133251..2bf2a4133251 100644
--- a/net-misc/nstx/files/nstxd.init
+++ b/net-vpn/nstx/files/nstxd.init
diff --git a/net-misc/nstx/metadata.xml b/net-vpn/nstx/metadata.xml
index 79d462e85571..79d462e85571 100644
--- a/net-misc/nstx/metadata.xml
+++ b/net-vpn/nstx/metadata.xml
diff --git a/net-misc/nstx/nstx-1.1_beta6-r3.ebuild b/net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
index 05ca76aca0d5..05ca76aca0d5 100644
--- a/net-misc/nstx/nstx-1.1_beta6-r3.ebuild
+++ b/net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
diff --git a/net-misc/tor/Manifest b/net-vpn/tor/Manifest
index 8ff6c084d0f2..8ff6c084d0f2 100644
--- a/net-misc/tor/Manifest
+++ b/net-vpn/tor/Manifest
diff --git a/net-misc/tor/files/README.gentoo b/net-vpn/tor/files/README.gentoo
index 35214ac6fbb5..35214ac6fbb5 100644
--- a/net-misc/tor/files/README.gentoo
+++ b/net-vpn/tor/files/README.gentoo
diff --git a/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch b/net-vpn/tor/files/tor-0.2.7.4-torrc.sample.patch
index 92eb03bb18ea..92eb03bb18ea 100644
--- a/net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch
+++ b/net-vpn/tor/files/tor-0.2.7.4-torrc.sample.patch
diff --git a/net-misc/tor/files/tor.conf b/net-vpn/tor/files/tor.conf
index 188c041e5442..188c041e5442 100644
--- a/net-misc/tor/files/tor.conf
+++ b/net-vpn/tor/files/tor.conf
diff --git a/net-misc/tor/files/tor.confd b/net-vpn/tor/files/tor.confd
index 4195bf3237b2..4195bf3237b2 100644
--- a/net-misc/tor/files/tor.confd
+++ b/net-vpn/tor/files/tor.confd
diff --git a/net-misc/tor/files/tor.initd-r8 b/net-vpn/tor/files/tor.initd-r8
index de9b66eb555b..de9b66eb555b 100644
--- a/net-misc/tor/files/tor.initd-r8
+++ b/net-vpn/tor/files/tor.initd-r8
diff --git a/net-misc/tor/files/tor.service b/net-vpn/tor/files/tor.service
index 8fcc6740ed91..8fcc6740ed91 100644
--- a/net-misc/tor/files/tor.service
+++ b/net-vpn/tor/files/tor.service
diff --git a/net-misc/tor/files/torrc-r1 b/net-vpn/tor/files/torrc-r1
index 322a794aa1d5..322a794aa1d5 100644
--- a/net-misc/tor/files/torrc-r1
+++ b/net-vpn/tor/files/torrc-r1
diff --git a/net-misc/tor/metadata.xml b/net-vpn/tor/metadata.xml
index 80fbc720fea8..80fbc720fea8 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-vpn/tor/metadata.xml
diff --git a/net-misc/tor/tor-0.2.8.12.ebuild b/net-vpn/tor/tor-0.2.8.12.ebuild
index 0b5f4d0f361d..0b5f4d0f361d 100644
--- a/net-misc/tor/tor-0.2.8.12.ebuild
+++ b/net-vpn/tor/tor-0.2.8.12.ebuild
diff --git a/net-misc/tor/tor-0.2.9.10.ebuild b/net-vpn/tor/tor-0.2.9.10.ebuild
index 035d07ef861f..035d07ef861f 100644
--- a/net-misc/tor/tor-0.2.9.10.ebuild
+++ b/net-vpn/tor/tor-0.2.9.10.ebuild
diff --git a/net-misc/tor/tor-0.2.9.9.ebuild b/net-vpn/tor/tor-0.2.9.9.ebuild
index 035d07ef861f..035d07ef861f 100644
--- a/net-misc/tor/tor-0.2.9.9.ebuild
+++ b/net-vpn/tor/tor-0.2.9.9.ebuild
diff --git a/net-misc/tor/tor-0.3.0.3_alpha.ebuild b/net-vpn/tor/tor-0.3.0.3_alpha.ebuild
index b103e82a8aed..b103e82a8aed 100644
--- a/net-misc/tor/tor-0.3.0.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.0.3_alpha.ebuild
diff --git a/net-misc/tor/tor-0.3.0.4_rc.ebuild b/net-vpn/tor/tor-0.3.0.4_rc.ebuild
index b103e82a8aed..b103e82a8aed 100644
--- a/net-misc/tor/tor-0.3.0.4_rc.ebuild
+++ b/net-vpn/tor/tor-0.3.0.4_rc.ebuild
diff --git a/net-misc/vtun/Manifest b/net-vpn/vtun/Manifest
index 3ef73fee68db..3ef73fee68db 100644
--- a/net-misc/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
diff --git a/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch b/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
index 15b3bf273c34..15b3bf273c34 100644
--- a/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
+++ b/net-vpn/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
diff --git a/net-misc/vtun/files/vtun-3.0.3-gcc5.patch b/net-vpn/vtun/files/vtun-3.0.3-gcc5.patch
index 99c6531d7268..99c6531d7268 100644
--- a/net-misc/vtun/files/vtun-3.0.3-gcc5.patch
+++ b/net-vpn/vtun/files/vtun-3.0.3-gcc5.patch
diff --git a/net-misc/vtun/files/vtun-3.0.3-includes.patch b/net-vpn/vtun/files/vtun-3.0.3-includes.patch
index cd7cf6a2a2ee..cd7cf6a2a2ee 100644
--- a/net-misc/vtun/files/vtun-3.0.3-includes.patch
+++ b/net-vpn/vtun/files/vtun-3.0.3-includes.patch
diff --git a/net-misc/vtun/files/vtun.rc b/net-vpn/vtun/files/vtun.rc
index 7ef322985043..7ef322985043 100644
--- a/net-misc/vtun/files/vtun.rc
+++ b/net-vpn/vtun/files/vtun.rc
diff --git a/net-misc/vtun/files/vtund-start.conf b/net-vpn/vtun/files/vtund-start.conf
index 01de38322f48..01de38322f48 100644
--- a/net-misc/vtun/files/vtund-start.conf
+++ b/net-vpn/vtun/files/vtund-start.conf
diff --git a/net-misc/vtun/metadata.xml b/net-vpn/vtun/metadata.xml
index 6c796b6d02c5..6c796b6d02c5 100644
--- a/net-misc/vtun/metadata.xml
+++ b/net-vpn/vtun/metadata.xml
diff --git a/net-misc/vtun/vtun-3.0.3.ebuild b/net-vpn/vtun/vtun-3.0.3.ebuild
index 153cff659a9f..153cff659a9f 100644
--- a/net-misc/vtun/vtun-3.0.3.ebuild
+++ b/net-vpn/vtun/vtun-3.0.3.ebuild
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 094f723b762f..d75d9059a8a7 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -233,7 +233,7 @@ dev-ruby/rack-test test
 
 # Anthony G. Basile <blueness@gentoo.org> (21 Aug 2012)
 # Does not work on ppc/ppc64
-net-misc/tor tor-hardening
+net-vpn/tor tor-hardening
 
 # Brent Baude <ranger@gentoo.org> (06 Mar 2012)
 # masking kde on gajim
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 6380559968d1..806cf28f4c01 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -3,7 +3,7 @@
 
 # Jeroen Roovers <jer@gentoo.org> <16 Jan 2017>
 # Incomplete support, bug #605878.
-net-misc/tor seccomp
+net-vpn/tor seccomp
 
 # Jeroen Roovers <jer@gentoo.org> <5 Feb 2017>
 # media-libs/libilbc has not been ported to PPC64
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 95acd22ee276..225b927b70a8 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -19,3 +19,16 @@ 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
+move net-misc/vtun net-vpn/vtun
+move net-misc/miredo net-vpn/miredo
+move net-misc/isatapd net-vpn/isatapd
+move net-misc/iodine net-vpn/iodine
+move net-misc/corkscrew net-vpn/corkscrew
+move net-misc/aiccu net-vpn/aiccu
+move net-misc/htun net-vpn/htun
+move net-misc/httptunnel net-vpn/httptunnel
+move net-misc/nstx net-vpn/nstx
+move net-misc/6tunnel net-vpn/6tunnel
+move net-misc/i2pd net-vpn/i2pd
+move net-misc/tor net-vpn/tor
+move net-p2p/i2p net-vpn/i2p