Cleanup postinst and add basic BSD functionality though no keyword yet, bug 133548, thanks to Robert Sebastian Gerus <arachnist@gmail.com>

Package-Manager: portage-2.1_rc1-r2

3 files changed, 34 insertions, 24 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 1050a490b8f1..4e68e99f980d 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.51 2006/05/15 11:01:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.52 2006/05/22 09:32:43 genstef Exp $
+
+  22 May 2006; Stefan Schweizer <genstef@gentoo.org> fuse-2.6.0_pre2.ebuild:
+  Cleanup postinst and add basic BSD functionality though no keyword yet, bug
+  133548, thanks to Robert Sebastian Gerus <arachnist@gmail.com>
 
   15 May 2006; Stefan Schweizer <genstef@gentoo.org>
   -files/fuse-2.6.16.patch, -files/fuse-fix-memleak.patch,
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 060a1a1e3335..426062e9cb94 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -6,14 +6,14 @@ MD5 c1ef6366ba5892111ddef08887328663 files/fuse-fix-lazy-binding.patch 398
 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe files/fuse-fix-lazy-binding.patch 398
 SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1 files/fuse-fix-lazy-binding.patch 398
 DIST fuse-2.6.0-pre2.tar.gz 419045 RMD160 208b0f5dd50398c73b8c6956c1e1443f3cd5cf37 SHA256 d9b008d10558a4bce9e91a561d38263ddfb889f925ea63913c43205fc223be10 size 419045
-EBUILD fuse-2.6.0_pre2.ebuild 1617 RMD160 9b0250e1db8d46434e4f3ad6f2a0032e135e99b3 SHA1 5bd1b6bac59fbf04d7ac4636b5eddb5f5cb36c5a SHA256 d9c17de81103b01181c060eb83f4fb3fc19a9697479e79d399b55716bd5701b3 size 1617
-MD5 7e1ad83d3ab9b987a5f546b80f4c600c fuse-2.6.0_pre2.ebuild 1617
-RMD160 9b0250e1db8d46434e4f3ad6f2a0032e135e99b3 fuse-2.6.0_pre2.ebuild 1617
-SHA256 d9c17de81103b01181c060eb83f4fb3fc19a9697479e79d399b55716bd5701b3 fuse-2.6.0_pre2.ebuild 1617
-MISC ChangeLog 7548 RMD160 e4ffe9f4f4151de198835965859d8eb25abdf6e5 SHA1 705b9c227d8d17fed52a2cf5e16c55ff1b32e273 SHA256 6e7f63d01c6d371167f25b9b5af8bc6202a4ca19ddea21f5eb7d1494c98824cb size 7548
-MD5 7997c37ad86e9641343458e607c6d57a ChangeLog 7548
-RMD160 e4ffe9f4f4151de198835965859d8eb25abdf6e5 ChangeLog 7548
-SHA256 6e7f63d01c6d371167f25b9b5af8bc6202a4ca19ddea21f5eb7d1494c98824cb ChangeLog 7548
+EBUILD fuse-2.6.0_pre2.ebuild 1766 RMD160 34952ad3fb67ea4fb9d86f8937832d73c6ad40d4 SHA1 264e0d31622ee05519fea3e24028984a40a1c85c SHA256 674b8eb4f3be99e3a83eb8c81e0f7cb94e03df72a0b3d711a7f87e21a1fddb45 size 1766
+MD5 d8bbd0180b4ca00b93fb3ce1692dbd72 fuse-2.6.0_pre2.ebuild 1766
+RMD160 34952ad3fb67ea4fb9d86f8937832d73c6ad40d4 fuse-2.6.0_pre2.ebuild 1766
+SHA256 674b8eb4f3be99e3a83eb8c81e0f7cb94e03df72a0b3d711a7f87e21a1fddb45 fuse-2.6.0_pre2.ebuild 1766
+MISC ChangeLog 7769 RMD160 9d62b384d947ea3c4729d37fe01faab82cdf83c3 SHA1 6a4a3d73ae53fd91167f2fd5bed5efcf91cbf8b6 SHA256 0cf45ea025bf2b577441ba7a773ae7a0c3001301470d0a197610da46f55a45aa size 7769
+MD5 c0f5d74de56010c2ddb8022c22a82db2 ChangeLog 7769
+RMD160 9d62b384d947ea3c4729d37fe01faab82cdf83c3 ChangeLog 7769
+SHA256 0cf45ea025bf2b577441ba7a773ae7a0c3001301470d0a197610da46f55a45aa ChangeLog 7769
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b size 264
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
@@ -24,7 +24,7 @@ SHA256 38c46baa7614a894ce000c094a96e72574c972ca6b43fdc24168b7bc7463e55a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEaF+RNJowsmZ/PzARApHwAJsHyH9+ddC7MGMT2shresHiWbIoJgCePlFZ
-lPdAnGeUWB0iXhGtQ/StQSc=
-=rJIc
+iD8DBQFEcYVFNJowsmZ/PzARAvU0AJ9ByvgXY8fhw4MwoXxjKwMcK28FBACeJBeN
+M5goUVplI3LRnEtub8azCs8=
+=DLwQ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/fuse-2.6.0_pre2.ebuild b/sys-fs/fuse/fuse-2.6.0_pre2.ebuild
index 7aa977b04f2d..f9bfe29379b8 100644
--- a/sys-fs/fuse/fuse-2.6.0_pre2.ebuild
+++ b/sys-fs/fuse/fuse-2.6.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.0_pre2.ebuild,v 1.7 2006/05/15 11:01:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.0_pre2.ebuild,v 1.8 2006/05/22 09:32:43 genstef Exp $
 
 inherit linux-mod eutils
 
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 S=${WORKDIR}/${MY_P}
+PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 
 MODULE_NAMES="fuse(fs:${S}/kernel)"
 CONFIG_CHECK="@FUSE_FS:fuse"
@@ -22,6 +23,10 @@ ECONF_PARAMS="--with-kernel=${KV_OUT_DIR}"
 FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
 We will continue, but we wont build the module this time."
 
+pkg_setup() {
+	use kernel_linux && linux-mod_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -34,9 +39,11 @@ src_compile() {
 		die "econf failed for fuse userland"
 	emake || die "emake failed"
 
-	sed -i 's/.*depmod.*//g' ${S}/kernel/Makefile.in
-	convert_to_m ${S}/kernel/Makefile.in
-	linux-mod_src_compile
+	if use kernel_linux; then
+		sed -i -e 's/.*depmod.*//g' ${S}/kernel/Makefile.in
+		convert_to_m ${S}/kernel/Makefile.in
+		linux-mod_src_compile
+	fi
 }
 
 src_install() {
@@ -47,15 +54,14 @@ src_install() {
 	docinto example
 	dodoc example/*
 
-	linux-mod_src_install
+	if use kernel_linux; then
+		linux-mod_src_install
+	else
+		insinto /usr/include/fuse
+		doins include/fuse_kernel.h
+	fi
 }
 
 pkg_postinst() {
-	check_extra_config
-	strip_modulenames
-	if [ -n "${MODULE_NAMES}" ]; then
-		update_depmod;
-		update_modules;
-		update_moduledb;
-	fi
+	use kernel_linux && linux-mod_pkg_postinst
 }