15 files changed, 10 insertions, 9 deletions
diff --git a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
index 28b7d95efba7..00f05e79ea43 100644
--- a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
+++ b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
@@ -61,6 +61,6 @@ pkg_postinst() {
 	elog "  sys-fs/ntfs3g[ntfsprogs]"
 	elog "  sys-fs/reiser4progs"
 	elog "  sys-fs/reiserfsprogs"
-	elog "  sys-fs/sshfs"
+	elog "  net-fs/sshfs"
 	elog "  sys-fs/xfsprogs"
 }
diff --git a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
index 852ac81010e7..024f25591193 100644
--- a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
+++ b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
@@ -61,6 +61,6 @@ pkg_postinst() {
 	elog "  sys-fs/ntfs3g[ntfsprogs]"
 	elog "  sys-fs/reiser4progs"
 	elog "  sys-fs/reiserfsprogs"
-	elog "  sys-fs/sshfs"
+	elog "  net-fs/sshfs"
 	elog "  sys-fs/xfsprogs"
 }
diff --git a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
index 7d40b62488cd..f19a55a86cce 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
@@ -50,7 +50,7 @@ PATCHES=(
 pkg_postinst(){
 	elog
 	elog "Optional dependency:"
-	elog "sys-fs/sshfs (for 'remote filesystem browser' plugin)"
+	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
 	elog
 	elog "The Android .apk file is available via"
 	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
diff --git a/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild b/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
index 0f6ba3a4ff91..5b40e3ea8165 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
@@ -73,7 +73,7 @@ pkg_postinst(){
 
 	elog
 	elog "Optional dependency:"
-	elog "sys-fs/sshfs (for 'remote filesystem browser' plugin)"
+	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
 	elog
 	elog "The Android .apk file is available via"
 	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
diff --git a/sys-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index 4ae6926a13aa..4ae6926a13aa 100644
--- a/sys-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
diff --git a/sys-fs/sshfs/metadata.xml b/net-fs/sshfs/metadata.xml
index 1dde05c3d522..1dde05c3d522 100644
--- a/sys-fs/sshfs/metadata.xml
+++ b/net-fs/sshfs/metadata.xml
diff --git a/sys-fs/sshfs/sshfs-2.5.ebuild b/net-fs/sshfs/sshfs-2.5.ebuild
index 6f3f9d6cec98..6f3f9d6cec98 100644
--- a/sys-fs/sshfs/sshfs-2.5.ebuild
+++ b/net-fs/sshfs/sshfs-2.5.ebuild
diff --git a/sys-fs/sshfs/sshfs-2.7.ebuild b/net-fs/sshfs/sshfs-2.7.ebuild
index eb362da6a354..eb362da6a354 100644
--- a/sys-fs/sshfs/sshfs-2.7.ebuild
+++ b/net-fs/sshfs/sshfs-2.7.ebuild
diff --git a/sys-fs/sshfs/sshfs-2.8.ebuild b/net-fs/sshfs/sshfs-2.8.ebuild
index 7f314272dd15..7f314272dd15 100644
--- a/sys-fs/sshfs/sshfs-2.8.ebuild
+++ b/net-fs/sshfs/sshfs-2.8.ebuild
diff --git a/net-misc/x2goserver/metadata.xml b/net-misc/x2goserver/metadata.xml
index 97992593fedf..95685e7bf243 100644
--- a/net-misc/x2goserver/metadata.xml
+++ b/net-misc/x2goserver/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<longdescription>The X2Go server</longdescription>
 	<use>
-		<flag name="fuse">Use <pkg>sys-fs/sshfs</pkg> to allow shared folders</flag>
+		<flag name="fuse">Use <pkg>net-fs/sshfs</pkg> to allow shared folders</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
index a37ce6f8d123..942d4905cde1 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	x11-apps/xauth
 	x11-apps/xhost
 	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs )
+	fuse? ( net-fs/sshfs )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
 
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild
index a03ed0b0856f..36dc6ea30101 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild
@@ -30,7 +30,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	x11-apps/xauth
 	x11-apps/xhost
 	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs )
+	fuse? ( net-fs/sshfs )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
 
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
index 6c7fb45f8096..adba17d011cd 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
@@ -29,7 +29,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	x11-apps/xauth
 	x11-apps/xhost
 	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs )
+	fuse? ( net-fs/sshfs )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
 
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 98b5a390db2d..2a289537fb6e 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -16,3 +16,4 @@ move sys-fs/btfs net-fs/btfs
 move sys-fs/s3fs net-fs/s3fs
 move sys-fs/s3ql net-fs/s3ql
 move sys-fs/s3backer net-fs/s3backer
+move sys-fs/sshfs net-fs/sshfs
diff --git a/sys-apps/udevil/udevil-0.4.4-r1.ebuild b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
index d151b78abc03..619435fa7fa7 100644
--- a/sys-apps/udevil/udevil-0.4.4-r1.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
@@ -59,7 +59,7 @@ pkg_postinst() {
 	elog "  net-fs/cifs-utils  (mounting samba shares)"
 	elog "  net-fs/curlftpfs   (mounting ftp shares)"
 	elog "  net-fs/nfs-utils   (mounting nfs shares)"
-	elog "  sys-fs/sshfs-fuse  (mounting sftp shares)"
+	elog "  net-fs/sshfs       (mounting sftp shares)"
 	elog "  virtual/eject      (eject via devmon)"
 	if ! has_version 'sys-fs/udisks' ; then
 		elog