diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 1a83672..bdf8090 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -185,7 +185,6 @@ _qemu_optdepends=(
   'qemu-hw-usb-host: for USB host device'
   'qemu-hw-usb-redirect: for usbredir device'
   'qemu-hw-usb-smartcard: for USB smartcard device'
-  'qemu-img: for manipulating disk images'
   'qemu-pr-helper: for persistent reservation utility'
   'qemu-system-aarch64: for AARCH64 system emulator'
   'qemu-system-alpha: for Alpha system emulator'
@@ -205,7 +204,6 @@ _qemu_optdepends=(
   'qemu-system-sh4: for SH4 system emulator'
   'qemu-system-sparc: for SPARC system emulator'
   'qemu-system-tricore: for tricore system emulator'
-  'qemu-system-x86: for x86 system emulator'
   'qemu-system-xtensa: for Xtensa system emulator'
   'qemu-tests: for QEMU tests'
   'qemu-tools: for QEMU tools'
@@ -219,7 +217,6 @@ _qemu_optdepends=(
   'qemu-ui-spice-core: for spice core UI driver'
   'qemu-user: for user mode emulation of QEMU targets'
   'qemu-vhost-user-gpu: for vhost-user-gpu display device'
-  'qemu-virtiofsd: for virtio-fs shared filesystem daemon'
   'samba: for SMB/CIFS server support'
 )
 
@@ -930,23 +927,12 @@ package_qemu-base() {
   pkgdesc="A basic QEMU setup for headless environments"
   depends=(
     qemu-common
-    qemu-audio-spice
-    qemu-block-{curl,dmg,nfs,ssh}
-    qemu-chardev-spice
-    qemu-hw-display-{qxl,virtio-gpu{,-{gl,pci,pci-gl}}}
-    qemu-hw-display-virtio-vga{,-gl}
-    qemu-hw-s390x-virtio-gpu-ccw
-    qemu-hw-usb-{host,redirect,smartcard}
     qemu-img
-    qemu-pr-helper
     qemu-system-x86
-    qemu-tools
-    qemu-ui-{curses,spice-{app,core}}
     qemu-virtiofsd
   )
   optdepends=("${_qemu_optdepends[@]}")
-  # TODO: remove conflicts/provides/replaces for qemu-headless after 2022-10-01
-  conflicts=(qemu qemu-headless)
+  # TODO: remove provides/replaces for qemu-headless after 2022-10-01
   provides=(qemu=$pkgver qemu-headless)
   replaces=(qemu-headless)
 }
@@ -954,24 +940,16 @@ package_qemu-base() {
 package_qemu-desktop() {
   pkgdesc="A QEMU setup for desktop environments"
   depends=(
-    qemu-common
+    qemu-base
     qemu-audio-{alsa,dbus,jack,oss,pa,sdl,spice}
     qemu-block-{curl,dmg,nfs,ssh}
     qemu-chardev-spice
     qemu-hw-display-{qxl,virtio-gpu{,-{gl,pci,pci-gl}}}
     qemu-hw-display-virtio-vga{,-gl}
-    qemu-hw-s390x-virtio-gpu-ccw
     qemu-hw-usb-{host,redirect,smartcard}
-    qemu-img
-    qemu-pr-helper
-    qemu-system-x86
-    qemu-tools
     qemu-ui-{curses,dbus,egl-headless,gtk,opengl,sdl,spice-{app,core}}
     qemu-vhost-user-gpu
-    qemu-virtiofsd
   )
-  optdepends=("${_qemu_optdepends[@]}")
-  conflicts=(qemu)
   provides=(qemu=$pkgver)
   replaces=('qemu<7')
 }
@@ -991,26 +969,16 @@ package_qemu-emulators-full() {
 package_qemu-full() {
   pkgdesc="A full QEMU setup"
   depends=(
-    qemu-common
-    qemu-audio-{alsa,dbus,jack,oss,pa,sdl,spice}
-    qemu-block-{curl,dmg,gluster,iscsi,nfs,rbd,ssh}
-    qemu-chardev-{baum,spice}
+    qemu-desktop
+    qemu-block-{gluster,iscsi,rbd}
+    qemu-chardev-baum
     qemu-docs
-    qemu-hw-display-{qxl,virtio-{gpu{,-{gl,pci,pci-gl}},vga{,-gl}}}
+    qemu-emulators-full
     qemu-hw-s390x-virtio-gpu-ccw
-    qemu-hw-usb-{host,redirect,smartcard}
-    qemu-img
     qemu-pr-helper
-    qemu-system-{aarch64,alpha,arm,avr,cris,hppa,m68k,microblaze,mips,nios2,or1k,ppc,riscv,rx,s390x,sh4,sparc,tricore,x86,xtensa}
     qemu-tests
     qemu-tools
-    qemu-ui-{curses,dbus,egl-headless,gtk,opengl,sdl,spice-{app,core}}
-    qemu-user
-    qemu-vhost-user-gpu
-    qemu-virtiofsd
   )
-  optdepends=("${_qemu_optdepends[@]}")
-  conflicts=(qemu)
   provides=(qemu=$pkgver)
 }