Add 2.6.23 check for bug 194436

Package-Manager: portage-2.1.3.11

6 files changed, 27 insertions, 115 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 71314c197a15..f4594488fea3 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.103 2007/09/25 19:35:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.104 2007/10/02 18:17:47 genstef Exp $
+
+  02 Oct 2007; Stefan Schweizer <genstef@gentoo.org> -fuse-2.6.3.ebuild,
+  fuse-2.6.4-r1.ebuild, fuse-2.7.0.ebuild:
+  Add 2.6.23 check for bug 194436
 
   25 Sep 2007; Christoph Mende <angelos@gentoo.org> fuse-2.7.0.ebuild:
   Stable on amd64 wrt bug #193329
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 477b2f2b4f18..a295a80cf241 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fuse-2.6.22.patch 1467 RMD160 7cffb02d2e7742e7db4da52eebebe359ae97826b SHA1 263156a40cc3d9ee5961b1cbcf99f021cbbba277 SHA256 e39d6833f850201a26c1350e76fdb95f71b374f7e9a728002eec794b1e5df03d
 MD5 62d7b2a0d2d79822c7eedf2c16dded7d files/fuse-2.6.22.patch 1467
 RMD160 7cffb02d2e7742e7db4da52eebebe359ae97826b files/fuse-2.6.22.patch 1467
@@ -17,42 +14,27 @@ AUX fuse.init 756 RMD160 0950f906866311b19c0712f88911e83f6481b5f7 SHA1 96551a5d9
 MD5 5983726cfabf0830dffbbbf9a3abcddc files/fuse.init 756
 RMD160 0950f906866311b19c0712f88911e83f6481b5f7 files/fuse.init 756
 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda files/fuse.init 756
-DIST fuse-2.6.3.tar.gz 473147 RMD160 df05bc42cb4c97f9e54048662f64a8cac5713f18 SHA1 d6ecda7341008ac157f55cf901309dda10f58faf SHA256 804d7fae424c97dc3790ad12d798e7b27dc6c12e4116f8bd69ca0130773d3f9d
 DIST fuse-2.6.4.tar.gz 473689 RMD160 38d83de8930b3e8f4b3a4e29036bc1260e69ff07 SHA1 f2ec1c6fc6ed6676ada3d11e244c2480882204a1 SHA256 c1eb7a8530315fd288a2c2e7449dfe4d2b491812902b2f151f8df41cfb5bd903
 DIST fuse-2.7.0.tar.gz 502261 RMD160 b2a84bc0a72b931d7bfeabf3e79dce7f25f6fb38 SHA1 985db21b2ebebf3f0813c5f2f30f2d8af8c33ef6 SHA256 a26117fb74b3bf6a3c6867611c46c53b75d6749198933486ec8a778ac315f855
