Second half of net-vpn/ move

diff --git a/net-libs/stem/stem-1.3.0.ebuild b/net-libs/stem/stem-1.3.0.ebuild
index 7570c252e822dadc136ed44acb8c4ff62ecafe19..2a3864161696bc53a31d7b6a5f26a5b475f0183a 100644 (file)
--- 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 08b4fb426f18290226d723a8540b3092229ac0a0..63e61e8dbcd7f57bfdce4d96bcbb02f763c296a6 100644 (file)
--- 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 08b4fb426f18290226d723a8540b3092229ac0a0..63e61e8dbcd7f57bfdce4d96bcbb02f763c296a6 100644 (file)
--- 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 49eb44f8104f8ef00629b470ac1276b20fde1ff4..5dbeb5e8928ed5659ff6feec7395a532a119a506 100644 (file)
--- 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 5d2a430a36282203eb19295fd63aeda8a9145fbc..2493b1e207bfa480edcd61214143de5adada4c86 100644 (file)
--- 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 190464f1b87076ca5a65d3b74b68cf19559622c9..69b319c282dca71d739fa27860dc9374d77aa399 100644 (file)
--- 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 f4b4fefe73ad1c8e6000e70e3dd6f05528d9c4b8..2a05500a006755af58a0281e98befabf09a7e0c2 100644 (file)
--- 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
similarity index 100%
rename from net-misc/6tunnel/6tunnel-0.10.ebuild
rename to 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
similarity index 100%
rename from net-misc/6tunnel/6tunnel-0.11_rc1.ebuild
rename to 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
similarity index 100%
rename from net-misc/6tunnel/6tunnel-0.12.ebuild
rename to net-vpn/6tunnel/6tunnel-0.12.ebuild

diff --git a/net-misc/6tunnel/Manifest b/net-vpn/6tunnel/Manifest
similarity index 100%
rename from net-misc/6tunnel/Manifest
rename to net-vpn/6tunnel/Manifest

diff --git a/net-misc/6tunnel/metadata.xml b/net-vpn/6tunnel/metadata.xml
similarity index 100%
rename from net-misc/6tunnel/metadata.xml
rename to net-vpn/6tunnel/metadata.xml

diff --git a/net-misc/aiccu/Manifest b/net-vpn/aiccu/Manifest
similarity index 100%
rename from net-misc/aiccu/Manifest
rename to 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
similarity index 100%
rename from net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
rename to 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
similarity index 100%
rename from net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch
rename to 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
similarity index 100%
rename from net-misc/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
rename to 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
similarity index 100%
rename from net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
rename to 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
similarity index 100%
rename from net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch
rename to 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
similarity index 100%
rename from net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch
rename to 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
similarity index 100%
rename from net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch
rename to net-vpn/aiccu/files/aiccu-2007.01.15-uclibc.patch

diff --git a/net-misc/aiccu/metadata.xml b/net-vpn/aiccu/metadata.xml
similarity index 100%
rename from net-misc/aiccu/metadata.xml
rename to net-vpn/aiccu/metadata.xml

diff --git a/net-misc/corkscrew/Manifest b/net-vpn/corkscrew/Manifest
similarity index 100%
rename from net-misc/corkscrew/Manifest
rename to net-vpn/corkscrew/Manifest

diff --git a/net-misc/corkscrew/corkscrew-2.0.ebuild b/net-vpn/corkscrew/corkscrew-2.0.ebuild
similarity index 100%
rename from net-misc/corkscrew/corkscrew-2.0.ebuild
rename to net-vpn/corkscrew/corkscrew-2.0.ebuild

diff --git a/net-misc/corkscrew/metadata.xml b/net-vpn/corkscrew/metadata.xml
similarity index 100%
rename from net-misc/corkscrew/metadata.xml
rename to net-vpn/corkscrew/metadata.xml

