sys-kernel/virtualbox-modules-dkms : version bump

6 files changed, 24 insertions, 28 deletions

diff --git a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.18-r2 b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.38
index 5d005407..b037e93f 100644
--- a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.18-r2
+++ b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.38
@@ -7,7 +7,8 @@ INHERIT=eutils unpacker
 KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=sys-apps/ethtool sys-kernel/dkms
+RESTRICT=mirror
 SLOT=0
-SRC_URI=http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/virtualbox-dkms_6.1.18-dfsg-2_amd64.deb
+SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.38/vbox-kernel-module-src-6.1.38.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ae370198b8b0be346b03172a13d0b60a
+_md5_=513fee97b9b656e9c808dbbd1f069de3
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 7eb66767..e2e6d502 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -68,7 +68,7 @@ sys-kernel/linux-sources-redcore-lts-legacy 5.10.147-r1: Redcore Linux Kernel So
 sys-kernel/nvidia-drivers-dkms 470.141.03-r1: NVIDIA driver sources for linux
 sys-kernel/nvidia-drivers-legacy-dkms 390.154: NVIDIA driver sources for linux
 sys-kernel/vhba-dkms 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
-sys-kernel/virtualbox-modules-dkms 6.1.18-r2: Kernel Modules source for Virtualbox
+sys-kernel/virtualbox-modules-dkms 6.1.38: Kernel Modules source for Virtualbox
 sys-kernel/zfs-dkms 2.1.6: ZFS sources for linux
 sys-libs/binutils-libs 2.39-r1: Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
 sys-libs/glibc 2.35-r8: GNU libc C library
diff --git a/sys-kernel/virtualbox-modules-dkms/Manifest b/sys-kernel/virtualbox-modules-dkms/Manifest
index 5b9b8ea2..418c3c22 100644
--- a/sys-kernel/virtualbox-modules-dkms/Manifest
+++ b/sys-kernel/virtualbox-modules-dkms/Manifest
@@ -1 +1 @@
-DIST virtualbox-dkms_6.1.18-dfsg-2_amd64.deb 692560 BLAKE2B 1f252da5edac9c7d063bd0a477f4aba35692e2baaf65aca9d3a1c9c41cc5e735950f1bd22615b8e5687d3e89d12111631ac8c1d36febe4fb7d81109cfc7b931c SHA512 2466d6176cbfe82c773cc69342e6010e11e206bbbd5c8302942e6d180c6e05283a36a446a0f7364e7ed9971a630a69455d563fda96d961306d8427f6bbe02d31
+DIST vbox-kernel-module-src-6.1.38.tar.xz 678320 BLAKE2B 02fce9d8436e5e05cefae5e947c814470ff2898fa5ced2b734a7570e42fde2a84ecc98cbd2a3f0254443af1dd8131d541d565ecc4eb6a57ca88f7c638ed4994d SHA512 ef933e68942b847bd17ae9173d8c9963e12ffba73fe1d049e2fe9af10f720cc269ffdf7d2341ab75374f4737f4521c24316786574c0c71feb153a430c744eb0a
diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
new file mode 100644
index 00000000..5ba4200d
--- /dev/null
+++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
@@ -0,0 +1,14 @@
+PACKAGE_NAME="virtualbox-modules-dkms"
+PACKAGE_VERSION="6.1.38"
+MAKE[0]="make KVER=$kernelver"
+MAKE[0]="make KV_FULL=$kernelver"
+BUILT_MODULE_NAME[0]="vboxdrv"
+BUILT_MODULE_LOCATION[0]="vboxdrv"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
+BUILT_MODULE_NAME[1]="vboxnetadp"
+BUILT_MODULE_LOCATION[1]="vboxnetadp"
+DEST_MODULE_LOCATION[1]="/extra/dkms"
+BUILT_MODULE_NAME[2]="vboxnetflt"
+BUILT_MODULE_LOCATION[2]="vboxnetflt"
+DEST_MODULE_LOCATION[2]="/extra/dkms"
+AUTOINSTALL="yes"
diff --git a/sys-kernel/virtualbox-modules-dkms/files/kernel-5.11.patch b/sys-kernel/virtualbox-modules-dkms/files/kernel-5.11.patch
deleted file mode 100644
index 0c9e66e6..00000000
--- a/sys-kernel/virtualbox-modules-dkms/files/kernel-5.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur a/usr/src/virtualbox-6.1.18/vboxnetflt/linux/VBoxNetFlt-linux.c b/usr/src/virtualbox-6.1.18/vboxnetflt/linux/VBoxNetFlt-linux.c
---- a/usr/src/virtualbox-6.1.18/vboxnetflt/linux/VBoxNetFlt-linux.c	2021-01-07 15:41:28.000000000 +0000
-+++ b/usr/src/virtualbox-6.1.18/vboxnetflt/linux/VBoxNetFlt-linux.c	2021-03-16 16:27:00.179818747 +0000
-@@ -69,6 +69,7 @@
- #include <iprt/mp.h>
- #include <iprt/mem.h>
- #include <iprt/time.h>
-+#include <linux/ethtool.h>
- 
- #define VBOXNETFLT_OS_SPECFIC 1
- #include "../VBoxNetFltInternal.h"
diff --git a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.18-r2.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.38.ebuild
index e89cf7e4..9c973f1d 100644
--- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.18-r2.ebuild
+++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.38.ebuild
@@ -6,14 +6,15 @@ EAPI=7
 
 inherit eutils unpacker
 
-MY_PN=virtualbox-dkms
+MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules source for Virtualbox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/${MY_PN}_${PV}-dfsg-2_amd64.deb"
+SRC_URI="https://github.com/ceamac/virtualbox-modules-dist/releases/download/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64"
+RESTRICT="mirror"
 IUSE=""
 
 DEPEND="
@@ -24,19 +25,9 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
 
-PATCHES=(
-	"${FILESDIR}"/kernel-5.11.patch
-)
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
 src_prepare() {
 	default
 	grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	sed -i "s/virtualbox/${PN}/g" usr/src/virtualbox-${PV}/dkms.conf
-	sed -i "s/updates/extra\/dkms/g" usr/src/virtualbox-${PV}/dkms.conf
 }
 
 src_compile() {
@@ -46,7 +37,8 @@ src_compile() {
 src_install() {
 	dodir usr/src/${P}
 	insinto usr/src/${P}
-	doins -r ${S}/usr/src/virtualbox-${PV}/*
+	doins ${FILESDIR}/dkms.conf
+	doins -r ${S}/*
 }
 
 pkg_postinst() {