diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 0447de377..74a845ed2 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,24 +21,30 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qt5 qtkeychain shout wavpack"
 
 RDEPEND="
 	dev-db/sqlite
 	dev-libs/glib:2
 	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+	)
+	!qt5? (
+		dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,sql,sqlite,widgets,xml]
+		dev-qt/qtsvg:6
+		dev-qt/qtdeclarative:6
+	)
 	media-libs/chromaprint
 	media-libs/flac:=
 	media-libs/libebur128
@@ -50,7 +56,7 @@ RDEPEND="
 	media-libs/portaudio
 	media-libs/portmidi
 	media-libs/rubberband
-	media-libs/taglib
+	<media-libs/taglib-2.0.0
 	media-libs/vamp-plugin-sdk
 	sci-libs/fftw:3.0=
 	sys-power/upower
@@ -70,16 +76,21 @@ RDEPEND="
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] )
+	qt5? ( qtkeychain? ( dev-libs/qtkeychain:=[qt5(+)] ) )
+	!qt5? ( qtkeychain? ( dev-libs/qtkeychain:=[qt6(+)] ) )
 	shout? ( >=media-libs/libshout-2.4.5 )
 	wavpack? ( media-sound/wavpack )
+	dev-cpp/gtest
+	dev-cpp/benchmark
 "
 DEPEND="${RDEPEND}
 	dev-cpp/ms-gsl
 "
 BDEPEND="
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
+	qt5? (
+		dev-qt/qttest:5
+		dev-qt/qtxmlpatterns:5
+	)
 	virtual/pkgconfig
 "
 
@@ -89,34 +100,33 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		-DFAAD="$(usex aac on off)"
-		-DFFMPEG="$(usex ffmpeg on off)"
-		-DHID="$(usex hid on off)"
-		-DLILV="$(usex lv2 on off)"
-		-DMAD="$(usex mp3 on off)"
-		-DOPTIMIZE="off"
-		-DCCACHE_SUPPORT="off"
-		-DOPUS="$(usex opus on off)"
-		-DBROADCAST="$(usex shout on off)"
-		-DVINYLCONTROL="on"
-		-DINSTALL_USER_UDEV_RULES=OFF
-		-DWAVPACK="$(usex wavpack on off)"
-		-DQTKEYCHAIN="$(usex qtkeychain on off)"
-		-DKEYFINDER="$(usex keyfinder on off)"
-		-DDOWNLOAD_MANUAL=OFF
-		-DBUILD_SHARED_LIBS=OFF
+		-DFAAD="$(usex aac ON OFF)"
+		-DFFMPEG="$(usex ffmpeg ON OFF)"
+		-DHID="$(usex hid ON OFF)"
+		-DLILV="$(usex lv2 ON OFF)"
+		-DMAD="$(usex mp3 ON OFF)"
+		-DOPTIMIZE="OFF"
+		-DCCACHE_SUPPORT="OFF"
+		-DOPUS="$(usex opus ON OFF)"
+		-DBROADCAST="$(usex shout ON OFF)"
+		-DVINYLCONTROL="ON"
+		-DINSTALL_USER_UDEV_RULES="OFF"
+		-DWAVPACK="$(usex wavpack ON OFF)"
+		-DQT6="$(usex qt5 OFF ON)"
+		-DQTKEYCHAIN="$(usex qtkeychain ON OFF)"
+		-DKEYFINDER="$(usex keyfinder ON OFF)"
+		-DDOWNLOAD_MANUAL="OFF"
+		-DBUILD_SHARED_LIBS="OFF"
+		-DENGINEPRIME="OFF"
 	)
 
-	if [[ ${PV} == 9999 ]] ; then
-		mycmakeargs+=(
-			-DENGINEPRIME="OFF"
-		)
-	fi
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
+	insinto /usr/share/mixxx/
+	doins -r res/qml
 	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
 
 	if use doc ; then