Fix build with KV_OUT thanks to Stefan Talpalaru <stefantalpalaru@yahoo.com> in bug 156140

(Portage version: 2.1.2_rc2-r1)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 173 deletions

diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index ad7c15982e8b..9f9a99b3acca 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -6,30 +6,20 @@ AUX fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81
 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 SHA1 abbd389a6d75bb1bc81dbbb94e342623123d2be8 SHA256 d9b008d10558a4bce9e91a561d38263ddfb889f925ea63913c43205fc223be10
 DIST fuse-2.6.0-rc1.tar.gz 435861 RMD160 c872c7835daf6b6f85342f5f05f36bb8c2f29aeb SHA1 0eff5d3d89012f9fd76ed8584b4f65d9d45af584 SHA256 f7046379088ff6bbceaaf989a9ec838f7bf8d7fd7833ffdecdc8a32dc5bd9dce
-DIST fuse-2.6.0-rc3.tar.gz 463042 RMD160 51a64c458536f39ba4962119d4fd21de776ca7b5 SHA1 5039e4f2a8feea27b25fcd854640650f6c56c719 SHA256 2519fc4de1ad59325293ec38e94592e05cdb5469638caa4c3ec95ea847fb1835
 DIST fuse-2.6.0.tar.gz 470514 RMD160 bf36a008d17fbb1169bfd7d077a53587df90ddb4 SHA1 23a6919b92d6a5935902c143baa7a1d19754e6a5 SHA256 782137879b964139e2dc4767114b763cb0e11ae322476404920cf767728e659e
