virtualbox-modules: Hack together some fixes for 3.9 kernels.

9 files changed, 236 insertions, 127 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index c611c3a..35f331a 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,181 @@
 # ChangeLog for app-emulation/virtualbox-modules
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.92 2011/11/01 10:54:11 chainsaw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.126 2013/04/13 20:11:36 polynomial-c Exp $
+
+*virtualbox-modules-4.2.12 (13 Apr 2013)
+*virtualbox-modules-4.1.26 (13 Apr 2013)
+
+  13 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.26.ebuild, -virtualbox-modules-4.2.8.ebuild,
+  +virtualbox-modules-4.2.12.ebuild:
+  Version bump. Removed old.
+
+  09 Apr 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
+  Removing Alessio from metadata
+
+  17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
+  Add proxy-maintainers to metadata.xml
+
+*virtualbox-modules-4.2.10 (15 Mar 2013)
+
+  15 Mar 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.2.6.ebuild, +virtualbox-modules-4.2.10.ebuild:
+  Version bump. Removed old.
+
+*virtualbox-modules-4.2.8 (28 Feb 2013)
+
+  28 Feb 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch,
+  -virtualbox-modules-4.1.22.ebuild, -virtualbox-modules-4.2.4.ebuild,
+  +virtualbox-modules-4.2.8.ebuild:
+  Version bump. Removed old.
+
+  14 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
+  virtualbox-modules-4.1.24.ebuild:
+  Stable for x86, wrt bug #447892
+
+  14 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
+  virtualbox-modules-4.1.24.ebuild:
+  Stable for amd64, wrt bug #447892
+
+*virtualbox-modules-4.2.6 (21 Dec 2012)
+*virtualbox-modules-4.1.24 (21 Dec 2012)
+
+  21 Dec 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.24.ebuild, -virtualbox-modules-4.2.2.ebuild,
+  +virtualbox-modules-4.2.6.ebuild, +files/create_vbox_modules_tarball.sh:
+  Version bump. Removed old. Added a script to create the modules tarball out
+  of a VirtualBox binary package.
+
+*virtualbox-modules-4.2.4 (10 Nov 2012)
+
+  10 Nov 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.2.0-r1.ebuild, +virtualbox-modules-4.2.4.ebuild:
+  Version bump. Removed old.
+
+*virtualbox-modules-4.2.2 (24 Oct 2012)
+
+  24 Oct 2012; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-modules-4.2.2.ebuild:
+  Bump #439366
+
+  18 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.12.ebuild, -virtualbox-modules-4.1.18.ebuild:
+  Removed old versions.
+
+  17 Sep 2012; Andreas Schuerch <nativemad@gentoo.org>
+  virtualbox-modules-4.1.22.ebuild:
+  x86 stable, see bug 434872
+
+  16 Sep 2012; Agostino Sarubbo <ago@gentoo.org>
+  virtualbox-modules-4.1.22.ebuild:
+  Stable for amd64, wrt bug #434872
+
+*virtualbox-modules-4.2.0-r1 (14 Sep 2012)
+
+  14 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.2.0.ebuild, +virtualbox-modules-4.2.0-r1.ebuild:
+  Fixed 4.2.0 tarball (4.1.22 version was mistakenly packaged as 4.2.0 version).
+  This fixes bug #434958.
+
+*virtualbox-modules-4.2.0 (13 Sep 2012)
+
+  13 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.20.ebuild, +virtualbox-modules-4.2.0.ebuild:
+  Version bump. Removed old.
+
+*virtualbox-modules-4.1.22 (09 Sep 2012)
+
+  09 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.22.ebuild:
+  Version bump.
+
+*virtualbox-modules-4.1.20 (21 Aug 2012)
+
+  21 Aug 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.16.ebuild, +virtualbox-modules-4.1.20.ebuild:
+  Version bump. Removed old.
+
+  07 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  virtualbox-modules-4.1.18.ebuild:
+  Stable on amd64 wrt bug #427852
+
+*virtualbox-modules-4.1.18 (20 Jun 2012)
+
+  20 Jun 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.14.ebuild, +virtualbox-modules-4.1.18.ebuild:
+  Version bump. Removed old.
+
+  01 Jun 2012; Zac Medico <zmedico@gentoo.org> virtualbox-modules-4.1.12.ebuild,
+  virtualbox-modules-4.1.14.ebuild, virtualbox-modules-4.1.16.ebuild:
+  inherit user for enewgroup
+
+*virtualbox-modules-4.1.16 (23 May 2012)
+
+  23 May 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.16.ebuild:
+  Version bump.
+
+*virtualbox-modules-4.1.14 (26 Apr 2012)
+
+  26 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.4.ebuild, -virtualbox-modules-4.1.8.ebuild,
+  -virtualbox-modules-4.1.10.ebuild, +virtualbox-modules-4.1.14.ebuild:
+  Version bump. Removed old.
+
+  24 Apr 2012; Agostino Sarubbo <ago@gentoo.org>
+  virtualbox-modules-4.1.12.ebuild:
+  Stable for amd64, wrt bug #412565
+
+  22 Apr 2012; Markus Meier <maekke@gentoo.org>
+  virtualbox-modules-4.1.12.ebuild:
+  x86 stable, bug #412565
+
+  09 Apr 2012; Markus Meier <maekke@gentoo.org>
+  virtualbox-modules-4.1.8.ebuild:
+  x86 stable, bug #403441
+
+*virtualbox-modules-4.1.12 (05 Apr 2012)
+
+  05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.6.ebuild, +virtualbox-modules-4.1.12.ebuild:
+  Version bump (bug #410811). Removed old.
+
+*virtualbox-modules-4.1.10 (15 Mar 2012)
+
+  15 Mar 2012; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-4.1.10.ebuild:
+  Version bump.
+
+  21 Feb 2012; Agostino Sarubbo <ago@gentoo.org>
+  virtualbox-modules-4.1.8.ebuild:
+  Stable for amd64, wrt bug #403441
+
+*virtualbox-modules-4.1.8 (20 Dec 2011)
+
+  20 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.0.12.ebuild, +virtualbox-modules-4.1.8.ebuild:
+  Version bump. Removed old.
+
+  07 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  virtualbox-modules-4.1.4.ebuild:
+  x86 stable wrt bug #386317
+
+  03 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-modules-4.1.6.ebuild,
+  +files/virtualbox-modules-4.1.6-kernel-3.2-vboxpci.patch:
+  Fixed compilation with kernel-3.2 (bug #389953). Thanks to Fabio Rossi for
+  providing a patch.
+
+  06 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-modules-4.1.4.ebuild, virtualbox-modules-4.1.6.ebuild:
+  Added kernel version check for pax patch. Cleaned up 4.1.4 ebuild a bit.
+
+*virtualbox-modules-4.1.6 (04 Nov 2011)
+
+  04 Nov 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-modules-4.1.2.ebuild, +virtualbox-modules-4.1.6.ebuild:
+  Version bump. Removed old.
 
   01 Nov 2011; Tony Vroon <chainsaw@gentoo.org>
   virtualbox-modules-4.1.4.ebuild:
@@ -507,4 +682,3 @@
   23 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
   virtualbox-modules-1.3.8.ebuild, virtualbox-modules-1.4.0.ebuild:
   Fix headers, thanks to x-drum
-
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 27d780b..bb64110 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,8 +1,8 @@
-AUX 4.1.4-kernel-3.2-compile.patch 1398 RMD160 5233c96295a4a7f0a6baeb5b0d677b528065f77a SHA1 62c446de0c4c8f2f8430c0d8658d136d348d12cc SHA256 acb5a611491e79e0baf11c1812ec9c0749db62977f894f768f812905322a43d1
-AUX virtualbox-modules-4.1.4-pax-const.patch 2335 RMD160 6d082729b5393bab9c185cdc768488636ac9e59e SHA1 efc1fa014934afa0ea3ae692d93e1996441945a2 SHA256 d23da93fa1a3b7833766caa8329745ed7de7a5ed6ce1fecb090325fdc83e42f3
-DIST vbox-kernel-module-src-4.1.4.tar.bz2 505952 RMD160 c540fb563d6fdab747366c66d5e472ebffbd3639 SHA1 35a4274118d44bd8603fecfa93817ef129c8e57c SHA256 03577cd31e5ff322102e9bec1ed40f189c50d94032e2d62206b6541a0fda1fb8
-DIST vbox-kernel-module-src-4.1.6.tar.xz 454840 RMD160 f1166c7b2e95276a60beb4c6dbe022826bc21ff2 SHA1 7816f6773f00f28cb287eaf4eb8b31a9b3bbdd37 SHA256 557425714e5d9e1b737c963d5a4d1b67a6e60ec47c2ddf2449dbbfd786c41cdf
-EBUILD virtualbox-modules-4.1.4.ebuild 1723 RMD160 4b8dc0e9b7e18746c9027688aefe11a551928301 SHA1 98a699a9e7224c27291b37b303f0ba5be6ad7484 SHA256 5028e96492d0853273f94bb522763b8c5723db514811c6b85b39f91ce6cc6cff
-EBUILD virtualbox-modules-4.1.6.ebuild 1650 RMD160 c7eccd0c8785debcfbb19a669ea586364e4153bd SHA1 99344958e3d312facee1cff7fa57be2315df3113 SHA256 ccf05c1edd980f70492729527d4091d7a15ee6950aad5874d5db9bc157979c59
-MISC ChangeLog 17010 RMD160 371fafb22d0e5540d84697a7f915366a276c2879 SHA1 5f43f1c0eb18d5aecea5019d22c893c39d437218 SHA256 230099a96dd152cd75fd24f3765313d2ac39361b3eb7b86969dc20af8eed0efc
-MISC metadata.xml 524 RMD160 605893cae913de8fca2a99e283854a7c195fa4e2 SHA1 a476b7fcd62a5d1a54ad1a018c4daac50bb27d0b SHA256 9ae0eab26084901b8d307d8923f5c130d310deceb09047aae884557a00f70bbb
+AUX 4.2.12-fix-MAX_RT_PRIO-undeclared.patch 454 SHA256 a53031222f7fb2cc08523aa654c9d754a2a701311bb29c75e8c97d48ad18d404 SHA512 d76fc4848f0349138c3b500c4ebdbe66ef19ceff0b18a4174939a1d4e6c3b23366c7589b48926ecb5b36193746b627767b17ab2f946b639be9aea4c8117174c5 WHIRLPOOL f794e08360d82b3d3cd96e482f1c7008d1dc55ce3c51cb05332e497331bc14378104795b83e928bee9ba9e0a5a3ced7d24cf4c05f90440f10c2bfe3ad416cf61
+AUX 4.2.12-fix-VM_RESERVED-undeclared.patch 792 SHA256 7b2102c5e75d76a63b9ccbd3d9fe971db8e492a896fe281b412d6bce47272170 SHA512 ae88d4b53ae7b285314f6ff5e27f5acc1a62b5ccdeecf9732d02c89658c8fafcf10a84343095ea5be15dd688b1aba5512c21289519ddb62c767bfe008453e00a WHIRLPOOL a5998d13863a76db7f1865aac19f15977ddfcdf42ab7d1e6b5a171dd8803e2a082eafb29bd004246810875fcc5763894dafa4d8a70f7d2a4a84ff780b0473dc5
+AUX create_vbox_modules_tarball.sh 661 SHA256 2c325859be34acb8589781dafd1e64e3d93c7995fcc1b3d41a549a2c8348de4e SHA512 1f6f1502fbf666b0afeb402290e8fdf0435a9e4356102fc0ee5c26635a8e9948b3fd427bad205a6163beebd2917b0a5d1f547afef3a549489cc0afe229722bf8 WHIRLPOOL d6b8eddbe9bbbe864db5c754cef5d7b31e43f7f388ee28b473479c241c71cba3cef83aaa3661e72511a2248832ec8420c84e1b056894623ef88a3d144989aff7
+AUX virtualbox-modules-4.1.4-pax-const.patch 2335 SHA256 d23da93fa1a3b7833766caa8329745ed7de7a5ed6ce1fecb090325fdc83e42f3 SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1 WHIRLPOOL b875d0747bdf3c2970d9dc84c7e4f6fac1bd37b85ba6086a981397c8b506a7af2709fa94317896650fd9ae98921d40f399e589b851eb2da2f9854eb1f443930c
+DIST vbox-kernel-module-src-4.2.12.tar.xz 492836 SHA256 f68078b9cdb4c76972b4e39421a6e5ced370b6159a38826c8acabe27f0231eb9 SHA512 b0f37d8b5454ffb4588eb60c667aec58e349b62253366bb3e89d8995dd5fc6ddf4fc8d8c2bd5054b9bf3ef5602428a2cd66f1d5aeaefb34255d7726f60fa9906 WHIRLPOOL e6a7f2f82a65782783616ab430b8bf3663970b7d598f33d8368e3c8f1bfc763b53937f8cb3c99937c8c104215c50a5de4cf8a1e5e17b76c23180a020945b57f9
+EBUILD virtualbox-modules-4.2.12.ebuild 1727 SHA256 377fcd09d7198a78f04355b63ed4e49d9d852fe69d29d3dd6e999c4ea055ec6d SHA512 651e39c2253828f0945ae489c3dbda085738f4ab4e07513d240ba56124517fece17fa10e0e5da45e548b9d128d226e473c083299a77094c07aa2a72975a9f84c WHIRLPOOL c8877d8574836e5a5a0930c6ce2d97c382496a78d42fd09306db2a497ed339c2f3520aa5e4b8424876807de5f02e58075fea64207cb95df4a01b6afdb009922f
+MISC ChangeLog 22882 SHA256 cd3892c638469ba96b468839a6c0c3f6483c8db40c424809795f9c610570b2f0 SHA512 bfe4d2fda960864c2fa199a140844543f8911b15caf70552213d6d478ffbe57211d37cb284fa9161e41b46542305dc203a5d808db2a607cc6c3f918bd8dc29b7 WHIRLPOOL 81cf5598f9471e79d0dc6ca515bf5a95240253d45e42639ee6187a686bd372f2e85240d6e88dc347a07c253fc2aefe0c32d6274a5d11875efbdd616db94759ea
+MISC metadata.xml 431 SHA256 dd5f585b5465db14257bab08b1e7fe6f9ceca47d631bb8418665dd4ab0819e77 SHA512 6269d132a33ffae160ed2b4b87618ef764b990bfdbdaf026401a0794b48fb2bd0c4203892a4e0e31904b84f967cd4ef5343dcfa6e2bdb9e755894d9906b38df8 WHIRLPOOL 8d8b65880991d6feecd562639e4da520247dae4418cb7869e03ae775be668898dd1a84141a4146f17d8c6e9e0a5d1a0fe5ecc64517b03f19bd2777ccf84f41c5
diff --git a/app-emulation/virtualbox-modules/files/4.1.4-kernel-3.2-compile.patch b/app-emulation/virtualbox-modules/files/4.1.4-kernel-3.2-compile.patch
deleted file mode 100644
index 5dcb904..0000000
--- a/app-emulation/virtualbox-modules/files/4.1.4-kernel-3.2-compile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur work.orig/vboxpci/linux/VBoxPci-linux.c work/vboxpci/linux/VBoxPci-linux.c
---- work.orig/vboxpci/linux/VBoxPci-linux.c	2011-11-08 12:00:19.358988620 -0600
-+++ work/vboxpci/linux/VBoxPci-linux.c	2011-11-08 12:02:04.248848673 -0600
-@@ -35,11 +35,19 @@
- #ifdef VBOX_WITH_IOMMU
- #include <linux/dmar.h>
- #include <linux/intel-iommu.h>
-+#include <linux/pci.h>
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
- # include <asm/amd_iommu.h>
- #else
- # include <linux/amd-iommu.h>
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-+#define IOMMU_PRESENT() iommu_found()
-+#define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc()
-+#else
-+#define IOMMU_PRESENT() iommu_present(&pci_bus_type)
-+#define IOMMU_DOMAIN_ALLOC() iommu_domain_alloc(&pci_bus_type)
-+#endif
- #endif
- 
- 
-@@ -146,7 +154,7 @@
- #endif
- 
- #ifdef VBOX_WITH_IOMMU
--    if (iommu_found())
-+    if (IOMMU_PRESENT())
-         printk(KERN_INFO "vboxpci: IOMMU found\n");
-     else
-         printk(KERN_INFO "vboxpci: IOMMU not found (not registered)\n");
-@@ -984,9 +992,9 @@
-     printk(KERN_DEBUG "vboxPciOsInitVm: %p\n", pThis);
- #endif
- #ifdef VBOX_WITH_IOMMU
--    if (iommu_found())
-+    if (IOMMU_PRESENT())
-     {
--        pThis->pIommuDomain = iommu_domain_alloc();
-+        pThis->pIommuDomain = IOMMU_DOMAIN_ALLOC();
-         if (!pThis->pIommuDomain)
-         {
-             printk(KERN_DEBUG "cannot allocate IOMMU domain\n");
diff --git a/app-emulation/virtualbox-modules/files/4.2.12-fix-MAX_RT_PRIO-undeclared.patch b/app-emulation/virtualbox-modules/files/4.2.12-fix-MAX_RT_PRIO-undeclared.patch
new file mode 100644
index 0000000..a4b894b
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/4.2.12-fix-MAX_RT_PRIO-undeclared.patch
@@ -0,0 +1,11 @@
+diff -ur work.orig/vboxdrv/r0drv/linux/thread2-r0drv-linux.c work/vboxdrv/r0drv/linux/thread2-r0drv-linux.c
+--- work.orig/vboxdrv/r0drv/linux/thread2-r0drv-linux.c	2013-04-25 09:20:51.276031316 -0500
++++ work/vboxdrv/r0drv/linux/thread2-r0drv-linux.c	2013-04-25 09:22:10.166030387 -0500
+@@ -35,6 +35,7 @@
+ #include <iprt/thread.h>
+ #include <iprt/err.h>
+ #include "internal/thread.h"
++#include "linux/sched/rt.h"
+ 
+ 
+ RTDECL(RTTHREAD) RTThreadSelf(void)
diff --git a/app-emulation/virtualbox-modules/files/4.2.12-fix-VM_RESERVED-undeclared.patch b/app-emulation/virtualbox-modules/files/4.2.12-fix-VM_RESERVED-undeclared.patch
new file mode 100644
index 0000000..a194dbe
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/4.2.12-fix-VM_RESERVED-undeclared.patch
@@ -0,0 +1,12 @@
+diff -ur work.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+--- work.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c	2013-04-25 09:20:51.276031316 -0500
++++ work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c	2013-04-25 09:21:13.496030901 -0500
+@@ -1459,7 +1459,7 @@
+                     rc = vm_insert_page(vma, ulAddrCur, pMemLnxToMap->apPages[iPage]);
+                     /* Thes flags help making 100% sure some bad stuff wont happen (swap, core, ++).
+                      * See remap_pfn_range() in mm/memory.c */
+-#if    LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
++#if    LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+                     vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+ #else
+                     vma->vm_flags |= VM_RESERVED;
diff --git a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
new file mode 100755
index 0000000..9bbc920
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Create a virtualbox modules tarball from a VirtualBox binary package.
+# We cannot download the package by this script because of the unpredictable 
+# build number being in the filename.
+# 
+# usage: create_vbox_modules_tarball.sh VirtualBox-4.1.18-78361-Linux_amd64.run
+
+[ -f "$1" ] || exit 1
+
+VBOX_PACKAGE="$1"
+
+VBOX_VER="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-\([[:digit:]\.]\+\).*@\1@')"
+
+sh ${VBOX_PACKAGE} --noexec --keep --nox11 || exit 2
+cd install || exit 3
+tar -xaf VirtualBox.tar.bz2 || exit 4
+cd src/vboxhost || exit 5
+tar -cvJf ../../../vbox-kernel-module-src-${VBOX_VER}.tar.xz . || exit 6
+cd ../../.. && rm install -rf
+
+exit 0
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index 4f33f93..7401e9b 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -9,10 +9,6 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-<maintainer>
-  <email>swapon@gmail.com</email>
-  <name>Alessio Cassibba</name>
-</maintainer>
 <use>
 	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
 </use>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
deleted file mode 100644
index 27ceca3..0000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.3 2011/11/01 10:54:11 chainsaw Exp $
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	epatch "${FILESDIR}"/4.1.4-kernel-3.2-compile.patch
-
-	use pax_kernel && epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "Starting with the 3.x release new kernel modules were added,"
-	elog "be sure to load all the needed modules."
-	elog ""
-	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
-	if has_version sys-apps/openrc; then
-		elog "/etc/conf.d/modules"
-	else
-		elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-	fi
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.12.ebuild
index 49f833c..1d9be48 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.12.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.2 2011/11/06 13:16:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.12.ebuild,v 1.1 2013/04/13 20:11:36 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
 
 EAPI=4
 
-inherit eutils linux-mod
+inherit eutils linux-mod user
 
 MY_P=vbox-kernel-module-src-${PV}
 DESCRIPTION="Kernel Modules for Virtualbox"
@@ -40,11 +40,12 @@ src_prepare() {
 		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
 	fi
 
-	epatch "${FILESDIR}"/4.1.4-kernel-3.2-compile.patch
-
 	if use pax_kernel && kernel_is -ge 3 0 0 ; then
 		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
 	fi
+
+	epatch "${FILESDIR}"/4.2.12-fix-MAX_RT_PRIO-undeclared.patch
+	epatch "${FILESDIR}"/4.2.12-fix-VM_RESERVED-undeclared.patch
 }
 
 src_install() {