diff --git a/gui-apps/klassy/klassy-6.5.2.ebuild b/gui-apps/klassy/klassy-6.5.2-r1.ebuild
similarity index 52%
rename from gui-apps/klassy/klassy-6.5.2.ebuild
rename to gui-apps/klassy/klassy-6.5.2-r1.ebuild
index 870538aa65..fcc1893a19 100644
--- a/gui-apps/klassy/klassy-6.5.2.ebuild
+++ b/gui-apps/klassy/klassy-6.5.2-r1.ebuild
@@ -3,16 +3,14 @@
 
 EAPI=8
 
-KF5MIN=5.102.0
 KFMIN=6.10.0
 QTMIN=6.6.0
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
 DESCRIPTION="Klassy QT6 window decoration theme for KDE Plasma 6.3+"
 HOMEPAGE="https://github.com/paulmcauley/klassy"
 SRC_URI="https://github.com/paulmcauley/klassy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
@@ -20,43 +18,32 @@ KEYWORDS="~amd64"
 # Testing is unsupported in upstream.
 RESTRICT="test"
 
-DEPEND=">=dev-qt/qtbase-${QTMIN}:6
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[dbus,widgets,xml]
 		>=dev-qt/qtdeclarative-${QTMIN}:6
 		>=dev-qt/qtsvg-${QTMIN}:6
-		>=kde-frameworks/frameworkintegration-${KF5MIN}:5
+		>=kde-frameworks/extra-cmake-modules-${KFMIN}
 		>=kde-frameworks/frameworkintegration-${KFMIN}:6
-		>=kde-frameworks/kcmutils-${KF5MIN}:5
 		>=kde-frameworks/kcmutils-${KFMIN}:6
-		>=kde-frameworks/kconfigwidgets-${KF5MIN}:5
-		>=kde-frameworks/kiconthemes-${KF5MIN}:5
-		>=kde-frameworks/kwindowsystem-${KF5MIN}:5
-		kde-frameworks/extra-cmake-modules
-		kde-frameworks/kcolorscheme
-		kde-frameworks/kconfig
-		kde-frameworks/kcoreaddons
-		kde-frameworks/kguiaddons
-		kde-frameworks/ki18n
-		kde-frameworks/kiconthemes
-		kde-frameworks/kirigami
-		kde-frameworks/kwidgetsaddons
-		kde-frameworks/kwindowsystem
-		kde-plasma/kdecoration"
+		>=kde-frameworks/kcolorscheme-${KFMIN}:6
+		>=kde-frameworks/kconfig-${KFMIN}:6
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kguiaddons-${KFMIN}:6
+		>=kde-frameworks/ki18n-${KFMIN}:6
+		>=kde-frameworks/kiconthemes-${KFMIN}:6
+		>=kde-frameworks/kirigami-${KFMIN}:6
+		>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+		>=kde-frameworks/kwindowsystem-${KFMIN}:6
+		kde-plasma/kdecoration:6
+"
 RDEPEND="${DEPEND}
 		 x11-misc/xdg-utils"
 
 src_configure() {
 	local mycmakeargs=(
+		"-DBUILD_QT5=OFF"
 		"-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
 		"-DBUILD_TESTING=OFF"
 	)
 
 	cmake_src_configure
 }
-
-pkg_postinst () {
-	xdg_icon_cache_update
-}
-
-pkg_postrm () {
-	xdg_icon_cache_update
-}
diff --git a/gui-apps/klassy/klassy-9999.ebuild b/gui-apps/klassy/klassy-9999.ebuild
index 444b529414..8a7849917e 100644
--- a/gui-apps/klassy/klassy-9999.ebuild
+++ b/gui-apps/klassy/klassy-9999.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=8
 
-KF5MIN=5.102.0
 KFMIN=6.18.0
 QTMIN=6.9.0
 
-inherit git-r3 cmake xdg-utils
+inherit cmake git-r3 xdg
 
 DESCRIPTION="Klassy QT6 window decoration theme for KDE Plasma 6.5+"
 HOMEPAGE="https://github.com/paulmcauley/klassy"
@@ -16,47 +15,35 @@ EGIT_BRANCH="master"
 
 LICENSE="GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS=""
 # Testing is unsupported in upstream.
 RESTRICT="test"
 
-DEPEND=">=dev-qt/qtbase-${QTMIN}:6
+DEPEND=">=dev-qt/qtbase-${QTMIN}:6[dbus,widgets,xml]
 		>=dev-qt/qtdeclarative-${QTMIN}:6
 		>=dev-qt/qtsvg-${QTMIN}:6
-		>=kde-frameworks/frameworkintegration-${KF5MIN}:5
+		>=kde-frameworks/extra-cmake-modules-${KFMIN}
 		>=kde-frameworks/frameworkintegration-${KFMIN}:6
-		>=kde-frameworks/kcmutils-${KF5MIN}:5
 		>=kde-frameworks/kcmutils-${KFMIN}:6
-		>=kde-frameworks/kconfigwidgets-${KF5MIN}:5
-		>=kde-frameworks/kiconthemes-${KF5MIN}:5
-		>=kde-frameworks/kwindowsystem-${KF5MIN}:5
-		kde-frameworks/extra-cmake-modules
-		kde-frameworks/kcolorscheme
-		kde-frameworks/kconfig
-		kde-frameworks/kcoreaddons
-		kde-frameworks/kguiaddons
-		kde-frameworks/ki18n
-		kde-frameworks/kiconthemes
-		kde-frameworks/kirigami
-		kde-frameworks/kwidgetsaddons
-		kde-frameworks/kwindowsystem
-		kde-plasma/kdecoration"
+		>=kde-frameworks/kcolorscheme-${KFMIN}:6
+		>=kde-frameworks/kconfig-${KFMIN}:6
+		>=kde-frameworks/kcoreaddons-${KFMIN}:6
+		>=kde-frameworks/kguiaddons-${KFMIN}:6
+		>=kde-frameworks/ki18n-${KFMIN}:6
+		>=kde-frameworks/kiconthemes-${KFMIN}:6
+		>=kde-frameworks/kirigami-${KFMIN}:6
+		>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+		>=kde-frameworks/kwindowsystem-${KFMIN}:6
+		kde-plasma/kdecoration:6
+"
 RDEPEND="${DEPEND}
 		 x11-misc/xdg-utils"
 
 src_configure() {
 	local mycmakeargs=(
+		"-DBUILD_QT5=OFF"
 		"-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
 		"-DBUILD_TESTING=OFF"
 	)
 
 	cmake_src_configure
 }
-
-pkg_postinst () {
-	xdg_icon_cache_update
-}
-
-pkg_postrm () {
-	xdg_icon_cache_update
-}