Revert "app-emulation/virtualbox : version bump"

This reverts commit 9962d0ecc0c1a275828ddce9a071d3c2337babbb.

6 files changed, 21 insertions, 26 deletions

diff --git a/sys-kernel/virtualbox-guest-dkms/Manifest b/sys-kernel/virtualbox-guest-dkms/Manifest
index 00be23d6..640477ef 100644
--- a/sys-kernel/virtualbox-guest-dkms/Manifest
+++ b/sys-kernel/virtualbox-guest-dkms/Manifest
@@ -1 +1 @@
-DIST virtualbox-guest-dkms-5.2.8-1-x86_64.pkg.tar.xz 582516 BLAKE2B 318206d4ab1acd52f7b0282fed97424f4133e39f25d09aa61d1df9e5c1d8c21a65586f042d17f8b7fcb0f802453424ce07407a97ef58e9ec907540a9ba759772 SHA512 c9042663a42c445911e933d37c1175349ae2d7c92b346fed7ab74da80682f97378aa84961c5b57ef1302c35882c80f73f89248057f6ae149e485789eb92c317d
+DIST virtualbox-guest-dkms-5.2.4-1-x86_64.pkg.tar.xz 581104 BLAKE2B 6c6fea795267c60482dc960cdc4411729c05dd2b1a7918e6f84a35c3d0ddbc144c35a943181ee6a76f9e414304650bb6e91278f346b3a6e318584d56d3497b51 SHA512 f5bc71f84abd5b37653db8e57fd91363c690d2878b604bef0d1d9db1beaccf9dce2d0ce856d807c7b34c9949005ec67732646a59d4b13bde6795fee3411cde2d
diff --git a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
index 7799c253..86d19605 100644
--- a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
+++ b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
@@ -1,27 +1,20 @@
 diff -Nur a/dkms.conf b/dkms.conf
---- a/dkms.conf	2018-02-28 07:51:25.000000000 +0000
-+++ b/dkms.conf	2018-04-11 14:50:24.512910897 +0100
-@@ -14,18 +14,10 @@
- # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+--- a/dkms.conf	2017-12-19 21:31:10.000000000 +0000
++++ b/dkms.conf	2017-12-22 02:51:53.824679071 +0000
+@@ -15,7 +15,7 @@
  #
  
--PACKAGE_NAME="vboxguest"
--PACKAGE_VERSION=5.2.8_OSE
-+PACKAGE_NAME="virtualbox-guest-dkms"
-+PACKAGE_VERSION=5.2.8
+ PACKAGE_NAME="vboxguest"
+-PACKAGE_VERSION=5.2.4_OSE
++PACKAGE_VERSION=5.2.4
  AUTOINSTALL=yes
  
--BUILT_MODULE_NAME[0]="vboxguest"
--BUILT_MODULE_LOCATION[0]="vboxguest"
--DEST_MODULE_LOCATION[0]="/kernel/misc"
--
--BUILT_MODULE_NAME[1]="vboxsf"
--BUILT_MODULE_LOCATION[1]="vboxsf"
--DEST_MODULE_LOCATION[1]="/kernel/misc"
+ BUILT_MODULE_NAME[0]="vboxguest"
+@@ -25,7 +25,3 @@
+ BUILT_MODULE_NAME[1]="vboxsf"
+ BUILT_MODULE_LOCATION[1]="vboxsf"
+ DEST_MODULE_LOCATION[1]="/kernel/misc"
 -
 -BUILT_MODULE_NAME[2]="vboxvideo"
 -BUILT_MODULE_LOCATION[2]="vboxvideo"
 -DEST_MODULE_LOCATION[2]="/kernel/misc"
-+BUILT_MODULE_NAME[0]="vboxsf"
-+BUILT_MODULE_LOCATION[0]="vboxsf"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
diff --git a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.8.ebuild b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild
index 95d49fe6..c4823e9c 100644
--- a/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.8.ebuild
+++ b/sys-kernel/virtualbox-guest-dkms/virtualbox-guest-dkms-5.2.4.ebuild
@@ -29,8 +29,8 @@ src_compile() {
 }
 
 src_install() {
-	dodir usr/src/${P}
-	insinto usr/src/${P}
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
 	doins -r ${S}/*
 }
 
diff --git a/sys-kernel/virtualbox-modules-dkms/Manifest b/sys-kernel/virtualbox-modules-dkms/Manifest
index d4618dfc..0ccb741a 100644
--- a/sys-kernel/virtualbox-modules-dkms/Manifest
+++ b/sys-kernel/virtualbox-modules-dkms/Manifest
@@ -1 +1 @@
-DIST vbox-kernel-module-src-5.2.8.tar.xz 636172 BLAKE2B 0a0be16ee830dbf60e9bd8e0aa977ad020374d65c4ea19689bd20f7399da87633ac9ef57e2297963937e4d5eb82173a50beacd8ddd1b54943fe8d24fe723e3f4 SHA512 8875048d827ebbedec37864e219033305a228903b01d7ca22b371b02de9b23099d3bc76ddef4887b633f1215e73daa5db6e35c8d2e21f90200f439b15792d05f
+DIST vbox-kernel-module-src-5.2.4.tar.xz 634212 BLAKE2B d8be416f958f672c2ab50b5197f708bc1febca292d5262eec710c07561be7de810fb1dfd5961ef9367c91e0ac1b6033419f85444471e8d40406d4ab860de2a23 SHA512 3c2113a8781cde1a44954267ee469db91c843305a5b1468b1fd346af3f3626a3d98c8a958ec0e255401f569f75e652dbbb1a85fd6cc6b203cf170745c630cee1
diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
index bf066269..80cc6b40 100644
--- a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
+++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
@@ -1,7 +1,9 @@
 PACKAGE_NAME="virtualbox-modules-dkms"
-PACKAGE_VERSION="5.2.8"
+PACKAGE_VERSION="5.2.4"
 AUTOINSTALL="yes"
 
+MAKE[0]="'make' -j`nproc` KERNEL_UNAME=${kernelver}"
+
 BUILT_MODULE_NAME[0]="vboxdrv"
 DEST_MODULE_LOCATION[0]="/extra/dkms"
 BUILT_MODULE_NAME[1]="vboxnetflt"
diff --git a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.8.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild
index 5bc67058..00923566 100644
--- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.8.ebuild
+++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-5.2.4.ebuild
@@ -30,10 +30,10 @@ src_compile() {
 }
 
 src_install() {
-	dodir usr/src/${P}
-	insinto usr/src/${P}
+	cp ${FILESDIR}/dkms.conf ${S}
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
 	doins -r ${S}/*
-	doins ${FILESDIR}/dkms.conf
 }
 
 pkg_postinst() {