12 files changed, 123 insertions, 241 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index 182b47b6ad68..caf97a5897f6 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,81 +1,6 @@
 # ChangeLog for net-fs/shfs
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.21 2005/10/06 12:29:36 agriffis Exp $
-
-  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r1.ebuild:
-  Mark 0.35-r1 ~alpha
-
-  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> shfs-0.35-r1.ebuild:
-  Stable on ppc.
-
-  09 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  +files/0.35/shfs-0.35-gcc4.patch:
-  Adding patch to fix compilation with GCC4
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> shfs-0.35-r1.ebuild:
-  stable on amd64
-
-  19 Dec 2004; Stuart Herbert <stuart@gentoo.org> +files/0.35/df.patch,
-  +files/0.35/space_chars.patch, +files/0.35/uidgid32.patch:
-  Added patches; see bug #60270; thanks to S.Caglar Onur
-  <caglar.onur@tubitak.gov.tr>
-
-  14 Dec 2004; Stuart Herbert <stuart@gentoo.org> shfs-0.35.ebuild:
-  Marked stable on x86 after plenty of user feedback ;)
-
-*shfs-0.35 (26 Jun 2004)
-
-  26 Jun 2004; Stuart Herbert <stuart@gentoo.org> +shfs-0.35.ebuild:
-  Version bump; closes bug #52711
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> shfs-0.31-r1.ebuild,
-  shfs-0.31.ebuild, shfs-0.32-r1.ebuild, shfs-0.32.ebuild, shfs-0.34.ebuild:
-  Fix use invocation
-
-*shfs-0.34 (28 May 2004)
-
-  28 May 2004; Stuart Herbert <stuart@gentoo.org> shfs-0.34.ebuild:
-  Version bump; for bug #45642
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> shfs-0.31-r1.ebuild,
-  shfs-0.31.ebuild, shfs-0.32-r1.ebuild:
-  Add inherit eutils
-
-*shfs-0.32-r1 (16 Apr 2004)
-
-  16 Apr 2004; <coxj@gentoo.org> shfs-0.32-r1.ebuild,
-  files/shfs-gentoo-0.32-makefile-debug.diff:
-  Patch to prevent extra debug info.
-
-  05 Jan 2004; zhen <zhen@gentoo.org> metadata.xml:
-  adding to net-fs herd
-
-  30 Dec 2003; Luca Barbato <lu_zero@gentoo.org> shfs-0.32.ebuild:
-  Minor fix (bug #35309)
-
-  11 Nov 2003; Luca Barbato <lu_zero@gentoo.org> shfs-0.32.ebuild:
-  Minor fix, thanks to Sven Wegener <sven.wegener@stealer.net>
-
-*shfs-0.32 (11 Nov 2003)
-
-  11 Nov 2003; Luca Barbato <lu_zero@gentoo.org> shfs-0.32.ebuild:
-  New version, linux-2.6 support available.
-
-  21 Oct 2003; <lu_zero@gentoo.org> shfs-0.31-r1.ebuild: Fixed the ppc patch 
-  and made it use src_unpack. Works again on ppc.
-
-  16 Oct 2003; <drobbins@gentoo.org> shfs-0.31-r1.ebuild: Now works on AMD64;
-  much thanks to Ray Russell Reese III <russ@zerotech.net> for submitting this
-  fix (see bug #31175)
-  
-  12 Jun 2003; <msterret@gentoo.org> shfs-0.31-r1.ebuild, shfs-0.31.ebuild: add
-  Header
-
-*shfs-0.31-r1 (06 Jun 2003)
-
-  06 Jun 2003; Dylan Carlson <absinthe@gentoo.org> shfs-0.31-r1.ebuild:
-  More secure permissions on the mount binaries, and some helpful notes after
-  package install.
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.1 2003/06/03 07:38:29 absinthe Exp $
 
 *shfs-0.31 (03 Jun 2003)
 
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index bf6f80c7d00b..bf660a2cf48f 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -1,27 +1,8 @@
-MD5 9e3de9f34b9e3248eb5ff2e24ad1c819 metadata.xml 281
-MD5 1d9abad4621b197770b9a51af0b30b3c shfs-0.32-r1.ebuild 2785
-MD5 098598517d25c65c60d53dbc694dd258 ChangeLog 3367
-MD5 9fd35ed0dc3f15a6987bbed454c7e1d6 shfs-0.31-r1.ebuild 2405
-MD5 e0a9db74aed1ff9f83c2b92f891acbad shfs-0.35.ebuild 2821
-MD5 10811b8bc051a21e88f984d36e366428 shfs-0.32.ebuild 2699
-MD5 87330200e9d73380dd03d7f3b6b28b6a shfs-0.34.ebuild 2822
-MD5 7b0f99afbccc7ba0cb5199a72eb072b1 shfs-0.35-r1.ebuild 2862
-MD5 d651ff3bd72489e0257c8b1f53c73056 shfs-0.31.ebuild 1757
-MD5 cad92b9330844a369507b489cf37d18c files/digest-shfs-0.34 61
-MD5 50149869ad714fe5e5b4e9e0a94359ca files/digest-shfs-0.32-r1 60
-MD5 8bdaeb75d54befa6b5d6f2bfe6657a60 files/digest-shfs-0.35 61
-MD5 8bdaeb75d54befa6b5d6f2bfe6657a60 files/digest-shfs-0.35-r1 61
+MD5 7bbbaeef212f17eeb8de0d47ee8576c6 shfs-0.31.ebuild 1658
+MD5 ec8c8284064be4f553d3f99cc830efc7 ChangeLog 770
+MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
+MD5 63b7ebc6673ade1ddb13ba9218bea4e9 files/amd.conf 841
 MD5 97e8d1e483ac538a072e0e82af787eeb files/amd.shfs 152
+MD5 2b5d290ea6b4e294eb222f277012263b files/shfs.mount 1342
+MD5 d9ef6cc568f7b1bde782bcb637f31230 files/shfs-gentoo-0.31-ppc.diff 771
 MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31 62
-MD5 bdf9a4a620ff5bcd7828251c144ec02b files/shfs.mount 1346
-MD5 307c4e9fea61efad863724d214fcb916 files/shfs-amd64-makefile.patch 653
-MD5 dadc96e2e75365f207cbb3e90f565821 files/shfs-gentoo-0.31-ppc.diff 707
-MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31-r1 62
-MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
-MD5 6313c7875b293c2a942bdad09f3937cc files/shfs-gentoo-0.32-makefile-debug.diff 657
-MD5 d9c3f912bc5642882b84fa7f3edd8db8 files/amd.conf 842
-MD5 50149869ad714fe5e5b4e9e0a94359ca files/digest-shfs-0.32 60
-MD5 aa8bade7210ab4840af4a009378a96c3 files/0.35/shfs-0.35-gcc4.patch 1008
-MD5 29b3f063e5feb8c259abc86d07f92f85 files/0.35/df.patch 1652
-MD5 29e5b080a1744f8283b8f55d5b904a60 files/0.35/uidgid32.patch 940
-MD5 e5f37f793e95acdfd8e89affe9949160 files/0.35/space_chars.patch 1276
diff --git a/net-fs/shfs/files/shfs-gentoo-0.31-ppc.diff b/net-fs/shfs/files/shfs-gentoo-0.31-ppc.diff
index faa431f60aaa..5d7b84694ee0 100644
--- a/net-fs/shfs/files/shfs-gentoo-0.31-ppc.diff
+++ b/net-fs/shfs/files/shfs-gentoo-0.31-ppc.diff
@@ -1,5 +1,5 @@
-*** shfs-0.31-1.orig/shfs/Makefile	Sun Jun  1 23:47:27 2003
---- shfs-0.31-1/shfs/Makefile	Sun Jun  1 23:47:58 2003
+*** /var/tmp/portage/shfs-0.31/work/shfs-0.31-1.orig/shfs/Makefile	Sun Jun  1 23:47:27 2003
+--- /var/tmp/portage/shfs-0.31/work/shfs-0.31-1/shfs/Makefile	Sun Jun  1 23:47:58 2003
 *************** SEARCHDIRS := -I- -I. -I${KERNEL_SOURCES
 *** 17,23 ****
   CC     := gcc
diff --git a/net-fs/shfs/files/shfs.mount b/net-fs/shfs/files/shfs.mount
index b69fde488bae..e9be033da164 100644
--- a/net-fs/shfs/files/shfs.mount
+++ b/net-fs/shfs/files/shfs.mount
@@ -21,8 +21,8 @@ case `basename $0` in
 	RUSER=`echo "$KEY" | cut -d"%" -f1`
 	RHOST=`echo "$KEY" | cut -d"%" -f2-`
 
-	SSH_AGENT_PID=`ps -C ssh-agent -opid=,uid= | sed -n "s/^[ \t]\{1,\}\([0-9]\{1,\}\)\{1,\}[ \t]\{1,\}$ID\$/\1/p" | tail -n 1`
-	SSH_AUTH_SOCK=`find /tmp -follow -maxdepth 4 -type s -user "$ID" | grep ssh | grep agent | tail -n 1`
+	SSH_AGENT_PID=`ps -C ssh-agent -opid=,uid= | sed -n "s/^[ \t]\{1,\}\([0-9]\{1,\}\)\{1,\}[ \t]\{1,\}$ID\$/\1/p" | tail -1`
+	SSH_AUTH_SOCK=`find /tmp -follow -maxdepth 4 -type s -user "$ID" | grep ssh | grep agent | tail -1`
 
 	if [ ! -z "$SSH_AGENT_PID" -a ! -z "$SSH_AUTH_SOCK" ]; then
 		export SSH_AGENT_PID SSH_AUTH_SOCK
diff --git a/net-fs/shfs/metadata.xml b/net-fs/shfs/metadata.xml
index beb7a62155aa..714be0db7012 100644
--- a/net-fs/shfs/metadata.xml
+++ b/net-fs/shfs/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 <herd>net-fs</herd>
 	<longdescription>Secure Shell File System</longdescription>
-<maintainer>
-	<email>stuart@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-fs/shfs/shfs-0.31-r1.ebuild b/net-fs/shfs/shfs-0.31-r1.ebuild
index 1da850e6e8ce..abb5d28c47d1 100644
--- a/net-fs/shfs/shfs-0.31-r1.ebuild
+++ b/net-fs/shfs/shfs-0.31-r1.ebuild
@@ -1,8 +1,5 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.31-r1.ebuild,v 1.11 2005/07/09 17:12:23 swegener Exp $
-
-inherit eutils
 
 IUSE="amd doc"
 
@@ -11,24 +8,16 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="Secure Shell File System"
 HOMEPAGE="http://shfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc amd64"
-
+SLOT="0"
+KEYWORDS="x86 ppc"
 DEPEND="virtual/linux-sources
 		net-misc/openssh
 		amd? ( net-fs/am-utils )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
+src_compile() {
 	epatch ${FILESDIR}/shfs-gentoo-${PV}-makefile-root.diff
 	use ppc && epatch ${FILESDIR}/shfs-gentoo-${PV}-ppc.diff
-	use amd64 && epatch ${FILESDIR}/shfs-amd64-makefile.patch
-}
-
-src_compile() {
 	emake || die
 }
 
@@ -39,7 +28,7 @@ src_install() {
 	cat Makefile.old | grep -v depmod > Makefile
 	einfo " Installing kernel module..."
 	make MODULESDIR=${D}/lib/modules/${KV} install || die
-
+	
 	# Install binaries
 	cd ${S}/shfsmount
 	dobin shfsmount
@@ -54,13 +43,13 @@ src_install() {
 	dodir /sbin
 	einfo " Adding /sbin/mount.shfs symlink..."
 	dosym /usr/bin/shfsmount /sbin/mount.shfs
-
+	
 	# Install docs
 	doman ${S}/docs/manpages/shfsmount.8 ${S}/docs/manpages/shfsumount.8
 	use doc && dohtml -r ${S}/docs/html
-
+	
 	# Install automount support (if desired)
-	if use amd ; then
+	if [ -n "`use amd`" ] ; then
 		einfo " Installing am-utils config files..."
 		insinto /etc/amd
 		doins ${FILESDIR}/amd.conf
@@ -75,19 +64,19 @@ pkg_postinst() {
 	echo "running depmod...."
 	depmod -aq || die
 
-	echo
+	echo " "
 	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	einfo " filesystems to into your local filesystem."
-	echo
-	echo
-	einfo " Note the following:"
-	einfo
-	einfo "   1.  The shfs.o kernel module has to be loaded first"
-	einfo "       before you can start mounting filesystems."
-	einfo "       Try: 'insmod shfs' as root."
-	einfo
-	einfo "   2.  When mounting, you must enter the absolute path of"
-	einfo "       the remote filesystem without any special chars,"
-	einfo "       such as tilde (~), for example."
-	echo
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs.o kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'insmod shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
 }
diff --git a/net-fs/shfs/shfs-0.31.ebuild b/net-fs/shfs/shfs-0.31.ebuild
index f79f29b6f119..f7a90cf408fd 100644
--- a/net-fs/shfs/shfs-0.31.ebuild
+++ b/net-fs/shfs/shfs-0.31.ebuild
@@ -1,8 +1,5 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.31.ebuild,v 1.6 2004/06/24 22:44:21 agriffis Exp $
-
-inherit eutils
 
 IUSE="amd doc"
 
@@ -31,7 +28,7 @@ src_install() {
 	cat Makefile.old | grep -v depmod > Makefile
 	einfo " Installing kernel module..."
 	make MODULESDIR=${D}/lib/modules/${KV} install || die
-
+	
 	# Install binaries
 	cd ${S}/shfsmount
 	dobin shfsmount
@@ -46,13 +43,13 @@ src_install() {
 	dodir /sbin
 	einfo " Adding /sbin/mount.shfs symlink..."
 	dosym /usr/bin/shfsmount /sbin/mount.shfs
-
+	
 	# Install docs
 	doman ${S}/docs/manpages/shfsmount.8 ${S}/docs/manpages/shfsumount.8
 	use doc && dohtml -r ${S}/docs/html
-
+	
 	# Install automount support (if desired)
-	if use amd ; then
+	if [ -n "`use amd`" ] ; then
 		einfo " Installing am-utils config files..."
 		insinto /etc/amd
 		doins ${FILESDIR}/amd.conf
diff --git a/net-fs/shfs/shfs-0.32-r1.ebuild b/net-fs/shfs/shfs-0.32-r1.ebuild
index 200b702f5abc..61d66dd6d217 100644
--- a/net-fs/shfs/shfs-0.32-r1.ebuild
+++ b/net-fs/shfs/shfs-0.32-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.32-r1.ebuild,v 1.5 2005/07/09 17:12:23 swegener Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.32-r1.ebuild,v 1.1 2004/04/17 00:42:08 steel300 Exp $
 
 IUSE="amd doc"
 
@@ -77,7 +75,7 @@ src_install() {
 	use doc && dohtml -r ${S}/docs/html
 
 	# Install automount support (if desired)
-	if use amd ; then
+	if [ -n "`use amd`" ] ; then
 		einfo " Installing am-utils config files..."
 		insinto /etc/amd
 		doins ${FILESDIR}/amd.conf
@@ -92,19 +90,19 @@ pkg_postinst() {
 	echo "running depmod...."
 	depmod -aq || die
 
-	echo
+	echo " "
 	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	einfo " filesystems to into your local filesystem."
-	echo
-	echo
-	einfo " Note the following:"
-	einfo
-	einfo "   1.  The shfs kernel module has to be loaded first"
-	einfo "       before you can start mounting filesystems."
-	einfo "       Try: 'modprobe shfs' as root."
-	einfo
-	einfo "   2.  When mounting, you must enter the absolute path of"
-	einfo "       the remote filesystem without any special chars,"
-	einfo "       such as tilde (~), for example."
-	echo
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'modprobe shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
 }
diff --git a/net-fs/shfs/shfs-0.32.ebuild b/net-fs/shfs/shfs-0.32.ebuild
index 495d18b55b9f..32294fb23926 100644
--- a/net-fs/shfs/shfs-0.32.ebuild
+++ b/net-fs/shfs/shfs-0.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.32.ebuild,v 1.8 2005/07/09 17:12:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.32.ebuild,v 1.1 2003/11/11 12:37:55 lu_zero Exp $
 
 IUSE="amd doc"
 
@@ -46,12 +46,7 @@ src_install() {
 
 	dodir /lib/modules/${KV}/kernel/fs/shfs/
 	insinto /lib/modules/${KV}/kernel/fs/shfs/
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
 	doins shfs.ko || die
-	else
-	doins shfs.o || die
-	fi
 
 # Install binaries
 	cd ${S}/shfsmount
@@ -73,7 +68,7 @@ src_install() {
 	use doc && dohtml -r ${S}/docs/html
 
 	# Install automount support (if desired)
-	if use amd ; then
+	if [ -n "`use amd`" ] ; then
 		einfo " Installing am-utils config files..."
 		insinto /etc/amd
 		doins ${FILESDIR}/amd.conf
@@ -88,19 +83,19 @@ pkg_postinst() {
 	echo "running depmod...."
 	depmod -aq || die
 
-	echo
+	echo " "
 	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	einfo " filesystems to into your local filesystem."
-	echo
-	echo
-	einfo " Note the following:"
-	einfo
-	einfo "   1.  The shfs kernel module has to be loaded first"
-	einfo "       before you can start mounting filesystems."
-	einfo "       Try: 'modprobe shfs' as root."
-	einfo
-	einfo "   2.  When mounting, you must enter the absolute path of"
-	einfo "       the remote filesystem without any special chars,"
-	einfo "       such as tilde (~), for example."
-	echo
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs.o kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'insmod shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
 }
diff --git a/net-fs/shfs/shfs-0.34.ebuild b/net-fs/shfs/shfs-0.34.ebuild
index 95fe28cc1989..e1c967685634 100644
--- a/net-fs/shfs/shfs-0.34.ebuild
+++ b/net-fs/shfs/shfs-0.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.34.ebuild,v 1.4 2005/07/09 17:12:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.34.ebuild,v 1.1 2004/05/28 20:28:19 stuart Exp $
 
 inherit eutils
 
@@ -79,7 +79,7 @@ src_install() {
 	use doc && dohtml -r ${S}/docs/html
 
 	# Install automount support (if desired)
-	if use amd ; then
+	if [ -n "`use amd`" ] ; then
 		einfo " Installing am-utils config files..."
 		insinto /etc/amd
 		doins ${FILESDIR}/amd.conf
@@ -94,19 +94,19 @@ pkg_postinst() {
 	echo "running depmod...."
 	depmod -aq || die
 
-	echo
+	echo " "
 	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	einfo " filesystems to into your local filesystem."
-	echo
-	echo
-	einfo " Note the following:"
-	einfo
-	einfo "   1.  The shfs kernel module has to be loaded first"
-	einfo "       before you can start mounting filesystems."
-	einfo "       Try: 'modprobe shfs' as root."
-	einfo
-	einfo "   2.  When mounting, you must enter the absolute path of"
-	einfo "       the remote filesystem without any special chars,"
-	einfo "       such as tilde (~), for example."
-	echo
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'modprobe shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
 }
diff --git a/net-fs/shfs/shfs-0.35-r1.ebuild b/net-fs/shfs/shfs-0.35-r1.ebuild
index 44755132aaa1..56f9513e5bf2 100644
--- a/net-fs/shfs/shfs-0.35-r1.ebuild
+++ b/net-fs/shfs/shfs-0.35-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r1.ebuild,v 1.5 2005/10/06 12:29:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r1.ebuild,v 1.1 2004/12/19 19:13:36 stuart Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://shfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
+KEYWORDS="x86 ~ppc ~amd64"
 DEPEND="virtual/linux-sources
 		net-misc/openssh
 		amd? ( net-fs/am-utils )"
@@ -95,19 +95,19 @@ pkg_postinst() {
 	echo "running depmod...."
 	depmod -aq || die
 
-	echo
+	echo " "
 	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	einfo " filesystems to into your local filesystem."
-	echo
-	echo
-	einfo " Note the following:"
-	einfo
-	einfo "   1.  The shfs kernel module has to be loaded first"
-	einfo "       before you can start mounting filesystems."
-	einfo "       Try: 'modprobe shfs' as root."
-	einfo
-	einfo "   2.  When mounting, you must enter the absolute path of"
-	einfo "       the remote filesystem without any special chars,"
-	einfo "       such as tilde (~), for example."
-	echo
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'modprobe shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
 }
diff --git a/net-fs/shfs/shfs-0.35.ebuild b/net-fs/shfs/shfs-0.35.ebuild
index f8f91dc4aeeb..3a6db006eef6 100644
--- a/net-fs/shfs/shfs-0.35.ebuild
+++ b/net-fs/shfs/shfs-0.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35.ebuild,v 1.3 2005/07/09 17:12:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35.ebuild,v 1.1 2004/06/26 21:55:47 stuart Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://shfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
 DEPEND="virtual/linux-sources
 		net-misc/openssh
 		amd? ( net-fs/am-utils )"
@@ -94,19 +94,19 @@ pkg_postinst() {
 	echo "running depmod...."
 	depmod -aq || die
 
-	echo
+	echo " "
 	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	einfo " filesystems to into your local filesystem."
-	echo
-	echo
-	einfo " Note the following:"
-	einfo
-	einfo "   1.  The shfs kernel module has to be loaded first"
-	einfo "       before you can start mounting filesystems."
-	einfo "       Try: 'modprobe shfs' as root."
-	einfo
-	einfo "   2.  When mounting, you must enter the absolute path of"
-	einfo "       the remote filesystem without any special chars,"
-	einfo "       such as tilde (~), for example."
-	echo
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'modprobe shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
 }