Only apply 2.6.24 patch if there is such a kernel and add more patch stuff from upstream, thanks to Bjoern Olausson in bug #199798

Package-Manager: portage-2.1.4_rc7

4 files changed, 70 insertions, 23 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 24e647bcf50f..3a8ffb0b3769 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.12 2007/12/05 23:01:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.13 2007/12/06 19:14:10 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  files/virtualbox-modules_2.6.24.patch, virtualbox-modules-1.5.2-r1.ebuild:
+  Only apply 2.6.24 patch if there is such a kernel and add more patch stuff
+  from upstream, thanks to Bjoern Olausson in bug #199798
 
 *virtualbox-modules-1.5.2-r1 (05 Dec 2007)
 
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index d5c71bfb8b00..1a7d91e7de8b 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX virtualbox-modules_2.6.24.patch 365 RMD160 8fe9040da50bf086a6ad291516919630fa994788 SHA1 c509eb9bfd1e79c8897ccd573932194e39f8bfad SHA256 b5023b7ca274c01c6b77c3cc19c685567856a032eeb03f5dd30140f0600f9613
-MD5 747482734c94f11749d71a1bd7d414cb files/virtualbox-modules_2.6.24.patch 365
-RMD160 8fe9040da50bf086a6ad291516919630fa994788 files/virtualbox-modules_2.6.24.patch 365
-SHA256 b5023b7ca274c01c6b77c3cc19c685567856a032eeb03f5dd30140f0600f9613 files/virtualbox-modules_2.6.24.patch 365
+AUX virtualbox-modules_2.6.24.patch 1765 RMD160 152cc9fb6c4d34c6cc1f3b5de952cacf3be410e0 SHA1 b760bd9843a7b95a5d4e9b44922b219c95289e40 SHA256 daf636f8567ee6696acb434580efd4a0e4f47355378227ce03c18edc983118f8
+MD5 bbd0414511d6640845f4850f71675726 files/virtualbox-modules_2.6.24.patch 1765
+RMD160 152cc9fb6c4d34c6cc1f3b5de952cacf3be410e0 files/virtualbox-modules_2.6.24.patch 1765
+SHA256 daf636f8567ee6696acb434580efd4a0e4f47355378227ce03c18edc983118f8 files/virtualbox-modules_2.6.24.patch 1765
 DIST vbox-kernel-module-src-1.5.2.tar.gz 203247 RMD160 942b0d520dd638c18ba782c325c6c1d41b62d8d7 SHA1 f2b229884fbf372e9eebcf3a3ab859ed92bbbb84 SHA256 29ca917b9032c82b632d8557e26474bbac8086015311eb57c23fec3bf8ebe4e2