-EBUILD fuse-2.6.0.ebuild 1867 RMD160 06a643e039f19ae837f0b49015d4a6cd4de1feee SHA1 47766c07f582f808886720ad11e2c37e8e0fc9b3 SHA256 3abf18059c4b1665f7378aa961ab938aff046c7920361c15320049bb21120168
-MD5 c2185979ea657d2ffb2ad7fee8bd250c fuse-2.6.0.ebuild 1867
-RMD160 06a643e039f19ae837f0b49015d4a6cd4de1feee fuse-2.6.0.ebuild 1867
-SHA256 3abf18059c4b1665f7378aa961ab938aff046c7920361c15320049bb21120168 fuse-2.6.0.ebuild 1867
-EBUILD fuse-2.6.0_pre2.ebuild 1798 RMD160 fec9d96e135ee53d5a906e1e2ab52dbd0a807fef SHA1 dda21742116059225f831ef985f579d5bd667c3c SHA256 02386fb2c100c3b86eb4c29814fd92dbc2832f34cf2ec675dc48acb5ef54a805
-MD5 269e0d9a67eb866fda90fbb57a2d6966 fuse-2.6.0_pre2.ebuild 1798
-RMD160 fec9d96e135ee53d5a906e1e2ab52dbd0a807fef fuse-2.6.0_pre2.ebuild 1798
-SHA256 02386fb2c100c3b86eb4c29814fd92dbc2832f34cf2ec675dc48acb5ef54a805 fuse-2.6.0_pre2.ebuild 1798
-EBUILD fuse-2.6.0_rc1.ebuild 1822 RMD160 9d9b2e005c999d450317dd7211e37b68b3a1f25c SHA1 3c2c84b4ddf4bb7b562a3eb801d63d7bac5d9879 SHA256 9eb324be2b3c061721c5bafddeb1b6d0667d228590f45f3686e8a2e1be4d6c9b
-MD5 2d20d9905d93b12e00b5a06484cb0f6b fuse-2.6.0_rc1.ebuild 1822
-RMD160 9d9b2e005c999d450317dd7211e37b68b3a1f25c fuse-2.6.0_rc1.ebuild 1822
-SHA256 9eb324be2b3c061721c5bafddeb1b6d0667d228590f45f3686e8a2e1be4d6c9b fuse-2.6.0_rc1.ebuild 1822
-EBUILD fuse-2.6.0_rc3.ebuild 1860 RMD160 524463f1785c82375a7eaec5e9f6d8ef3bc26e53 SHA1 e1335888560d03021e1c0e7a691f1ae3932c2330 SHA256 63ea485dc0f1cf220ae49026a127cc759665d6719769317f43594fb3c740cbe6
-MD5 04c75232176e745114f46f94b4701092 fuse-2.6.0_rc3.ebuild 1860
-RMD160 524463f1785c82375a7eaec5e9f6d8ef3bc26e53 fuse-2.6.0_rc3.ebuild 1860
-SHA256 63ea485dc0f1cf220ae49026a127cc759665d6719769317f43594fb3c740cbe6 fuse-2.6.0_rc3.ebuild 1860
-MISC ChangeLog 9497 RMD160 423f057652912b2656d2e20e204826609b849b3f SHA1 fa2de7618ac3170a49c7735a5ad09370efed05f8 SHA256 87f96a817a72e4c05ff407d2d46f96547c7e38be8d2862f52c99f50fb3c32201
-MD5 f8245aa9b37c1c1d1562ee17f2adfecf ChangeLog 9497
-RMD160 423f057652912b2656d2e20e204826609b849b3f ChangeLog 9497
-SHA256 87f96a817a72e4c05ff407d2d46f96547c7e38be8d2862f52c99f50fb3c32201 ChangeLog 9497
+EBUILD fuse-2.6.0.ebuild 1897 RMD160 25f70b575377684de2cc82a670a3d82b9ee45a4e SHA1 8e4b1e8a554886e9bfb41adc98afcfa103efa48d SHA256 21fdccfce481397d8d4247adab93b29dc219933041b51ade7065af86690a33ed
+MD5 b9f56affac56a4ea643294ee8472a72f fuse-2.6.0.ebuild 1897
+RMD160 25f70b575377684de2cc82a670a3d82b9ee45a4e fuse-2.6.0.ebuild 1897
+SHA256 21fdccfce481397d8d4247adab93b29dc219933041b51ade7065af86690a33ed fuse-2.6.0.ebuild 1897
+EBUILD fuse-2.6.0_rc1.ebuild 1853 RMD160 274fa3ae72a0b26d7b3cff35e8a89e09b7d88544 SHA1 484d1546d46fa345b2be79ea6af5127bd239acfe SHA256 5b0a3f2009a74a5cd0f27c5ee2de1fd3d96ffd308d6871092a8572a1c250dd59
+MD5 2651e3fce08d95f7fbb553838de1f1b8 fuse-2.6.0_rc1.ebuild 1853
+RMD160 274fa3ae72a0b26d7b3cff35e8a89e09b7d88544 fuse-2.6.0_rc1.ebuild 1853
+SHA256 5b0a3f2009a74a5cd0f27c5ee2de1fd3d96ffd308d6871092a8572a1c250dd59 fuse-2.6.0_rc1.ebuild 1853
+MISC ChangeLog 9741 RMD160 5f8f4ac0e6dcc0f735c9f6191d555fc0aec47175 SHA1 da7d7a4c423689ca0da6b3de5c0fa229ca57407f SHA256 a9e3853c466b4fb543601a95da078ecdd041385c4e7b258f42ac9a9ebf45767f
+MD5 3af2fd89caf672235352cd7250d62beb ChangeLog 9741
+RMD160 5f8f4ac0e6dcc0f735c9f6191d555fc0aec47175 ChangeLog 9741
+SHA256 a9e3853c466b4fb543601a95da078ecdd041385c4e7b258f42ac9a9ebf45767f ChangeLog 9741
 MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
@@ -37,12 +27,6 @@ SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata
 MD5 da2d5d4493caf19f290f8bfc96432b80 files/digest-fuse-2.6.0 232
 RMD160 af595baf2649b777be0554ed328d2e79ae3e4599 files/digest-fuse-2.6.0 232
 SHA256 56edffce47d44250719ce334158efe40b4ee4a4db9f8d8da45e9651d6e09c888 files/digest-fuse-2.6.0 232
-MD5 f44dcfc4420f3adf7c14d8ddefc4fd03 files/digest-fuse-2.6.0_pre2 247
-RMD160 8a138bdc61f9c13d49ee71f1ac9d2d3525aaa60e files/digest-fuse-2.6.0_pre2 247
-SHA256 38c46baa7614a894ce000c094a96e72574c972ca6b43fdc24168b7bc7463e55a files/digest-fuse-2.6.0_pre2 247
 MD5 f76e56e89886676c8e018c5fb95bcf2b files/digest-fuse-2.6.0_rc1 244
 RMD160 55efa5feb0276085043b7f9c26a7e7f7ffa34f00 files/digest-fuse-2.6.0_rc1 244
 SHA256 eb1464bea0851975ce0444e4b684ef5fd9e9af05cbfe13c4ff557018a0f5ed5d files/digest-fuse-2.6.0_rc1 244
