3 files changed, 111 insertions, 0 deletions
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 090344bbf66e..662b414e0d97 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD ckb-0.6.0-r1.ebuild 1421 BLAKE2B e41e3e0ffab06ad3ec571bd3e481be3be80ef76624abbe308476658890499022f17b1631508556168574a036d2a3e7e08c7ecabe4eb2a7ebb92c11e6b3d5300e SHA512 26b5a55efeb857a7a030ebdd7b41210afa8ee45ff26d9a4e03862bcd17d5fcf5776af7c93fbaa9cacbe872adef8b95c0eee7686e98fdeb782b6e7d44233dd228
+EBUILD ckb-0.6.0-r2.ebuild 1452 BLAKE2B f8d983797533ce1971da1696af3ddd2706886932afa4984e236195ddf80f8f389306eef47cbdb9410232488ab94f8f4740b731ef14ae523396330def8beda629 SHA512 3f0ff53abd67dc262cfe3601aa773a061e937e7c90368b88d04db067e5ff660e96e4b13989f9d7e2f02f18f00b8428030b2c167c6422c1b5b17510f581ef04a1
 EBUILD ckb-9999.ebuild 1371 BLAKE2B f440295e5d768353aa8224e3c1a49c59039f4c58efe1d74d3bf23377950b22ca464972744ef4f00e28f4da658180ecd2e93c91fbf7cf18e589ac275adb62172a SHA512 beb51fc89c6c58ef9896523eb3e915f5a41acb1b641c31bcf0a7a1cc92c1e2cd354dd6e1aef71dbc1e1394100c5667e008583d53f3380609376a979045efecfa
 MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.6.0-r2.ebuild b/app-misc/ckb/ckb-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..c70828a260ad
--- /dev/null
+++ b/app-misc/ckb/ckb-0.6.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev xdg
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	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"
+	S="${WORKDIR}/${PN}-next-${PV}"
+fi
+
+LICENSE="GPL-2"
+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
+	|| (
+		media-libs/libpulse
+		media-sound/apulse[sdk]
+	)
+	virtual/libudev:=
+	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"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The ckb daemon will have to be started before use:"
+		elog
+			if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-config start ckb-next-daemon"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/ckb/files/ckb-0.6.0-odr.patch b/app-misc/ckb/files/ckb-0.6.0-odr.patch
new file mode 100644
index 000000000000..9547fe4edaf9
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.6.0-odr.patch
@@ -0,0 +1,32 @@
+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)