3 files changed, 63 insertions, 6 deletions
diff --git a/sys-fs/cdfs/ChangeLog b/sys-fs/cdfs/ChangeLog
index 4ce934a8ae87..11e73a939cd0 100644
--- a/sys-fs/cdfs/ChangeLog
+++ b/sys-fs/cdfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cdfs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.1 2006/11/23 16:04:22 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.2 2006/12/05 17:14:58 drizzt Exp $
+
+  05 Dec 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/cdfs-2.6.18-kernel-2.6.19.patch, cdfs-2.6.18.ebuild:
+  Made compilation works also if running kernel != installed kernel.
+  Added my patch to make it works on kernel 2.6.19.
 
 *cdfs-2.6.18 (23 Nov 2006)
 
diff --git a/sys-fs/cdfs/cdfs-2.6.18.ebuild b/sys-fs/cdfs/cdfs-2.6.18.ebuild
index 610e6d09cfeb..551301c2e246 100644
--- a/sys-fs/cdfs/cdfs-2.6.18.ebuild
+++ b/sys-fs/cdfs/cdfs-2.6.18.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/cdfs/cdfs-2.6.18.ebuild,v 1.1 2006/11/23 16:04:22 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.18.ebuild,v 1.2 2006/12/05 17:14:58 drizzt Exp $
 
 inherit linux-mod
 
@@ -19,10 +19,14 @@ MODULE_NAMES="cdfs(extra)"
 CONFIG_CHECK="BLK_DEV_LOOP"
 BUILD_TARGETS="all"
 
-src_compile() {
-	linux-mod_src_compile
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	kernel_is ge 2 6 19 && epatch "${FILESDIR}"/${P}-kernel-2.6.19.patch
 }
 
-src_install() {
-	linux-mod_src_install
+src_compile() {
+	set_arch_to_kernel
+
+	emake KDIR="${KERNEL_DIR}" || die 'emake failed'
 }
diff --git a/sys-fs/cdfs/files/cdfs-2.6.18-kernel-2.6.19.patch b/sys-fs/cdfs/files/cdfs-2.6.18-kernel-2.6.19.patch
new file mode 100644
index 000000000000..109e07e65bf9
--- /dev/null
+++ b/sys-fs/cdfs/files/cdfs-2.6.18-kernel-2.6.19.patch
@@ -0,0 +1,48 @@
+diff -Nur cdfs-2.6.18.orig/audio.c cdfs-2.6.18/audio.c
+--- cdfs-2.6.18.orig/audio.c	2006-12-05 17:59:10.000000000 +0100
++++ cdfs-2.6.18/audio.c	2006-12-05 17:59:25.000000000 +0100
+@@ -167,7 +167,7 @@
+ /***************************************************************************/
+ 
+ struct file_operations cdfs_cdda_file_operations = {
+-    .read = generic_file_read,
++    .read = generic_file_aio_read,
+     .mmap = generic_file_mmap,
+ };
+ 
+diff -Nur cdfs-2.6.18.orig/cddata.c cdfs-2.6.18/cddata.c
+--- cdfs-2.6.18.orig/cddata.c	2006-12-05 17:59:10.000000000 +0100
++++ cdfs-2.6.18/cddata.c	2006-12-05 17:59:25.000000000 +0100
+@@ -76,7 +76,7 @@
+ 
+ 
+ struct file_operations cdfs_cddata_file_operations = {
+-  .read             = generic_file_read,
++  .read             = generic_file_aio_read,
+ #ifdef OLD_KERNEL
+   .mmap             = generic_file_mmap
+ #else
+diff -Nur cdfs-2.6.18.orig/cdXA.c cdfs-2.6.18/cdXA.c
+--- cdfs-2.6.18.orig/cdXA.c	2006-12-05 17:59:10.000000000 +0100
++++ cdfs-2.6.18/cdXA.c	2006-12-05 17:59:25.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include "cdfs.h"
+ 
+ struct file_operations cdfs_cdXA_file_operations = {
+-    .read = generic_file_read,
++    .read = generic_file_aio_read,
+     .mmap = generic_file_mmap,
+ };
+ 
+diff -Nur cdfs-2.6.18.orig/hfs.c cdfs-2.6.18/hfs.c
+--- cdfs-2.6.18.orig/hfs.c	2006-12-05 17:59:10.000000000 +0100
++++ cdfs-2.6.18/hfs.c	2006-12-05 17:59:25.000000000 +0100
+@@ -194,7 +194,7 @@
+ /***************************************************************************/
+ 
+ struct file_operations cdfs_cdhfs_file_operations = {
+-  .read             = generic_file_read,
++  .read             = generic_file_aio_read,
+   .mmap             = generic_file_mmap
+ };
+