-MD5 8ec6120e9d1470c6e7651a6f097bc6fe files/digest-fuse-2.6.0_rc3 244
-RMD160 c76526b40fc16ee3dece09ffe4fe4154c87f30cc files/digest-fuse-2.6.0_rc3 244
-SHA256 35552ff60e3449d28ba7a63de789047114ab0e4b792faca8a383ad7a6915de11 files/digest-fuse-2.6.0_rc3 244
diff --git a/sys-fs/fuse/files/digest-fuse-2.6.0_pre2 b/sys-fs/fuse/files/digest-fuse-2.6.0_pre2
deleted file mode 100644
index 3c1c9e6b5115..000000000000
--- a/sys-fs/fuse/files/digest-fuse-2.6.0_pre2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 15ff134d1a2e12ac2245e77774dda5c1 fuse-2.6.0-pre2.tar.gz 419045
-RMD160 208b0f5dd50398c73b8c6956c1e1443f3cd5cf37 fuse-2.6.0-pre2.tar.gz 419045
-SHA256 d9b008d10558a4bce9e91a561d38263ddfb889f925ea63913c43205fc223be10 fuse-2.6.0-pre2.tar.gz 419045
diff --git a/sys-fs/fuse/files/digest-fuse-2.6.0_rc3 b/sys-fs/fuse/files/digest-fuse-2.6.0_rc3
deleted file mode 100644
index f9a1fbc9e9d0..000000000000
--- a/sys-fs/fuse/files/digest-fuse-2.6.0_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 777cc97323b6fb83474b2ad6e3502a01 fuse-2.6.0-rc3.tar.gz 463042
-RMD160 51a64c458536f39ba4962119d4fd21de776ca7b5 fuse-2.6.0-rc3.tar.gz 463042
-SHA256 2519fc4de1ad59325293ec38e94592e05cdb5469638caa4c3ec95ea847fb1835 fuse-2.6.0-rc3.tar.gz 463042
diff --git a/sys-fs/fuse/fuse-2.6.0_pre2.ebuild b/sys-fs/fuse/fuse-2.6.0_pre2.ebuild
deleted file mode 100644
index f24b1fb6bddc..000000000000
--- a/sys-fs/fuse/fuse-2.6.0_pre2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.11 2006/06/08 12:06:18 genstef Exp $
-
-inherit linux-mod eutils libtool
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-
-MODULE_NAMES="fuse(fs:${S}/kernel)"
-CONFIG_CHECK="@FUSE_FS:fuse"
-BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-			  fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
-BUILD_TARGETS="all"
-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}
-	epatch ${FILESDIR}/fuse-fix-lazy-binding.patch
-	elibtoolize
-}
-
-src_compile() {
-	einfo "Preparing fuse userland"
-	econf --disable-kernel-module --disable-example || \
-		die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	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() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README README-2.4 \
-		README.NFS NEWS doc/how-fuse-works
-	docinto example
-	dodoc example/*
-
-	if use kernel_linux; then
-		linux-mod_src_install
-	else
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-}
diff --git a/sys-fs/fuse/fuse-2.6.0_rc3.ebuild b/sys-fs/fuse/fuse-2.6.0_rc3.ebuild
deleted file mode 100644
index 37f899edbaad..000000000000
--- a/sys-fs/fuse/fuse-2.6.0_rc3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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_rc3.ebuild,v 1.2 2006/11/01 06:17:18 vapier Exp $
-
-inherit linux-mod eutils libtool
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_linux kernel_FreeBSD"
-S=${WORKDIR}/${MY_P}
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-
-MODULE_NAMES="fuse(fs:${S}/kernel)"
-CONFIG_CHECK="@FUSE_FS:fuse"
-BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-			  fusemoduledir=${ROOT}/lib/modules/${KV_FULL}/fs"
-BUILD_TARGETS="all"
-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}"
-	epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
-	epatch "${FILESDIR}"/${P}-no-mknod.patch #152032
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		--disable-kernel-module \
-		--disable-example \
-		|| die "econf failed for fuse userland"
-	emake || die "emake failed"
-
-	if use kernel_linux ; then
-		cd "${S}"
-		sed -i -e 's/.*depmod.*//g' kernel/Makefile.in
-		convert_to_m kernel/Makefile.in
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog Filesystems README README-2.4 \
-		README.NFS NEWS doc/how-fuse-works
-	docinto example
-	dodoc example/*
-
-	if use kernel_linux ; then
-		linux-mod_src_install
-	else
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-}