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

diff --git a/sys-fs/cdfs/ChangeLog b/sys-fs/cdfs/ChangeLog
index 4ce934a8ae877c242db21d2d22f9ee4b84f5f2df..11e73a939cd03ae408e0d92810384e01b2faae17 100644 (file)
--- 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 7b7f5b660e00c41b0d32a284458fcf43b5fbd0b8..f0e9c1e586aade5673a639b21b8bed45c7f4096c 100644 (file)
--- 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 610e6d09cfebe5dee5908e9eadf972938792fdf6..551301c2e246dc416395e734b00a6e677376fb9e 100644 (file)
--- 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 (file)
index 0000000..109e07e
--- /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
+ };
+ 

diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index e3e85fcd4ae2374940a2b90dfdbcf32022b83134..c7026c6fdb58a9e868b70ea298c01c80e162e8fc 100644 (file)
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,33 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+DIST ecryptfs-util-3.tar.bz2 1144746 RMD160 33e4c8b5a1d5d3c97afee8eebaa2d97b1878945e SHA1 e7af1890bd4851f983ade94e4e47fae085de3213 SHA256 9e0957adfcc32aea770dba8d6022dba3ea44fb2d0e571a213b1778da1a0bc819
 DIST ecryptfs-utils-5.tar.bz2 1159582 RMD160 0769b7885b69647aac839245736032ab041cf9c9 SHA1 c4b317174bd3011ecadfb3a17e131556f81b9199 SHA256 31123772602ec1e389c3eeeaf7cf91e42d5582dfe874500e3933c0f17c1f1330
-EBUILD ecryptfs-utils-3.ebuild 555 RMD160 4b14a700360ad0b08e17261023c6295c89f0e0e8 SHA1 1864f5c79ede8812feb00858f1ee3c816a5710fb SHA256 9deb50073e0793f9dce4d1e7b4a66909cf6f9d5e967841979e04fe2ba3a1e8d1
-MD5 961a3922fa5b740528e6054797d7fc96 ecryptfs-utils-3.ebuild 555
-RMD160 4b14a700360ad0b08e17261023c6295c89f0e0e8 ecryptfs-utils-3.ebuild 555
-SHA256 9deb50073e0793f9dce4d1e7b4a66909cf6f9d5e967841979e04fe2ba3a1e8d1 ecryptfs-utils-3.ebuild 555
+EBUILD ecryptfs-utils-3.ebuild 554 RMD160 17f2f0d901de21477d3322c0abc3f5bb80ef6cd4 SHA1 2aba2e6c86ddff474036eb7eb73c75c1dc886b2b SHA256 850b10aa246c903df036e27a9d6fff56d72a623ba51d293f43e79a961ddf4fba
+MD5 343a402496cb84a770a29dd2bfbe8c4a ecryptfs-utils-3.ebuild 554
+RMD160 17f2f0d901de21477d3322c0abc3f5bb80ef6cd4 ecryptfs-utils-3.ebuild 554
+SHA256 850b10aa246c903df036e27a9d6fff56d72a623ba51d293f43e79a961ddf4fba ecryptfs-utils-3.ebuild 554
 EBUILD ecryptfs-utils-5.ebuild 543 RMD160 9f760f6e0dddadaa757b1262dd6eb14725ae8096 SHA1 9fa5a59af48974066b073d86a277c521a19e3b35 SHA256 c6eac3841665980247c68d7d5ed1356c485084c5619fcd4a48259be370437a0c
 MD5 86ef9d78dda868ed1a62d0e9c4a12005 ecryptfs-utils-5.ebuild 543
 RMD160 9f760f6e0dddadaa757b1262dd6eb14725ae8096 ecryptfs-utils-5.ebuild 543
 SHA256 c6eac3841665980247c68d7d5ed1356c485084c5619fcd4a48259be370437a0c ecryptfs-utils-5.ebuild 543
-MISC ChangeLog 757 RMD160 7016eef6f88bd9ae2278a25875bccad53ed24c9c SHA1 bb1d911581290d3793cb13bd63b846481fd01e84 SHA256 7bc00596ca52c83bc585bccbeeff763d9d5cef0b546d2dc66cae4ffabe66aac4
-MD5 ca240f741567a41a6c333c99b13726b7 ChangeLog 757
-RMD160 7016eef6f88bd9ae2278a25875bccad53ed24c9c ChangeLog 757
-SHA256 7bc00596ca52c83bc585bccbeeff763d9d5cef0b546d2dc66cae4ffabe66aac4 ChangeLog 757
+MISC ChangeLog 867 RMD160 49e8059ff70b48122904e60f90043c1da10e6aed SHA1 c82102ff6cb0c0fc199f38c27fa2fe06dfc80777 SHA256 5a14dcd260ce15241b7bf5f2a4f3b23dd2623e8820c141188ffbf4322e4addae
+MD5 302441c822e5f015250e8de682ce7f36 ChangeLog 867
+RMD160 49e8059ff70b48122904e60f90043c1da10e6aed ChangeLog 867
+SHA256 5a14dcd260ce15241b7bf5f2a4f3b23dd2623e8820c141188ffbf4322e4addae ChangeLog 867
 MISC metadata.xml 261 RMD160 0c7d4e3e4b4ffac34cd699120c61fa2366bfb4a7 SHA1 34a25d1200b324ab541fcf1d9365e22320a84ceb SHA256 fc944b669a3216ff1b518c11e4a12a5abd13e3319cab6090d6e08a23b11fd397
 MD5 4c5e9712ec20075e648fcee15647d27e metadata.xml 261
 RMD160 0c7d4e3e4b4ffac34cd699120c61fa2366bfb4a7 metadata.xml 261
 SHA256 fc944b669a3216ff1b518c11e4a12a5abd13e3319cab6090d6e08a23b11fd397 metadata.xml 261
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ecryptfs-utils-3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ecryptfs-utils-3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ecryptfs-utils-3 0
+MD5 8b2d71fe5f50d70bdea8c4d91d4c2879 files/digest-ecryptfs-utils-3 253
+RMD160 386105a4ee72cc48d79b190860e176c171b7cb8a files/digest-ecryptfs-utils-3 253
+SHA256 c09ef9815fdf86d3ca1b0162ed276b77721662357bd3c494d5e5ce3daa4e5e5c files/digest-ecryptfs-utils-3 253
 MD5 1b90f880ff26f072e14ba054f4c84fcd files/digest-ecryptfs-utils-5 256
 RMD160 138eb28bd1bc20d2d643dba50b95316e14470505 files/digest-ecryptfs-utils-5 256
 SHA256 fd5dd202c3ae3622e771d163dd7c8646fa255bb328ca3c4e0c80bfe3942f2b84 files/digest-ecryptfs-utils-5 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFdIrgI1lqEGTUzyQRAj5dAKChvxaPTDdtlhjgPBDXW3aInpmGhQCdEhu8
-TCNWVHJ+6a1G4hMNGyBl60I=
-=B2Rd
------END PGP SIGNATURE-----