From 3f41f9237243fd7b26a7885dfcf9ab1a8cd90397 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 18 Dec 2016 12:41:45 +0100
Subject: app-emulation/virtualbox-modules: Backport fix for compatibility with
 linux-4.9

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602942

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 .../files/virtualbox-modules-5.1.10-ALIGN-backport.patch     | 12 ++++++++++++
 app-emulation/virtualbox-modules/metadata.xml                |  6 +++---
 .../virtualbox-modules/virtualbox-modules-5.1.10.ebuild      |  4 ++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch

(limited to 'app-emulation')

diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch
new file mode 100644
index 000000000000..1bc3fdddcb3d
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.10-ALIGN-backport.patch
@@ -0,0 +1,12 @@
+Index: trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h
+===================================================================
+--- a/vboxdrv/SUPDrvInternal.h
++++ b/vboxdrv/SUPDrvInternal.h
+@@ -65,7 +65,4 @@
+ #           include <linux/modversions.h>
+ #       endif
+-#   endif
+-#   if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
+-#       undef ALIGN
+ #   endif
+ #   ifndef KBUILD_STR
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 18da31a25e19..851d70de80c5 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -9,7 +9,7 @@
     <email>masterzorag@gmail.com</email>
     <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
-<use>
-	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
-</use>
+  <use>
+    <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.10.ebuild
index 76cc8f0e241b..847e3c7ba966 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.10.ebuild
@@ -27,6 +27,10 @@ BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ALIGN-backport.patch
+)
+
 pkg_setup() {
 	enewgroup vboxusers
 
-- 
cgit v1.2.3-18-g5258