diff --git a/net-misc/httptunnel/Manifest b/net-vpn/httptunnel/Manifest
similarity index 100%
rename from net-misc/httptunnel/Manifest
rename to 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
similarity index 100%
rename from net-misc/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
rename to 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
similarity index 100%
rename from net-misc/httptunnel/httptunnel-3.3-r2.ebuild
rename to net-vpn/httptunnel/httptunnel-3.3-r2.ebuild

diff --git a/net-misc/httptunnel/metadata.xml b/net-vpn/httptunnel/metadata.xml
similarity index 100%
rename from net-misc/httptunnel/metadata.xml
rename to net-vpn/httptunnel/metadata.xml

diff --git a/net-misc/htun/Manifest b/net-vpn/htun/Manifest
similarity index 100%
rename from net-misc/htun/Manifest
rename to net-vpn/htun/Manifest

diff --git a/net-misc/htun/files/README.gentoo b/net-vpn/htun/files/README.gentoo
similarity index 100%
rename from net-misc/htun/files/README.gentoo
rename to 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
similarity index 100%
rename from net-misc/htun/files/htun-0.9.6-glibc.patch
rename to 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
similarity index 100%
rename from net-misc/htun/files/htun-0.9.6-makefile.patch
rename to 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
similarity index 100%
rename from net-misc/htun/htun-0.9.6.ebuild
rename to net-vpn/htun/htun-0.9.6.ebuild

diff --git a/net-misc/htun/metadata.xml b/net-vpn/htun/metadata.xml
similarity index 100%
rename from net-misc/htun/metadata.xml
rename to net-vpn/htun/metadata.xml

diff --git a/net-p2p/i2p/Manifest b/net-vpn/i2p/Manifest
similarity index 100%
rename from net-p2p/i2p/Manifest
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.26-add_libs.patch
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.26.initd
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.26.service
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.27-add_libs.patch
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.27.initd
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.27.service
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.28-add_libs.patch
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.28.initd
rename to 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
similarity index 100%
rename from net-p2p/i2p/files/i2p-0.9.28.service
rename to 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
similarity index 100%
rename from net-p2p/i2p/i2p-0.9.26.ebuild
rename to 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
similarity index 100%
rename from net-p2p/i2p/i2p-0.9.27.ebuild
rename to 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
similarity index 100%
rename from net-p2p/i2p/i2p-0.9.28.ebuild
rename to net-vpn/i2p/i2p-0.9.28.ebuild

diff --git a/net-p2p/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
similarity index 100%
rename from net-p2p/i2p/metadata.xml
rename to net-vpn/i2p/metadata.xml

diff --git a/net-misc/i2pd/Manifest b/net-vpn/i2pd/Manifest
similarity index 100%
rename from net-misc/i2pd/Manifest
rename to net-vpn/i2pd/Manifest

diff --git a/net-misc/i2pd/files/99i2pd b/net-vpn/i2pd/files/99i2pd
similarity index 100%
rename from net-misc/i2pd/files/99i2pd
rename to 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
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
rename to 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
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.6.0-r3.confd
rename to 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
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.6.0-r3.initd
rename to 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
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.6.0-r3.logrotate
rename to 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
similarity index 100%
rename from net-misc/i2pd/files/i2pd-2.6.0-r3.service
rename to 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
similarity index 100%
rename from net-misc/i2pd/i2pd-2.11.0.ebuild
rename to 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
similarity index 100%
rename from net-misc/i2pd/i2pd-2.12.0.ebuild
rename to net-vpn/i2pd/i2pd-2.12.0.ebuild

diff --git a/net-misc/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
similarity index 100%
rename from net-misc/i2pd/metadata.xml
rename to net-vpn/i2pd/metadata.xml

diff --git a/net-misc/iodine/Manifest b/net-vpn/iodine/Manifest
similarity index 100%
rename from net-misc/iodine/Manifest
rename to 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
similarity index 100%
rename from net-misc/iodine/files/iodine-0.7.0-TestMessage.patch
rename to 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
similarity index 100%
rename from net-misc/iodine/files/iodine-0.7.0-new-systemd.patch
rename to 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
similarity index 100%
rename from net-misc/iodine/files/iodined-1.init
rename to net-vpn/iodine/files/iodined-1.init

