5 files changed, 15 insertions, 70 deletions
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 4e287591abd7..617c875d626b 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,8 +1,6 @@
-AUX ckb-0.6.0-fix-bashism.patch 692 BLAKE2B 25c5756e809f01045569e933447090ace40e66b002a0497d8211e091680eebb480b7d7075e73e238478d715cecb3ccf8c35db17375f11709222979fa7b3ca47a SHA512 8feab11579fa689e81d68d87ec3539f3db2b7299841ac14880be330a77cabc0a5e130022705c6edb21d694987b93605f2a27c1c0ce857e457e14e90566b06ea9
-AUX ckb-0.6.0-odr.patch 1126 BLAKE2B c2822fd5a52ad1fc55d76465e417a1365c40cf7e35860fe715d27ceced55dbce09a182d812612b72577802a65865b23b6e31d2c23d66d50ee827986c8fd5f775 SHA512 1ce9a73c2f2a618de236caf473cc4de3b7cb9721f47c12c3bd3a2337e602d6589dccec8e64ebba80add5bfe88316ada31cad63131b760ed616c063820b58ecbd
-DIST ckb-0.6.0.tar.gz 1835972 BLAKE2B a6d905cf4a62e9395e008628a2b585681f4fa4af52305a11e49d2f00db990a966be79f97e0ae684031a45bf77b372548b64e2b0f87e344eaa0eb67c07117f89c SHA512 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392
 DIST ckb-0.6.1.tar.gz 1861827 BLAKE2B 1efc2e3db0d5ab81871f36f687db8b91ad0cd5ca400968829fc5cf406ab615d04882772fb25c8e8351ecd87ed32d754190bbdf902552839dfe5540bdb713c541 SHA512 8f7f4eacd1cd3c255f5c57c277f255e30e6ed1ac7635c4aa7d52193bd63f997f6ba9489641c10be8fc8607045537a75816fa9d937585f3c072af6ed0e8240d7f
-EBUILD ckb-0.6.0-r2.ebuild 1451 BLAKE2B ebfc8a38a42a2a65c432b94541921cb7ae4c9f317cae06b8ac3cc7db653813fb15f5cd92a44a443c31d8387cde877bb6c49d77a148e6affeb3b5d1261f434643 SHA512 9524fa55ee8baa4be4f1ea41ff069409987954de0aeae9eede2de6a3183e788e247c2b3661fdce11020baefe2d9f8cbd484045365ccbcb64fd734873b709e3fa
-EBUILD ckb-0.6.1.ebuild 1500 BLAKE2B 71ea3fd4c9f908620c2dac100553a4da1767cc89ea0548e2b12adde5b23116599be385d68f3976110de80b4336343e19fd05a738755927e7cdba9be20f4b634d SHA512 86150f0f63d807a4ef9c16d8092b18d2bb5997ca059cf9b0f86e074b21d1e85a6ba7b1ef8a572715fbe797bb9728ab4bfdd072c371e8121711e4d367d424759e
+DIST ckb-0.6.2.tar.gz 1864977 BLAKE2B bf419ca453735f9ea83483261f675f20c997cb6def323fcb9157509c6ad518b4d8c73c145509c0de9d2c74df14ed6501bb6a35013c4d4575757ce24394419fad SHA512 21eb6fbb295501e1f30ea34e1361b595161db4c498afcc81efaa6ea7593ef4b04d9fb2966913af526e8151173c47b04b4bf199d7a901dcdc17ed6cd2262c5a20
+EBUILD ckb-0.6.1.ebuild 1499 BLAKE2B c95cfc4892a2b1ea8d6616b98ba9abf65847524555e6cd0f0a4b3610f991f26f05a4e69ef3dbec6f17675ea4c6bff7f3d7a510f654f6db80244f4a3e5706f4cd SHA512 1669e97efbeedfdcbe4c48fbb780333033e8bafd5c4d21313e5a4e1ed0be2fdcb0dcaa68e532fdf2fbe040df200293b645c8ba7c154eb0a90b27a9a0be749c67
+EBUILD ckb-0.6.2.ebuild 1500 BLAKE2B 71ea3fd4c9f908620c2dac100553a4da1767cc89ea0548e2b12adde5b23116599be385d68f3976110de80b4336343e19fd05a738755927e7cdba9be20f4b634d SHA512 86150f0f63d807a4ef9c16d8092b18d2bb5997ca059cf9b0f86e074b21d1e85a6ba7b1ef8a572715fbe797bb9728ab4bfdd072c371e8121711e4d367d424759e
 EBUILD ckb-9999.ebuild 1500 BLAKE2B 4f2770ba1bebd19d09f29dc0e25558de2e9df4c7104bc551c507e3b4b2565244b6c43259a0fe53fefa7da803b6c48d8e6ed5550c776ec1d574a133f0cebc0a8c SHA512 1be26836ec31113d676973ecba5544a508faf49ccf4c9ce6cfbe7d9b0f97f314573ce26fef8389846f757dbae93e4a451656dc3a04fa53d8f61148582d39abcf
 MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.6.1.ebuild b/app-misc/ckb/ckb-0.6.1.ebuild