-EBUILD fuse-2.6.3.ebuild 2075 RMD160 8ea5b7765f7cd2db6c13f431e65f49f6a66b7ae9 SHA1 03bb2e1c6ff7af048c8769bc09074de0f040c577 SHA256 fd6a0364ed18b1152a5d04e2dfa14110c6a2c2f9979132c6901f5f5758848ce8
-MD5 44116824b9a059bce92435bbd571cef5 fuse-2.6.3.ebuild 2075
-RMD160 8ea5b7765f7cd2db6c13f431e65f49f6a66b7ae9 fuse-2.6.3.ebuild 2075
-SHA256 fd6a0364ed18b1152a5d04e2dfa14110c6a2c2f9979132c6901f5f5758848ce8 fuse-2.6.3.ebuild 2075
-EBUILD fuse-2.6.4-r1.ebuild 2177 RMD160 fccefbe3d7f2d9a3fde370e84019550ad48331c8 SHA1 c2376f54d3616de864b0e647728e01a666bd5f88 SHA256 7a1b28e7905187cb7d956ea8385a6fda6f1687595d62ccdd52bb50cccd7fc446
-MD5 37f4bfdd6d28486d69660beee3883acc fuse-2.6.4-r1.ebuild 2177
-RMD160 fccefbe3d7f2d9a3fde370e84019550ad48331c8 fuse-2.6.4-r1.ebuild 2177
-SHA256 7a1b28e7905187cb7d956ea8385a6fda6f1687595d62ccdd52bb50cccd7fc446 fuse-2.6.4-r1.ebuild 2177
-EBUILD fuse-2.7.0.ebuild 2099 RMD160 7849a2ec799e7d78f9b6d622565755c4f96a7544 SHA1 17d056fe340f8e0feacf29953528fc855e50b938 SHA256 eb4f15a4992b5dd936397e7469f315581d90b4eef0120a6cb086df837f10d013
-MD5 81a779c045727a3faf55b080ea423a4b fuse-2.7.0.ebuild 2099
-RMD160 7849a2ec799e7d78f9b6d622565755c4f96a7544 fuse-2.7.0.ebuild 2099
-SHA256 eb4f15a4992b5dd936397e7469f315581d90b4eef0120a6cb086df837f10d013 fuse-2.7.0.ebuild 2099
-MISC ChangeLog 14099 RMD160 28bdc6d6f7be784a5e2c06d53ae2336eb044dd6a SHA1 1d4d8aadab5bfe5d8b781c627183ffd42ff6c29f SHA256 fff6574069f9b72ad86b0b4dc259a6c24d0e6ab75e5e59535a203af3c39397d8
-MD5 35c939b8fed1547a7a131005481a5b3c ChangeLog 14099
-RMD160 28bdc6d6f7be784a5e2c06d53ae2336eb044dd6a ChangeLog 14099
-SHA256 fff6574069f9b72ad86b0b4dc259a6c24d0e6ab75e5e59535a203af3c39397d8 ChangeLog 14099
+EBUILD fuse-2.6.4-r1.ebuild 2350 RMD160 fd26ecc72dd72a3131f74617981dfc4553593525 SHA1 64b7e43bc50f1e4d0db3a079965a77f1bcd6afc8 SHA256 b53d91d0c50a540780777be213cfe5f9d954a6f2486d32ac96f8540643637d1a
+MD5 71b1dc0777e79db30d29713473b99029 fuse-2.6.4-r1.ebuild 2350
+RMD160 fd26ecc72dd72a3131f74617981dfc4553593525 fuse-2.6.4-r1.ebuild 2350
+SHA256 b53d91d0c50a540780777be213cfe5f9d954a6f2486d32ac96f8540643637d1a fuse-2.6.4-r1.ebuild 2350
+EBUILD fuse-2.7.0.ebuild 2269 RMD160 374a376be8b7ff915c8bd0f400ea1c2f99b0153f SHA1 c0784c1d574dca11efd05fb5f2af114809651d64 SHA256 c7a7374768148db9296fe4f5d0a51dfe0d0a6f99845fa7aecb0113c9b39fcbd8
+MD5 762664aef2ab061003d74bfa689242be fuse-2.7.0.ebuild 2269
+RMD160 374a376be8b7ff915c8bd0f400ea1c2f99b0153f fuse-2.7.0.ebuild 2269
+SHA256 c7a7374768148db9296fe4f5d0a51dfe0d0a6f99845fa7aecb0113c9b39fcbd8 fuse-2.7.0.ebuild 2269
+MISC ChangeLog 14250 RMD160 9659523755cb60a57b06b563eb5ead36f0121b02 SHA1 7c224de03407942f2243c28cda6213e1c75c2a28 SHA256 63c45b16d07b3b5bad4602e0e0af79ee1321f8ffdfacc400371f0e0d2cbc0397
+MD5 c70d5f24f8aea71cc81446c52ed2ffdc ChangeLog 14250
+RMD160 9659523755cb60a57b06b563eb5ead36f0121b02 ChangeLog 14250
+SHA256 63c45b16d07b3b5bad4602e0e0af79ee1321f8ffdfacc400371f0e0d2cbc0397 ChangeLog 14250
 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
 MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269
 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269
 SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6 metadata.xml 269
-MD5 c7231e8a36c319190b7eb75b83f1ef40 files/digest-fuse-2.6.3 232
-RMD160 c797934218623ae564318739ac3a3782e8885713 files/digest-fuse-2.6.3 232
-SHA256 c8581faf6e90c4c6a181d6de1c8ead042654269af6313984fa00886db15cf9ed files/digest-fuse-2.6.3 232
 MD5 99824676751c75115bc8a1a24a6b2886 files/digest-fuse-2.6.4-r1 232
 RMD160 90e78ac98ee1cbdc18a90a9378e366b1e337b8be files/digest-fuse-2.6.4-r1 232
 SHA256 9f95ae0cfc9de856b53278c8bf253f6fbe6714189554e45b4551980fb24e6b39 files/digest-fuse-2.6.4-r1 232
 MD5 ee4651524f826ad1b50311aafd31b89c files/digest-fuse-2.7.0 232
 RMD160 9fdd7641e1f032f9829cc034fcd764abad0d2819 files/digest-fuse-2.7.0 232
 SHA256 405baed6f49c43618c849c7257636b1ebbe564ea16b65b4c2fb6b8b62a17b1b1 files/digest-fuse-2.7.0 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFG+WMUKhnDs22gwa8RAtgqAKDisWsLUy2jazBUlh+DBy4KDmEongCdHP0i
