app-emulation/virtualbox-modules-{,dkms} : version bump

8 files changed, 25 insertions, 32 deletions

diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.38-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild
index 84785bca..84785bca 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.38-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
index f62fb508..12b9cfbc 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=acct-group/vboxusers ~sys-kernel/virtualbox-modules-dkms-6.1.38
+DEPEND=acct-group/vboxusers ~sys-kernel/virtualbox-modules-dkms-6.1.40
 DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=6
 HOMEPAGE=http://www.virtualbox.org/
 INHERIT=eutils
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=acct-group/vboxusers ~sys-kernel/virtualbox-modules-dkms-6.1.38
+RDEPEND=acct-group/vboxusers ~sys-kernel/virtualbox-modules-dkms-6.1.40
 SLOT=0
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=18205a6228da4d6e111cb89b5936003b
diff --git a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.38-r1 b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.38-r1
deleted file mode 100644
index 7d601153..00000000
--- a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.38-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm unpack
-DEPEND=sys-apps/ethtool sys-kernel/dkms
-DESCRIPTION=Kernel Modules source for Virtualbox
-EAPI=7
-HOMEPAGE=http://www.virtualbox.org/
-INHERIT=eutils unpacker
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=sys-apps/ethtool sys-kernel/dkms
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://mirrors.kernel.org/ubuntu/pool/multiverse/v/virtualbox/virtualbox-dkms_6.1.38-dfsg-3_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cd24e7a3eda5d2de29cbdd550052d6b2
diff --git a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.40 b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.40
new file mode 100644
index 00000000..40d0a86c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare prerm
+DEPEND=sys-apps/ethtool sys-kernel/dkms
+DESCRIPTION=Kernel Modules source for Virtualbox
+EAPI=7
+HOMEPAGE=http://www.virtualbox.org/
+INHERIT=eutils
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=sys-apps/ethtool sys-kernel/dkms
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.40/vbox-kernel-module-src-6.1.40.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=570da4c82f861fee735961e3b5b87130
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 500b90c4..fc06acdf 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5,7 +5,7 @@ app-backup/timeshift 22.06.1-r1: A system restore utility for Linux
 app-emulation/linux-steam-integration 0.7.3-r3: Helper for enabling better Steam integration on Linux
 app-emulation/steam 1.0.0.71-r1: Digital distribution client bootstrap package
 app-emulation/steam-native-runtime 1.0.0.71-r3: Native replacement for the Steam runtime using system libraries
-app-emulation/virtualbox-modules 6.1.38-r1: Kernel Modules for Virtualbox
+app-emulation/virtualbox-modules 6.1.40: Kernel Modules for Virtualbox
 app-misc/calamares-config-redcore 1.314.1337-r1: Redcore Linux Calamares modules config
 app-misc/geoclue 2.6.0-r10: A location information D-Bus service
 app-misc/redcore-live 1.314.1337: Redcore Linux live scripts
@@ -67,7 +67,7 @@ sys-kernel/linux-sources-redcore-lts 5.15.74: Redcore Linux Kernel Sources (LTS)
 sys-kernel/linux-sources-redcore-lts-legacy 5.10.148: Redcore Linux Kernel Sources (LTS Legacy v5.10)
 sys-kernel/nvidia-drivers-dkms 390.154 470.141.03-r2 515.65.01: 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.38-r1: Kernel Modules source for Virtualbox
+sys-kernel/virtualbox-modules-dkms 6.1.40: 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 59f7f84f..39c5f97c 100644
--- a/sys-kernel/virtualbox-modules-dkms/Manifest
+++ b/sys-kernel/virtualbox-modules-dkms/Manifest
@@ -1 +1 @@
-DIST virtualbox-dkms_6.1.38-dfsg-3_amd64.deb 720174 BLAKE2B 183611f0c4d160ab34470a9ee9d1b9aacb182c5198328e69b894fa3504611485c453c01025f8fed473d82b4040dfc3ecb7b89c3788dc033d0d035d0f7f5020e3 SHA512 67be48247f921a58408418bdf9f146f60b658b44a4d76937810042bc49a7fd7603d2c36fe7ae3e931d438e35456e36b57d59f9cfd91a7bfdc30f14d4556bded1
+DIST vbox-kernel-module-src-6.1.40.tar.xz 680112 BLAKE2B 95bcb598bc3823c8bf4bfeb734a5d812a4830d072b186c999ed8632552550d0d21318bc50419fd18301cd6e8e58d091a4f6363c9ee86725d6bf8e74050b552d2 SHA512 8eec3c960077205d53b3d2a8367ce562edb02a6d90fe0a4bd06e1dfa256760e128b9895fc8005ceeb50a72eda6509533a28c6ee264d10a2cd30601ed5ced2eeb
diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
index 5ba4200d..126ab2b7 100644
--- a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
+++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
@@ -1,7 +1,5 @@
 PACKAGE_NAME="virtualbox-modules-dkms"
-PACKAGE_VERSION="6.1.38"
-MAKE[0]="make KVER=$kernelver"
-MAKE[0]="make KV_FULL=$kernelver"
+PACKAGE_VERSION="6.1.40"
 BUILT_MODULE_NAME[0]="vboxdrv"
 BUILT_MODULE_LOCATION[0]="vboxdrv"
 DEST_MODULE_LOCATION[0]="/extra/dkms"
diff --git a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.38-r1.ebuild b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.40.ebuild
index 57f78e07..bb68e200 100644
--- a/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.38-r1.ebuild
+++ b/sys-kernel/virtualbox-modules-dkms/virtualbox-modules-dkms-6.1.40.ebuild
@@ -4,12 +4,12 @@
 
 EAPI=7
 
-inherit eutils unpacker
+inherit eutils
 
-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://mirrors.kernel.org/ubuntu/pool/multiverse/v/virtualbox/${MY_PN}_${PV}-dfsg-3_amd64.deb"
+SRC_URI="https://github.com/ceamac/virtualbox-modules-dist/releases/download/v${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,15 +25,9 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
 
-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() {
@@ -43,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() {