void-packages #54593 resolution attempt No. 1

diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index e7e78cd735f..f9b4d4dbd69 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -40,3 +40,4 @@ libGL libglvnd
 libEGL libglvnd
 libGLES libglvnd
 hunspell-en_GB hunspell-en_GB-all
+nvidia-meta-dkms nvidia-open-dkms
diff --git a/srcpkgs/nvidia-open-dkms/template b/srcpkgs/nvidia-open-dkms/template
index 63529102493..63de4217178 100644
--- a/srcpkgs/nvidia-open-dkms/template
+++ b/srcpkgs/nvidia-open-dkms/template
@@ -9,15 +9,20 @@ pkgname=nvidia-open-dkms
 version=570.133.07
 revision=1
 archs="x86_64"
-depends="dkms nvidia"
+
+depends="dkms nvidia xbps-triggers>=0.121_1"
 short_desc="NVIDIA Linux open GPU kernel module source"
-maintainer="JkktBkkt <[email protected]>"
+maintainer="JkktBkkt <[email protected]>"
+
 license="GPL-2.0-only, MIT"
 homepage="https://github.com/NVIDIA/open-gpu-kernel-modules"
 changelog="https://github.com/NVIDIA/open-gpu-kernel-modules/blob/main/CHANGELOG.md"
 distfiles="https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${version}.tar.gz"
 checksum=9b5682c6bbef09272dc689965920111198b27feac172049fff217837b10e9882
-replaces="nvidia-dkms>=0"
+
+conflicts="nvidia-proprietary-dkms>=0"
+provides="nvidia-meta-dkms-${version}_${revision}"
+
 dkms_modules="nvidia-open-dkms ${version}"
 triggers="dkms initramfs-regenerate"

diff --git a/srcpkgs/nvidia-proprietary-dkms b/srcpkgs/nvidia-proprietary-dkms
new file mode 120000
index 00000000000..746a30838a6
--- /dev/null
+++ b/srcpkgs/nvidia-proprietary-dkms
@@ -0,0 +1 @@
+nvidia
\ No newline at end of file
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 4d09cbb8e80..168cdc302d9 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -21,10 +21,10 @@ _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
 checksum=2d43e64c581be5ef554de9888b1aa90037ef6d45f54284d3d9dcedc08dc4dc26
 # subpackages need to be processed in this specific order
-subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
+subpackages="nvidia-gtklibs nvidia-dkms nvidia-proprietary-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
  nvidia-gtklibs-${version}_${revision}
- nvidia-dkms-${version}_${revision}
+ virtual?nvidia-meta-dkms-${version}_${revision}
  nvidia-firmware-${version}_${revision}"
 patch_args="-Np1 --directory=${XBPS_BUILDDIR}/${pkgname}-${version}/${_pkg}"

@@ -317,14 +317,14 @@ nvidia-libs_package() {
    }
 }

-nvidia-dkms_package() {
+nvidia-proprietary-dkms_package() {
    short_desc="${_desc} - DKMS kernel module"
    depends="dkms xbps-triggers>=0.121_1"
    dkms_modules="nvidia ${version}"
    # dkms must be before initramfs-regenerate to build modules before images
    triggers="dkms initramfs-regenerate"
-   conflicts="nvidia470-dkms>=0 nvidia390-dkms>=0"
-
+   conflicts="nvidia470-dkms>=0 nvidia390-dkms>=0 nvidia-open-dkms>=0"
+   provides="nvidia-meta-dkms-${version}_${revision}"
    pkg_install() {
        vmove usr/src
        vmove usr/lib/modprobe.d
@@ -347,3 +347,9 @@ nvidia-firmware_package() {
        vmove usr/lib/firmware
    }
 }
+
+nvidia-dkms_package() {
+   short_desc="${_desc} - DKMS kernel module (transitional dummy package)"
+   depends="${sourcepkg}-proprietary-dkms>=${version}_${revision}"
+   build_style=meta
+}