Closing #44835.

5 files changed, 102 insertions, 12 deletions

diff --git a/sys-fs/lufs/ChangeLog b/sys-fs/lufs/ChangeLog
index e4873fcfd102..f8bd19398be9 100644
--- a/sys-fs/lufs/ChangeLog
+++ b/sys-fs/lufs/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for sys-fs/lufs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.3 2003/11/26 01:25:42 wmertens Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.4 2004/03/26 23:34:44 aliz Exp $
 
-*lufs-0.9.6 (26 Nov 2003)
+*lufs-0.9.7-r1 (26 Mar 2004)
+
+  26 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> lufs-0.9.7-r1.ebuild:
+  Adding support for lufs integrated in kernel. Closing #44835.
+
+*lufs-0.9.7 (26 Nov 2003)
 
   26 Nov 2003; Wout Mertens <wmertens@gentoo.org> lufs-0.9.7.ebuild :
   Version bump, gcc 3.3.2 build fix.
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index cbc47a6178a7..cef791bcc0b1 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,22 +1,23 @@
-MD5 85b57fe8103b9d33dcaf5902bd632297 ChangeLog 2901
+MD5 1622b5e738358e5a5bbda42f0debcba0 lufs-0.9.7-r1.ebuild 1802
+MD5 20536a19a24f3e7915e1311010411ead lufs-0.9.5.ebuild 1598
+MD5 d3c1ff3a56cb6c2b189be121b22a25f2 lufs-0.9.4.ebuild 1437
 MD5 f4293dfe7ffad2144ef4c5150ae3e517 lufs-0.7.0.ebuild 1339
 MD5 4ee3cf88550ec19b1efed98628d65662 lufs-0.8.0-r1.ebuild 1373
+MD5 6b748e2a47959100c4fc22e438297ae7 lufs-0.9.6.ebuild 1798
 MD5 c5caac9761cac69c861867120f7af652 lufs-0.8.0.ebuild 1357
+MD5 85b57fe8103b9d33dcaf5902bd632297 ChangeLog 2901
 MD5 e4c2423261807f6ddba1fb14b8baea19 lufs-0.9.3.ebuild 1430
-MD5 d3c1ff3a56cb6c2b189be121b22a25f2 lufs-0.9.4.ebuild 1437
-MD5 20536a19a24f3e7915e1311010411ead lufs-0.9.5.ebuild 1598
-MD5 6b748e2a47959100c4fc22e438297ae7 lufs-0.9.6.ebuild 1798
-MD5 0d23e3584f5ace4996a53e208a7dac4d lufs-0.9.7.ebuild 1822
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.7.0-init 361
+MD5 5bb142fc118cf319966c128949fba3bb files/gentoo-gcc332fix-0.9.7.patch 453
+MD5 589f3dad16a475a1f541a2be26ff9d33 files/digest-lufs-0.8.0-r1 62
+MD5 09d17da22336bf2a8b5327a76a02e72c files/lufs-0.9.3-init 471
+MD5 41054752e68ab9784f5f8a1baed3f7a5 files/digest-lufs-0.9.7-r1 62
 MD5 c574a7036eebafdb31765fec945e0498 files/digest-lufs-0.7.0 62
 MD5 589f3dad16a475a1f541a2be26ff9d33 files/digest-lufs-0.8.0 62
-MD5 589f3dad16a475a1f541a2be26ff9d33 files/digest-lufs-0.8.0-r1 62
 MD5 f800115ecf5209516be61e1a9e29aa68 files/digest-lufs-0.9.3 62
 MD5 fdc68173408348637bf80f972b46f828 files/digest-lufs-0.9.4 62
 MD5 c5059868c2a7c434b87106a9b7901a96 files/digest-lufs-0.9.5 62
 MD5 24d00303aa3fd302f795fb323bf829fe files/digest-lufs-0.9.6 62
 MD5 41054752e68ab9784f5f8a1baed3f7a5 files/digest-lufs-0.9.7 62
-MD5 5bb142fc118cf319966c128949fba3bb files/gentoo-gcc332fix-0.9.7.patch 453
-MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.7.0-init 361
 MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.8.0-init 361
-MD5 09d17da22336bf2a8b5327a76a02e72c files/lufs-0.9.3-init 471
diff --git a/sys-fs/lufs/files/digest-lufs-0.9.7-r1 b/sys-fs/lufs/files/digest-lufs-0.9.7-r1
new file mode 100644
index 000000000000..54c98d3ea5f8
--- /dev/null
+++ b/sys-fs/lufs/files/digest-lufs-0.9.7-r1
@@ -0,0 +1 @@
+MD5 23f58fe232254a65df6eb4736a81d524 lufs-0.9.7.tar.gz 537772
diff --git a/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch b/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch
new file mode 100644
index 000000000000..05bb1d2f5d25
--- /dev/null
+++ b/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch
@@ -0,0 +1,12 @@
+--- filesystems/gnetfs/Makefile.in	2004-03-18 15:59:28.391299639 +0000
++++ filesystems/gnetfs/Makefile.in	2004-03-18 15:59:45.316142704 +0000
+@@ -197,7 +197,7 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/vtree.Plo ./$(DEPDIR)/xfer.Plo
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = $(CC) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
diff --git a/sys-fs/lufs/lufs-0.9.7-r1.ebuild b/sys-fs/lufs/lufs-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..83df3b24a3da
--- /dev/null
+++ b/sys-fs/lufs/lufs-0.9.7-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r1.ebuild,v 1.1 2004/03/26 23:34:44 aliz Exp $
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="User-mode filesystem implementation"
+SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+HOMEPAGE="http://lufs.sourceforge.net/lufs/"
+LICENSE="GPL-2"
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="lufsusermount"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-fPIC.patch
+
+	# Fix some sandbox failures
+	sed -i -e's/install-data-hook//' \
+		lufsd/Makefile.in util/Makefile.in kernel/Linux/2.4/Makefile.in
+
+	# Fix GCC 3.3.2 build failure (see also
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13192)
+	epatch ${FILESDIR}/gentoo-gcc332fix-${PV}.patch
+}
+
+src_compile() {
+	local myconf
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install () {
+	dodoc AUTHORS COPYING ChangeLog Contributors INSTALL \
+		NEWS README THANKS TODO
+	dohtml docs/lufs.html
+	make DESTDIR=${D} install
+
+	dosym /usr/bin/auto.sshfs /etc/auto.sshfs
+	dosym /usr/bin/auto.ftpfs /etc/auto.ftpfs
+	dodir /sbin
+	dosym /usr/bin/lufsd /sbin/mount.lufs
+	use lufsusermount && chmod +s ${D}/usr/bin/lufs{mnt,umount}
+}
+
+pkg_postinst() {
+	if [ ! "$( egrep "^CONFIG_LUFS_FS=[ym]" /usr/src/linux-${KV}/.config )" ]; then
+		/usr/sbin/update-modules
+	fi
+
+	if ! use lufsusermount
+	then
+		einfo If you want regular users to be able to mount lufs filesystems,
+		einfo you need to run the following command as root:
+		einfo \# chmod +s /usr/bin/lufsmnt /usr/bin/lufsumount
+		einfo You can also set the lufsusermount USE flag to do this
+		einfo automatically.
+	fi
+}
+
+pkg_postrm() {
+	if [ ! "$( egrep "^CONFIG_LUFS_FS=[ym]" /usr/src/linux-${KV}/.config )" ]; then
+		/sbin/modprobe -r lufs
+	fi
+}