unmask on amd64

4 files changed, 31 insertions, 11 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index b8be0ef7bf2e..0a336f0963cf 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for net-fs/shfs
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.3 2003/06/12 21:25:29 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.4 2003/10/16 15:15:16 drobbins Exp $
 
-  12 Jun 2003; <msterret@gentoo.org> shfs-0.31-r1.ebuild, shfs-0.31.ebuild:
-  add Header
+  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)
 
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index da85595068cf..586ab8c1ee04 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -1,10 +1,11 @@
-MD5 8dbdc25a48b9120a5835d14be17d41fe ChangeLog 1145
 MD5 6075e6f8e572e5c88478b3a09ec234cb shfs-0.31.ebuild 1761
-MD5 03b4992596801480fdf9273158c151e9 shfs-0.31-r1.ebuild 2553
+MD5 d394cabee4b25ba8a29f83f5a18ded9d shfs-0.31-r1.ebuild 2618
+MD5 d9b2539b59dbb04410b12a14a8c2f171 ChangeLog 1328
+MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31-r1 62
+MD5 307c4e9fea61efad863724d214fcb916 files/shfs-amd64-makefile.patch 653
+MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
 MD5 d9c3f912bc5642882b84fa7f3edd8db8 files/amd.conf 842
 MD5 97e8d1e483ac538a072e0e82af787eeb files/amd.shfs 152
-MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31 62
-MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
-MD5 d9ef6cc568f7b1bde782bcb637f31230 files/shfs-gentoo-0.31-ppc.diff 771
 MD5 2b5d290ea6b4e294eb222f277012263b files/shfs.mount 1342
-MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31-r1 62
+MD5 d9ef6cc568f7b1bde782bcb637f31230 files/shfs-gentoo-0.31-ppc.diff 771
+MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31 62
diff --git a/net-fs/shfs/files/shfs-amd64-makefile.patch b/net-fs/shfs/files/shfs-amd64-makefile.patch
new file mode 100644
index 000000000000..36797bcb09bc
--- /dev/null
+++ b/net-fs/shfs/files/shfs-amd64-makefile.patch
@@ -0,0 +1,14 @@
+--- shfs-0.31-1/shfs/Makefile.old	2003-10-14 23:54:50.000000000 -0400
++++ shfs-0.31-1/shfs/Makefile	2003-10-14 23:55:05.000000000 -0400
+@@ -15,9 +15,9 @@
+ SEARCHDIRS := -I- -I. -I${KERNEL_SOURCES}/include -I/usr/src/linux/include/
+ 
+ CC     := gcc
+-CFLAGS  = -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe -Wall ${SEARCHDIRS} -DMODULE ${MVER} -D__KERNEL__ -DLINUX -DDEBUG_LEVEL=${DEBUG}
++CFLAGS  = -O2 -mcmodel=kernel -fomit-frame-pointer -fno-strict-aliasing -pipe -Wall ${SEARCHDIRS} -DMODULE ${MVER} -D__KERNEL__ -DLINUX -DDEBUG_LEVEL=${DEBUG}
+ LINKER    := ld
+-LDFLAGS    = -m elf_i386 -r
++LDFLAGS    = -r
+ LOADLIBES := 
+ 
+ all: ${ALL_TARGETS}
diff --git a/net-fs/shfs/shfs-0.31-r1.ebuild b/net-fs/shfs/shfs-0.31-r1.ebuild
index 145e4cbe7c60..b992888c7dbf 100644
--- a/net-fs/shfs/shfs-0.31-r1.ebuild
+++ b/net-fs/shfs/shfs-0.31-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2003/09/07 00:11:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.31-r1.ebuild,v 1.4 2003/10/16 15:15:16 drobbins Exp $
 
 IUSE="amd doc"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://shfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc amd64"
 DEPEND="virtual/linux-sources
 		net-misc/openssh
 		amd? ( net-fs/am-utils )"
@@ -19,6 +19,7 @@ DEPEND="virtual/linux-sources
 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
 	emake || die
 }