Made compilation works also if running kernel != installed kernel.

Added my patch to make it works on kernel 2.6.19.

Package-Manager: portage-2.1.2_rc1-r4

4 files changed, 78 insertions, 17 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/Manifest b/sys-fs/cdfs/Manifest
index 7b7f5b660e00..f0e9c1e586aa 100644
--- a/sys-fs/cdfs/Manifest
+++ b/sys-fs/cdfs/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cdfs-2.6.18-kernel-2.6.19.patch 1696 RMD160 63a7a1e6f02d946426f9c91c07efa8a557a88751 SHA1 dd99dd6b07464b6ce1be75eb177d25e200cc4320 SHA256 b15b67aa7988538ec1f5f2d79a3234b9920fc008dee5f20f204a8a061f0e3b13
+MD5 3cd80025e56b3e6b3cb536eec6ab5cab files/cdfs-2.6.18-kernel-2.6.19.patch 1696
+RMD160 63a7a1e6f02d946426f9c91c07efa8a557a88751 files/cdfs-2.6.18-kernel-2.6.19.patch 1696
+SHA256 b15b67aa7988538ec1f5f2d79a3234b9920fc008dee5f20f204a8a061f0e3b13 files/cdfs-2.6.18-kernel-2.6.19.patch 1696
 DIST cdfs-2.6.18.tar.bz2 30339 RMD160 a0f8127f0b68f04c71fcea04e62346f275d9b2cd SHA1 b5240d80f17b7c8c626ad7915e226cae118e9648 SHA256 539866730cc593af58f489fea32ddb81adb56aa7ab340f0659c36b7824ad0623
-EBUILD cdfs-2.6.18.ebuild 700 RMD160 cffcb01b00102f41c9cc783cdf25698c0b830ceb SHA1 955bf4b5e09d95dd2a343009417b446a7b7a4b01 SHA256 1044e1e369702dd0f9e484aaa55e436d77698c38f9d72c9a7712482924d5e15a
-MD5 3bc5c791da6fc3dd4a1655ccbdf7f454 cdfs-2.6.18.ebuild 700
-RMD160 cffcb01b00102f41c9cc783cdf25698c0b830ceb cdfs-2.6.18.ebuild 700
-SHA256 1044e1e369702dd0f9e484aaa55e436d77698c38f9d72c9a7712482924d5e15a cdfs-2.6.18.ebuild 700
-MISC ChangeLog 394 RMD160 fcc0e2ad34dc36b5efbeed77d566110b9e15d3cb SHA1 a66325b7e7c27ae446d93c043f2ca95684fa6192 SHA256 adc1429342c30c406bc00506e36e92be9c27a987d88ac2e5a709094ec35d9fb5
-MD5 918f6abc12ab9fe1df4b31f2aedbb8bf ChangeLog 394
-RMD160 fcc0e2ad34dc36b5efbeed77d566110b9e15d3cb ChangeLog 394
-SHA256 adc1429342c30c406bc00506e36e92be9c27a987d88ac2e5a709094ec35d9fb5 ChangeLog 394
+EBUILD cdfs-2.6.18.ebuild 818 RMD160 7170d811f5103174a485d60cb51acc768564c6aa SHA1 f868fb8d5cb43cf5d3e6f034f13e4cf042eac0ef SHA256 4fe440c4791d4db99432cbbb273928be198cf26f8022dbd0108cbf60553b0a74
+MD5 6d0022030dc09339c66e78f7b14537a7 cdfs-2.6.18.ebuild 818
+RMD160 7170d811f5103174a485d60cb51acc768564c6aa cdfs-2.6.18.ebuild 818
+SHA256 4fe440c4791d4db99432cbbb273928be198cf26f8022dbd0108cbf60553b0a74 cdfs-2.6.18.ebuild 818
+MISC ChangeLog 630 RMD160 de571f9976f1f29ac7ec65e75313938ef0a8bfa0 SHA1 3d8b00d895ff56cd8b1d349673099f927ac44a9f SHA256 31e007d1095bc0c2716c047e392259b3029f516667e55df8136d0833b26683d6
+MD5 1ae6f6a9a1fb0f937c324394da0b4d50 ChangeLog 630
+RMD160 de571f9976f1f29ac7ec65e75313938ef0a8bfa0 ChangeLog 630
+SHA256 31e007d1095bc0c2716c047e392259b3029f516667e55df8136d0833b26683d6 ChangeLog 630
 MISC metadata.xml 221 RMD160 49dc39cdb4ca59a8231a693fe4cc5a2d1c08dc72 SHA1 7638914ee9ee4af3fe13be447f1d53179deefccf SHA256 f92875fd5f370ee3b1f5827194d588b77ed8456a10137011c4618b70c7ea3df9
 MD5 f6448d858d8db15277bec783d3107045 metadata.xml 221
 RMD160 49dc39cdb4ca59a8231a693fe4cc5a2d1c08dc72 metadata.xml 221
@@ -20,7 +24,7 @@ SHA256 1206b5415fe4606968e6859314a2701321e6db4169fd79024bd95af48a9bc771 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZcaPGDyatLGpTbYRAmWJAKCBE3xYQy5kaNgsJZmk9Tw5dE60mQCfcqQE
-PuKsVihTPNukdiMUYseLpMo=
-=SJcl
+iD8DBQFFdaknGDyatLGpTbYRAukEAJ9RR2gTbQrf6UdjQQDeMCQ91XsJOQCgjVjA
+uq96xpkmD+phLWLTQiVpspQ=
+=Cjae
 -----END PGP SIGNATURE-----
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
+ };
+