Back to the old fuse-1.4.ebuild, 1.4 has obviously a more broken build-system than...

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 5eced7dd50b15d6c32e7f9b143693c953c171669..ecf7b0c43ae2eca5392718c81195263895c38e46 100644 (file)
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2005/01/01 23:04:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.7 2005/01/02 16:26:32 genstef Exp $
+
+  02 Jan 2005; Stefan Schweizer <genstef@gentoo.org> fuse-1.4.ebuild:
+  Back to the old fuse-1.4.ebuild, 1.4 has obviously a more broken
+  build-system than 2.1 and therefore does not work with linux-mod
 
   02 Jan 2005; Stefan Schweizer <genstef@gentoo.org> :
   Version 1.4 stable on x86

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index e27e28f5ef7bbc8e514f6c48cfc5fa966db888cc..6835e79b2abb0e335f738656a7cec1f2c8a74e5e 100644 (file)
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,6 +1,6 @@
-MD5 aff81d5a47238572df29e9f30e8d4c5c fuse-1.4.ebuild 1150
+MD5 142e50f5c21cbfda30880029b739e887 fuse-1.4.ebuild 1372
 MD5 b013f85dfbc6a56f0c407b1c5a6df29c fuse-2.1.ebuild 1156
-MD5 3c330a327013997eb171f2ff226dbcff ChangeLog 1060
+MD5 8045c8199b553d1e00cdcffbcc8a1317 ChangeLog 1265
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 MD5 86c18e0aa1b9961decf250349afc0fdc files/digest-fuse-1.4 60
 MD5 fd5c3c8819559265b221879ca45deae3 files/digest-fuse-2.1 60

diff --git a/sys-fs/fuse/fuse-1.4.ebuild b/sys-fs/fuse/fuse-1.4.ebuild
index 178d106186e63c03673888ea895363639c1ed499..8430a986dbd4d82e89800a47935ef393b76d19c4 100644 (file)
--- a/sys-fs/fuse/fuse-1.4.ebuild
+++ b/sys-fs/fuse/fuse-1.4.ebuild
@@ -1,41 +1,53 @@
 # 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-1.4.ebuild,v 1.3 2005/01/01 23:01:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-1.4.ebuild,v 1.4 2005/01/02 16:26:32 genstef Exp $
 
-inherit linux-mod
+inherit kernel-mod
 
 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"
+SLOT="0"
 KEYWORDS="x86"
 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"
 
+DEPEND="virtual/linux-sources"
+
+pkg_setup() {
+       kernel-mod_check_modules_supported
+}
 
 src_compile() {
-       econf --disable-kernel-module --disable-example || die "econf failed"
-       emake || die "emake failed"
+       econf --disable-example --with-kernel="${ROOT}/usr/src/linux" || die "econf failed"
+
+       sed -i 's/.*depmod.*//' kernel/Makefile
 
-       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
+       # http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2
+       kernel-mod_getversion
+       if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+       then
+               sed -i 's:SUBDIRS=:M=:g' kernel/Makefile
+       fi
+
+       unset ARCH
+       emake || die "emake failed"
 }
 
 src_install() {
+       unset ARCH
        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/*
+}
 
-       linux-mod_src_install
+pkg_postinst() {
+       einfo "Checking kernel module dependencies"
+       test -r "${ROOT}/usr/src/linux/System.map" && \
+               depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
 }