diff --git a/net-misc/iodine/files/iodined.conf b/net-vpn/iodine/files/iodined.conf
similarity index 100%
rename from net-misc/iodine/files/iodined.conf
rename to 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
similarity index 100%
rename from net-misc/iodine/iodine-0.7.0-r2.ebuild
rename to net-vpn/iodine/iodine-0.7.0-r2.ebuild

diff --git a/net-misc/iodine/metadata.xml b/net-vpn/iodine/metadata.xml
similarity index 100%
rename from net-misc/iodine/metadata.xml
rename to net-vpn/iodine/metadata.xml

diff --git a/net-misc/isatapd/Manifest b/net-vpn/isatapd/Manifest
similarity index 100%
rename from net-misc/isatapd/Manifest
rename to net-vpn/isatapd/Manifest

diff --git a/net-misc/isatapd/files/isatapd.service-r2 b/net-vpn/isatapd/files/isatapd.service-r2
similarity index 100%
rename from net-misc/isatapd/files/isatapd.service-r2
rename to 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
similarity index 100%
rename from net-misc/isatapd/files/isatapd.service.conf
rename to 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
similarity index 100%
rename from net-misc/isatapd/isatapd-0.9.7-r2.ebuild
rename to net-vpn/isatapd/isatapd-0.9.7-r2.ebuild

diff --git a/net-misc/isatapd/metadata.xml b/net-vpn/isatapd/metadata.xml
similarity index 100%
rename from net-misc/isatapd/metadata.xml
rename to net-vpn/isatapd/metadata.xml

diff --git a/net-misc/miredo/Manifest b/net-vpn/miredo/Manifest
similarity index 100%
rename from net-misc/miredo/Manifest
rename to 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
similarity index 100%
rename from net-misc/miredo/files/miredo-1.2.5-configure-libcap.diff
rename to 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
similarity index 100%
rename from net-misc/miredo/files/miredo-1.2.5-ip-path.patch
rename to 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
similarity index 100%
rename from net-misc/miredo/files/miredo.conf.2
rename to 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
similarity index 100%
rename from net-misc/miredo/files/miredo.rc.2
rename to net-vpn/miredo/files/miredo.rc.2

diff --git a/net-misc/miredo/metadata.xml b/net-vpn/miredo/metadata.xml
similarity index 100%
rename from net-misc/miredo/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/miredo/miredo-1.2.5-r2.ebuild
rename to 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
similarity index 100%
rename from net-misc/miredo/miredo-1.2.6.ebuild
rename to net-vpn/miredo/miredo-1.2.6.ebuild

diff --git a/net-misc/nstx/Manifest b/net-vpn/nstx/Manifest
similarity index 100%
rename from net-misc/nstx/Manifest
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstx-1.1_beta6_00-linux-tuntap.patch
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstx-1.1_beta6_01-bind-interface-name.patch
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstx-1.1_beta6_02-warn-on-frag.patch
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstx-1.1_beta6_03-delete-dwrite.patch
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstx-1.1_beta6_04-delete-werror.patch
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch
rename to 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
similarity index 100%
rename from net-misc/nstx/files/nstxcd.conf
rename to net-vpn/nstx/files/nstxcd.conf

diff --git a/net-misc/nstx/files/nstxcd.init b/net-vpn/nstx/files/nstxcd.init
similarity index 100%
rename from net-misc/nstx/files/nstxcd.init
rename to net-vpn/nstx/files/nstxcd.init

diff --git a/net-misc/nstx/files/nstxd.conf b/net-vpn/nstx/files/nstxd.conf
similarity index 100%
rename from net-misc/nstx/files/nstxd.conf
rename to net-vpn/nstx/files/nstxd.conf

diff --git a/net-misc/nstx/files/nstxd.init b/net-vpn/nstx/files/nstxd.init
similarity index 100%
rename from net-misc/nstx/files/nstxd.init
rename to net-vpn/nstx/files/nstxd.init

