Enable more goodies

3 files changed, 31 insertions, 37 deletions

diff --git a/sys-fs/lufs/ChangeLog b/sys-fs/lufs/ChangeLog
index dbaf2eddb40e..64439d7acccd 100644
--- a/sys-fs/lufs/ChangeLog
+++ b/sys-fs/lufs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/lufs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.6 2004/04/17 04:29:21 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.7 2004/04/17 04:38:05 steel300 Exp $
+
+  16 Apr 2004; <coxj@gentoo.org> lufs-0.9.7-r1.ebuild:
+  Enable some more goodies.
 
   16 Apr 2004; <coxj@gentoo.org> lufs-0.9.7-r1.ebuild:
   Fix lufs once and for all.
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index 2a4821dc6df7..ec051126d020 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,4 +1,4 @@
-MD5 0b11d9d4b64f35cb5a24cea4cd636aa8 lufs-0.9.7-r1.ebuild 2653
+MD5 ee24df9b8ca3f7736998f28c8acd3f05 lufs-0.9.7-r1.ebuild 2006
 MD5 20536a19a24f3e7915e1311010411ead lufs-0.9.5.ebuild 1598
 MD5 0d23e3584f5ace4996a53e208a7dac4d lufs-0.9.7.ebuild 1822
 MD5 d3c1ff3a56cb6c2b189be121b22a25f2 lufs-0.9.4.ebuild 1437
@@ -6,7 +6,7 @@ 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 9f7d0f4aa3b589380cfbd00cbfe0d6cc ChangeLog 3232
+MD5 98c21a855fc5b4e3b0530102c0378c37 ChangeLog 3316
 MD5 e4c2423261807f6ddba1fb14b8baea19 lufs-0.9.3.ebuild 1430
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3f5d97db2f2eedc51f0ae99618a924c2 files/lufs-0.7.0-init 361
diff --git a/sys-fs/lufs/lufs-0.9.7-r1.ebuild b/sys-fs/lufs/lufs-0.9.7-r1.ebuild
index f5a831e2dfce..0a65675a7796 100644
--- a/sys-fs/lufs/lufs-0.9.7-r1.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r1.ebuild
@@ -1,48 +1,42 @@
 # 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.3 2004/04/17 04:29:21 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r1.ebuild,v 1.4 2004/04/17 04:38:05 steel300 Exp $
+
+inherit kmod
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="User-mode filesystem implementation"
 SRC_URI="mirror://sourceforge/lufs/${P}.tar.gz"
+KMOD_SOURCES="${P}.tar.gz"
 HOMEPAGE="http://lufs.sourceforge.net/lufs/"
 LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
+DEPEND="virtual/linux-sources
+	sys-kernel/config-kernel"
 RDEPEND=""
 KEYWORDS="~x86 ~amd64"
 SLOT="0"
 IUSE="lufsusermount"
-RESTRICT="nouserpriv"
 
 src_unpack() {
-	unpack ${A}
-
-	# Fix some sandbox failures
-	cd ${S}/lufsd
-	mv Makefile.in Makefile.in.orig
-	sed -e 's/install-exec-hook//' Makefile.in.orig > Makefile.in || die
+	kmod_src_unpack
+	cd ${S}
 
-	cd ${S}/util
-	mv Makefile.in Makefile.in.orig
-	sed -e 's/install-exec-hook//' Makefile.in.orig > Makefile.in || die
+	epatch ${FILESDIR}/${P}-fPIC.patch
 
-	cd ${S}/kernel/Linux/2.4
-	mv Makefile.in Makefile.in.orig
-	sed -e 's/install-data-hook//' Makefile.in.orig > Makefile.in || die
+	# 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)
-	cd ${S}
 	epatch ${FILESDIR}/gentoo-gcc332fix-${PV}.patch
 }
 
-src_compile () {
-	econf || die
-	[ -d /lib/modules/$(uname -r)/build ] || die "Cannot find kernel sources at /lib/modules/$(uname -r)/build.
-This ebuild will only compile against the running kernel."
-	# In case package dereferences.
-	addwrite $(readlink -f /lib/modules/$(uname -r)/build) || die "Could not enable write access to kernel sources. Check your sandbox settings."
-	addwrite /lib/modules/$(uname -r)/build || die "Could not enable write access to kernel sources. Check your sandbox settings."
+src_compile() {
+	kmod_make_linux_writable
+	local myconf
+	myconf="--enable-wavfs --enable-cefs --enable-cardfs"
+	econf ${myconf} || die
 	env -u ARCH emake || die
 }
 
@@ -50,25 +44,20 @@ src_install () {
 	dodoc AUTHORS COPYING ChangeLog Contributors INSTALL \
 		NEWS README THANKS TODO
 	dohtml docs/lufs.html
-	# In case package dereferences.
-	addwrite $(readlink -f /lib/modules/$(uname -r)/build)
-	addwrite /lib/modules/$(uname -r)/build
-	env -u ARCH make DESTDIR=${D} install
+	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}
-	if expr match $(uname -r) 2.6; then
-		insinto /lib/modules/$(uname -r)/kernel/fs/lufs
-		doins kernel/Linux/2.6/lufs.ko
-	fi
 }
 
 pkg_postinst() {
-	depmod
-	/usr/sbin/update-modules
+	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,
@@ -80,5 +69,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	/sbin/modprobe -r lufs
+	if [ ! "$( egrep "^CONFIG_LUFS_FS=[ym]" /usr/src/linux-${KV}/.config )" ]; then
+		/sbin/modprobe -r lufs
+	fi
 }