-EBUILD virtualbox-modules-1.5.2-r1.ebuild 1095 RMD160 947bbb63e61f9371120df9a4ee8740351cc7ea98 SHA1 af897ac3a486a60422a845de0676298ee2bff692 SHA256 832913f13c8c95c06877ef05f55012c1ce8b16d42fc2b49b4eac1035fc2df5e0
-MD5 1d2c6e6e61200fe2d7c1ea27043a04f6 virtualbox-modules-1.5.2-r1.ebuild 1095
-RMD160 947bbb63e61f9371120df9a4ee8740351cc7ea98 virtualbox-modules-1.5.2-r1.ebuild 1095
-SHA256 832913f13c8c95c06877ef05f55012c1ce8b16d42fc2b49b4eac1035fc2df5e0 virtualbox-modules-1.5.2-r1.ebuild 1095
-MISC ChangeLog 1530 RMD160 13f49bba94bc0401fb760742c0f4c0580340c13b SHA1 b296aa9a26cb6dcc4c91018a531ec11cc54833ce SHA256 44246394dcb053c9f5d4d979af9131e540596ca3fcacced11d1835899a808fc9
-MD5 53e78fffd21609bbb221dd197c1cef65 ChangeLog 1530
-RMD160 13f49bba94bc0401fb760742c0f4c0580340c13b ChangeLog 1530
-SHA256 44246394dcb053c9f5d4d979af9131e540596ca3fcacced11d1835899a808fc9 ChangeLog 1530
+EBUILD virtualbox-modules-1.5.2-r1.ebuild 1139 RMD160 71c11b30eb9fbf889143618ef879d75256619594 SHA1 41183956ed353e517c6b957827fc20330472e983 SHA256 9f4a9e15fa3eb8c240804523e66cf8c109759933317ea37edca031143080b206
+MD5 7f4daf3997046a0c1978040490f2c8bc virtualbox-modules-1.5.2-r1.ebuild 1139
+RMD160 71c11b30eb9fbf889143618ef879d75256619594 virtualbox-modules-1.5.2-r1.ebuild 1139
+SHA256 9f4a9e15fa3eb8c240804523e66cf8c109759933317ea37edca031143080b206 virtualbox-modules-1.5.2-r1.ebuild 1139
+MISC ChangeLog 1792 RMD160 69aa36474b11e6e7bde86511a405816de5406702 SHA1 7cb8f68dd19cb5a3dab2b0a2b13130479e60923c SHA256 4a65cdc8c40a743f34400792be79ea89984e35a1eb6f7ce879646572dfc7e51b
+MD5 997a48499f712d282aa118649ed2c5c3 ChangeLog 1792
+RMD160 69aa36474b11e6e7bde86511a405816de5406702 ChangeLog 1792
+SHA256 4a65cdc8c40a743f34400792be79ea89984e35a1eb6f7ce879646572dfc7e51b ChangeLog 1792
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
@@ -24,7 +24,7 @@ SHA256 7700dc5f7e2beed2ab506bd1086c4c294a77ff28f5c5671dac0143ba5d526dbe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHVy3Kz974XjDVpbkRAhEbAKCvpX3VNrEb9F7E+tJyyaQtLA/U9ACglTkW
-3OP25zXLOB+/20gGnwR8/q0=
-=XVzM
+iD8DBQFHWEoLz974XjDVpbkRAqq/AJ91G5Q1ax7RoEnLlXYGBYUtHDlzsQCgjQ/t
+eH7Mbv436MeLLf2eIPWI9e0=
+=TmzJ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch
index 76c11015b05d..599a1d4b7d7b 100644
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch
@@ -1,11 +1,51 @@
---- include/iprt/types.h~	2007-11-20 17:15:54.000000000 +0100
-+++ include/iprt/types.h	2007-11-20 17:15:54.000000000 +0100
-@@ -69,6 +69,8 @@
+Index: include/iprt/types.h
+===================================================================
+--- include/iprt/types.h	(revision 5703)
++++ include/iprt/types.h	(revision 5704)
+@@ -58,8 +58,9 @@
+     /*
+      * Kludge for the linux kernel:
+      *   1. sys/types.h doesn't mix with the kernel.
+-     *   2. Starting with 2.6.19 linux/types.h typedefs bool and linux/stddef.h
++     *   2. Starting with 2.6.19, linux/types.h typedefs bool and linux/stddef.h
+      *      declares false and true as enum values.
++     *   3. Starting with 2.6.24, linux/types.h typedefs uintptr_t.
+      * We work around these issues here and nowhere else.
+      */
+ #  include <stddef.h>
+@@ -69,8 +70,10 @@
  #  define bool linux_bool
  #  define true linux_true
  #  define false linux_false
 +#  define uintptr_t linux_uintptr_t
-+#  include <linux/autoconf.h>
  #  include <linux/types.h>
  #  include <linux/stddef.h>
++#  undef uintptr_t
  #  undef false
+ #  undef true
+ #  undef bool
+Index: include/iprt/types.h
+===================================================================
+--- include/iprt/types.h	(revision 5764)
++++ include/iprt/types.h	(revision 5765)
+@@ -71,6 +71,7 @@
+ #  define true linux_true
+ #  define false linux_false
+ #  define uintptr_t linux_uintptr_t
++#  include <linux/autoconf.h>
+ #  include <linux/types.h>
+ #  include <linux/stddef.h>
+ #  undef uintptr_t
+Index: Config.kmk
+===================================================================
+--- Config.kmk	(revision 5764)
++++ Config.kmk	(revision 5765)
+@@ -1263,7 +1263,7 @@
+    kernelpath := $(VBOX_LINUX_SRC)
+   endif
+   ifeq ($(BUILD_TARGET_ARCH),x86)
+-    VBOX_LINUX_INCS                += $(kernelpath)/include/asm-i386/mach-default
++    VBOX_LINUX_INCS                += $(kernelpath)/include/asm/mach-default
+   endif
+  endif
+ endif
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild
index 7377c7996323..d58c47420420 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild,v 1.1 2007/12/05 23:01:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2-r1.ebuild,v 1.2 2007/12/06 19:14:10 jokey Exp $
 
-inherit eutils linux-mod
+inherit eutils linux-mod linux-info
 
 MY_P=vbox-kernel-module-src-${PV}
 DESCRIPTION="Modules for Virtualbox OSE"
@@ -31,7 +31,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}_2.6.24.patch
+	if kernel_is 2 6 24 ; then
+		epatch "${FILESDIR}"/${PN}_2.6.24.patch
+	fi
 }
 
 src_install() {