diff --git a/net-misc/nstx/metadata.xml b/net-vpn/nstx/metadata.xml
similarity index 100%
rename from net-misc/nstx/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/nstx/nstx-1.1_beta6-r3.ebuild
rename to net-vpn/nstx/nstx-1.1_beta6-r3.ebuild

diff --git a/net-misc/tor/Manifest b/net-vpn/tor/Manifest
similarity index 100%
rename from net-misc/tor/Manifest
rename to net-vpn/tor/Manifest

diff --git a/net-misc/tor/files/README.gentoo b/net-vpn/tor/files/README.gentoo
similarity index 100%
rename from net-misc/tor/files/README.gentoo
rename to 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
similarity index 100%
rename from net-misc/tor/files/tor-0.2.7.4-torrc.sample.patch
rename to 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
similarity index 100%
rename from net-misc/tor/files/tor.conf
rename to net-vpn/tor/files/tor.conf

diff --git a/net-misc/tor/files/tor.confd b/net-vpn/tor/files/tor.confd
similarity index 100%
rename from net-misc/tor/files/tor.confd
rename to net-vpn/tor/files/tor.confd

diff --git a/net-misc/tor/files/tor.initd-r8 b/net-vpn/tor/files/tor.initd-r8
similarity index 100%
rename from net-misc/tor/files/tor.initd-r8
rename to net-vpn/tor/files/tor.initd-r8

diff --git a/net-misc/tor/files/tor.service b/net-vpn/tor/files/tor.service
similarity index 100%
rename from net-misc/tor/files/tor.service
rename to net-vpn/tor/files/tor.service

diff --git a/net-misc/tor/files/torrc-r1 b/net-vpn/tor/files/torrc-r1
similarity index 100%
rename from net-misc/tor/files/torrc-r1
rename to net-vpn/tor/files/torrc-r1

diff --git a/net-misc/tor/metadata.xml b/net-vpn/tor/metadata.xml
similarity index 100%
rename from net-misc/tor/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/tor/tor-0.2.8.12.ebuild
rename to 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
similarity index 100%
rename from net-misc/tor/tor-0.2.9.10.ebuild
rename to 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
similarity index 100%
rename from net-misc/tor/tor-0.2.9.9.ebuild
rename to 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
similarity index 100%
rename from net-misc/tor/tor-0.3.0.3_alpha.ebuild
rename to 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
similarity index 100%
rename from net-misc/tor/tor-0.3.0.4_rc.ebuild
rename to net-vpn/tor/tor-0.3.0.4_rc.ebuild

diff --git a/net-misc/vtun/Manifest b/net-vpn/vtun/Manifest
similarity index 100%
rename from net-misc/vtun/Manifest
rename to 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
similarity index 100%
rename from net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
rename to 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
similarity index 100%
rename from net-misc/vtun/files/vtun-3.0.3-gcc5.patch
rename to 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
similarity index 100%
rename from net-misc/vtun/files/vtun-3.0.3-includes.patch
rename to 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
similarity index 100%
rename from net-misc/vtun/files/vtun.rc
rename to net-vpn/vtun/files/vtun.rc

diff --git a/net-misc/vtun/files/vtund-start.conf b/net-vpn/vtun/files/vtund-start.conf
similarity index 100%
rename from net-misc/vtun/files/vtund-start.conf
rename to net-vpn/vtun/files/vtund-start.conf

diff --git a/net-misc/vtun/metadata.xml b/net-vpn/vtun/metadata.xml
similarity index 100%
rename from net-misc/vtun/metadata.xml
rename to 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
similarity index 100%
rename from net-misc/vtun/vtun-3.0.3.ebuild
rename to 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 094f723b762f532feb2441fa358067631601ce7e..d75d9059a8a7abbb18055c64955a362a5eb47b6e 100644 (file)
--- 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 6380559968d1dc92507c65adc7a0204b019dd006..806cf28f4c0121a77d084f4abd698b5a05b7328f 100644 (file)
--- 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 95acd22ee27693f8dea610cddfd876facd1b80b7..225b927b70a8e76c04c0f1c2378982471f52acb9 100644 (file)
--- 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