index 6a24a2714caa..3db1c9ae12a4 100644
--- a/app-misc/ckb/ckb-0.6.1.ebuild
+++ b/app-misc/ckb/ckb-0.6.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"
 else
 	SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/${PN}-next-${PV}"
 fi
 
diff --git a/app-misc/ckb/ckb-0.6.0-r2.ebuild b/app-misc/ckb/ckb-0.6.2.ebuild
index 360dd872a604..6a24a2714caa 100644
--- a/app-misc/ckb/ckb-0.6.0-r2.ebuild
+++ b/app-misc/ckb/ckb-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/ckb-next/ckb-next.git"
 else
 	SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-next-${PV}"
 fi
 
@@ -22,14 +22,8 @@ SLOT="0"
 IUSE="systemd"
 
 RDEPEND="
-	dev-libs/libdbusmenu-qt
-	dev-libs/quazip:0=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	dev-libs/quazip:0=[qt6(-)]
+	dev-qt/qtbase:6[dbus,gui,network,opengl,widgets]
 	|| (
 		media-libs/libpulse
 		media-sound/apulse[sdk]
@@ -38,17 +32,18 @@ RDEPEND="
 	x11-libs/libxcb:=
 	x11-libs/xcb-util-wm"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-bashism.patch"
-	"${FILESDIR}/${P}-odr.patch"
-)
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_UPDATER=yes
 		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+		# upstream has a knob that enables automagically using Qt6 with
+		# a Qt5 fallback
+		-DPREFER_QT6=yes
+		# but Qt itself has a more reliable knob for the
+		# default version to use
+		-DQT_DEFAULT_MAJOR_VERSION=6
 	)
 	cmake_src_configure
 }
diff --git a/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch b/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch
deleted file mode 100644
index 8cdc2aa59a0e..000000000000
--- a/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From https://github.com/ckb-next/ckb-next/commit/76a47f95b442a1ae5a9c7448566eaafd8863ca8d
-From: Willow Barraco <contact@willowbarraco.fr>
-Date: Wed, 19 Jul 2023 09:38:09 +0200
-Subject: [PATCH] Fix ckb-next-daemon OpenRC service file
-
---- a/linux/openrc/ckb-next-daemon.in
-+++ b/linux/openrc/ckb-next-daemon.in
-@@ -7,4 +7,4 @@ command="@CMAKE_INSTALL_PREFIX@/bin/ckb-next-daemon"
- description="Corsair Keyboards and Mice Daemon"
- pidfile="/dev/input/ckb0/pid"
- logfile="/var/log/${RC_SVCNAME}.log"
--start_stop_daemon_args+="--background --stdout ${logfile} --stderr ${logfile}"
-+start_stop_daemon_args="$start_stop_daemon_args --background --stdout ${logfile} --stderr ${logfile}"
--- 
-2.43.0
-
diff --git a/app-misc/ckb/files/ckb-0.6.0-odr.patch b/app-misc/ckb/files/ckb-0.6.0-odr.patch
deleted file mode 100644
index 9547fe4edaf9..000000000000
--- a/app-misc/ckb/files/ckb-0.6.0-odr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/924410
-
-From c5b68a00867b2add28bfd62430c45781ac2e9cb8 Mon Sep 17 00:00:00 2001
-From: John Helmert III <ajak@gentoo.org>
-Date: Fri, 16 Feb 2024 22:14:24 -0800
-Subject: [PATCH] ckbsettingswriter: mirror QT version guards from ckbsettings
-
-The differing definitions between ckbsettingswriter.cpp and
-ckbsettings.cpp trigger compilation errors with -Werror=odr.
-
-Signed-off-by: John Helmert III <ajak@gentoo.org>
---- a/src/gui/ckbsettingswriter.cpp
-+++ b/src/gui/ckbsettingswriter.cpp
-@@ -1,9 +1,18 @@
- #include "ckbsettingswriter.h"
-+
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+#include <QRecursiveMutex>
-+#else
- #include <QMutex>
-+#endif
- 
- // Mirror ckbsettings.cpp
- extern QAtomicInt cacheWritesInProgress;
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+extern QRecursiveMutex settingsMutex, settingsCacheMutex;
-+#else
- extern QMutex settingsMutex, settingsCacheMutex;
-+#endif
- #define lockMutex           QMutexLocker locker(backing == _globalSettings ? &mutex : 0)
- #define lockMutexStatic     QMutexLocker locker(&settingsMutex)
- #define lockMutexStatic2    QMutexLocker locker2(&settingsMutex)