Version bump, thanks to OneOfOne in IRC. Changed to only compile the kernel module when it is not yet in the kernel.

(Portage version: 2.0.51-r12)

4 files changed, 83 insertions, 2 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 71ff6c890f36..7be6cc48cb87 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.8 2005/01/03 08:00:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.9 2005/01/15 19:32:24 genstef Exp $
+
+*fuse-2.2_pre3 (15 Jan 2005)
+
+  15 Jan 2005; Stefan Schweizer <genstef@gentoo.org> +fuse-2.2_pre3.ebuild:
+  Version bump, thanks to OneOfOne in IRC. Changed to only compile the kernel
+  module when it is not yet in the kernel.
 
   03 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
   +files/fuse-1.4-kernel-2.6.10.patch, +files/fuse-fix-lazy-binding.patch,
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index f4274bbea523..1b2cbbbb51ef 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,8 +1,10 @@
 MD5 d9443f8a72726d8e779c1a9064122fa7 fuse-1.4.ebuild 1555
 MD5 61f3c8ddc1e887be58825483427d13ff fuse-2.1.ebuild 1250
-MD5 0ba2e58dc93adfdea28413318c8670a3 ChangeLog 1585
+MD5 7c8970ccbbbb5d1b13bce3b687ff020a ChangeLog 1813
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
+MD5 7dff81e32c6b2196bee5f09b6b7c560d fuse-2.2_pre3.ebuild 1576
 MD5 a24d5bc33d0d36527f183fce45e5c78e files/fuse-1.4-kernel-2.6.10.patch 1052
 MD5 86c18e0aa1b9961decf250349afc0fdc files/digest-fuse-1.4 60
 MD5 fd5c3c8819559265b221879ca45deae3 files/digest-fuse-2.1 60
 MD5 c1ef6366ba5892111ddef08887328663 files/fuse-fix-lazy-binding.patch 398
+MD5 1a9d13833510849d37a9ab5a7e34b83c files/digest-fuse-2.2_pre3 65
diff --git a/sys-fs/fuse/files/digest-fuse-2.2_pre3 b/sys-fs/fuse/files/digest-fuse-2.2_pre3
new file mode 100644
index 000000000000..8f6292e06b60
--- /dev/null
+++ b/sys-fs/fuse/files/digest-fuse-2.2_pre3
@@ -0,0 +1 @@
+MD5 6ad3e3b335ea1dbbf2bade7dbf9c59aa fuse-2.2-pre3.tar.gz 352751
diff --git a/sys-fs/fuse/fuse-2.2_pre3.ebuild b/sys-fs/fuse/fuse-2.2_pre3.ebuild
new file mode 100644
index 000000000000..5ece387ef360
--- /dev/null
+++ b/sys-fs/fuse/fuse-2.2_pre3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.2_pre3.ebuild,v 1.1 2005/01/15 19:32:24 genstef Exp $
+
+inherit linux-mod eutils
+
+MY_P=${P/_/-}
+DESCRIPTION="An interface for filesystems implemented in userspace."
+HOMEPAGE="http://sourceforge.net/projects/fuse"
+SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="fuse(fs:${S}/kernel)"
+BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
+	fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if linux_chkconfig_present FUSE_FS
+	then
+		einfo "Not compiling the kernel module as it is already in the kernel"
+		FUSEMOD=""
+	else
+		einfo "Compiling the kernel module as it is not yet in the kernel"
+		FUSEMOD="true"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/fuse-fix-lazy-binding.patch
+}
+
+src_compile() {
+	econf --disable-kernel-module --disable-example || die "econf failed"
+	emake || die "emake failed"
+
+	if [ -n "${FUSEMOD}" ]
+	then
+		cd kernel
+		econf --with-kernel="${ROOT}${KV_DIR}" || die "econf kernel failed"
+		sed -i 's/.*depmod.*//' Makefile
+		convert_to_m Makefile
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS BUGS ChangeLog Filesystems README README-2.4 \
+		README-2.6 README.NFS NEWS doc/how-fuse-works
+	docinto example
+	dodoc example/*
+
+	if [ -n "${FUSEMOD}" ]
+	then
+		linux-mod_src_install
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${FUSEMOD}" ]
+	then
+		linux-mod_pkg_postinst
+	fi
+}