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

(Portage version: 2.1.4_rc7)

3 files changed, 55 insertions, 8 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/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() {