Make 2.6.23 support actually work for Sven <skoehler@upb.de> in bug 195300

Package-Manager: portage-2.1.3.12

4 files changed, 31 insertions, 25 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index e0804fb02f24..6ae6681fad24 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.105 2007/10/05 17:22:28 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.106 2007/10/09 22:20:15 genstef Exp $
+
+  09 Oct 2007; Stefan Schweizer <genstef@gentoo.org> fuse-2.6.4-r1.ebuild,
+  fuse-2.7.0.ebuild:
+  Make 2.6.23 support actually work for Sven <skoehler@upb.de> in bug 195300
 
   05 Oct 2007; Ferris McCormick <fmccor@gentoo.org> fuse-2.7.0.ebuild:
   Sparc stable --- Bug #193329 --- thanks to ezod.
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index baeaa19b43d9..3a596cc025e7 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -16,18 +16,18 @@ RMD160 0950f906866311b19c0712f88911e83f6481b5f7 files/fuse.init 756
 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda files/fuse.init 756
 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.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 2267 RMD160 9eac4f20e8b02539a43f4e86bfdc60283319c924 SHA1 1acd170ef9e2a9cd17860e0fc2f132c9c1fc9554 SHA256 701e9f86a03391199510bc4dbe9293a208cf80f996d226d13801aecf0b0bb922
-MD5 395789a19b68e9731bbb43356d06dcb6 fuse-2.7.0.ebuild 2267
-RMD160 9eac4f20e8b02539a43f4e86bfdc60283319c924 fuse-2.7.0.ebuild 2267
-SHA256 701e9f86a03391199510bc4dbe9293a208cf80f996d226d13801aecf0b0bb922 fuse-2.7.0.ebuild 2267
-MISC ChangeLog 14372 RMD160 ab6c08a404e8bfc0623fd34391594613626ec476 SHA1 de08a13f4234957701a0d7974bdb87faaaddd8b4 SHA256 f2245ff5f3d6b21a73c7a38685cfc69c4eba79e93b1f7d6d4dffc1badf2f443a
-MD5 d887f1b014bd41211c3067f95b48e3b6 ChangeLog 14372
-RMD160 ab6c08a404e8bfc0623fd34391594613626ec476 ChangeLog 14372
-SHA256 f2245ff5f3d6b21a73c7a38685cfc69c4eba79e93b1f7d6d4dffc1badf2f443a ChangeLog 14372
+EBUILD fuse-2.6.4-r1.ebuild 2361 RMD160 a0bbb1faeb6282907fd1714cac234d808f034640 SHA1 7089ff3cc283f1b4cfd71081954fdf0b6cff770f SHA256 4b234e80a0504669dcc01fc05e9fe58fb2524f6009811593e0e2f8aeb8607e8a
+MD5 a48c9a80ca446d85faab4b066a6f376f fuse-2.6.4-r1.ebuild 2361
+RMD160 a0bbb1faeb6282907fd1714cac234d808f034640 fuse-2.6.4-r1.ebuild 2361
+SHA256 4b234e80a0504669dcc01fc05e9fe58fb2524f6009811593e0e2f8aeb8607e8a fuse-2.6.4-r1.ebuild 2361
+EBUILD fuse-2.7.0.ebuild 2279 RMD160 d23903fa26bf71912761678b3dba808ca6b05342 SHA1 32c1c39e726a2b3066830ae2fcf09f6852d95903 SHA256 3d28a42f89861750680c2c465150bb02c5700667a769da8c02114e03abc5eb2d
+MD5 4ef23b250e347b50ffb1a88b4ab150a1 fuse-2.7.0.ebuild 2279
+RMD160 d23903fa26bf71912761678b3dba808ca6b05342 fuse-2.7.0.ebuild 2279
+SHA256 3d28a42f89861750680c2c465150bb02c5700667a769da8c02114e03abc5eb2d fuse-2.7.0.ebuild 2279
+MISC ChangeLog 14547 RMD160 46cc771c9ddf8c9912b788a22477b206a84c97f4 SHA1 a280f67e97a9480bde1516c3937c2ae405c7f621 SHA256 78243b63c9f5f93169aa201001b382dd47759d60aa5e7c3addfab1bd6b0c391b
+MD5 405a9548ad85d8bb09e24c83e3bb6d79 ChangeLog 14547
+RMD160 46cc771c9ddf8c9912b788a22477b206a84c97f4 ChangeLog 14547
+SHA256 78243b63c9f5f93169aa201001b382dd47759d60aa5e7c3addfab1bd6b0c391b ChangeLog 14547
 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
 MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269
 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269
diff --git a/sys-fs/fuse/fuse-2.6.4-r1.ebuild b/sys-fs/fuse/fuse-2.6.4-r1.ebuild
index 2598776c3204..8f8ad3491a98 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.10 2007/10/02 18:17:47 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.6.4-r1.ebuild,v 1.11 2007/10/09 22:20:15 genstef Exp $
 
 inherit linux-mod eutils libtool
 
@@ -16,14 +16,15 @@ 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."
-
 		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"
+		else
+			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."
+
 		fi
 		linux-mod_pkg_setup
 		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an
diff --git a/sys-fs/fuse/fuse-2.7.0.ebuild b/sys-fs/fuse/fuse-2.7.0.ebuild
index e9b5a02675ed..0c06fac91d76 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.7 2007/10/05 17:22:28 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.7.0.ebuild,v 1.8 2007/10/09 22:20:15 genstef Exp $
 
 inherit linux-mod eutils libtool
 
@@ -16,14 +16,15 @@ 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."
-
 		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"
+		else
+			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."
+
 		fi
 		linux-mod_pkg_setup
 		kernel_is 2 4 && die "kernel 2.4 is not supported by this ebuild. Get an