-cEzCy0eqKawqz1im6juBOoo=
-=ri8A
------END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/files/digest-fuse-2.6.3 b/sys-fs/fuse/files/digest-fuse-2.6.3
deleted file mode 100644
index be1acdd63dc3..000000000000
--- a/sys-fs/fuse/files/digest-fuse-2.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3f4f5d07d12dedc0a3fd23472171fe94 fuse-2.6.3.tar.gz 473147
-RMD160 df05bc42cb4c97f9e54048662f64a8cac5713f18 fuse-2.6.3.tar.gz 473147
-SHA256 804d7fae424c97dc3790ad12d798e7b27dc6c12e4116f8bd69ca0130773d3f9d fuse-2.6.3.tar.gz 473147
diff --git a/sys-fs/fuse/fuse-2.6.3.ebuild b/sys-fs/fuse/fuse-2.6.3.ebuild
deleted file mode 100644
index 1f2e25fb43f0..000000000000
--- a/sys-fs/fuse/fuse-2.6.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.3.ebuild,v 1.8 2007/04/24 18:55:18 dertobi123 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 )"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		MODULE_NAMES="fuse(fs:${S}/kernel)"
-		CONFIG_CHECK="@FUSE_FS:fuse"
-		FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
-			We will continue, but we wont build the module this time."
-
-		linux-mod_pkg_setup
-		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an
-			older version from viewcvs"
-
-		BUILD_PARAMS="majver=${KV_MAJOR}.${KV_MINOR}
-					fusemoduledir=${ROOT}/lib/modules/${KV_FULL/\ }/fs"
-		BUILD_TARGETS="all"
-		ECONF_PARAMS="--with-kernel=${KV_DIR} --with-kernel-build=${KV_OUT_DIR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fuse-fix-lazy-binding.patch
-	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 "emake 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
-		newinitd ${FILESDIR}/fuse.init fuse
-	else
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-		newinitd ${FILESDIR}/fuse-fbsd.init fuse
-	fi
-
-	rm -rf "${D}/dev"
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-}
diff --git a/sys-fs/fuse/fuse-2.6.4-r1.ebuild b/sys-fs/fuse/fuse-2.6.4-r1.ebuild
index 9f862566063e..2598776c3204 100644
--- a/sys-fs/fuse/fuse-2.6.4-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4-r1.ebuild,v 1.9 2007/06/17 11:52:17 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4-r1.ebuild,v 1.10 2007/10/02 18:17:47 genstef Exp $
 
 inherit linux-mod eutils libtool
 
@@ -21,6 +21,10 @@ pkg_setup() {
 		FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
 			We will continue, but we wont build the module this time."
 
+		if kernel_is ge 2 6 23; then
+			CONFIG_CHECK="FUSE_FS"
+			FUSE_FS_ERROR="You need to build the FUSE module from the kernel source, because your kernel is too new"
+		fi
 		linux-mod_pkg_setup
 		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an
 			older version from viewcvs"
diff --git a/sys-fs/fuse/fuse-2.7.0.ebuild b/sys-fs/fuse/fuse-2.7.0.ebuild
index a86903991486..cc4963527ff1 100644
--- a/sys-fs/fuse/fuse-2.7.0.ebuild
+++ b/sys-fs/fuse/fuse-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.7.0.ebuild,v 1.5 2007/09/25 19:35:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.7.0.ebuild,v 1.6 2007/10/02 18:17:47 genstef Exp $
 
 inherit linux-mod eutils libtool
 
@@ -21,6 +21,10 @@ pkg_setup() {
 		FUSE_FS_ERROR="We have detected FUSE already built into the kernel.
 			We will continue, but we wont build the module this time."
 
+		if kernel_is ge 2 6 23; then
+			CONFIG_CHECK="FUSE_FS"
+			FUSE_FS_ERROR="You need to build the FUSE module from the kernel source, because your kernel is too new"
+		fi
 		linux-mod_pkg_setup
 		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an
 			older version from viewcvs"