gentoo auto-resync : 22:12:2023 - 01:53:56

4 files changed, 22 insertions, 76 deletions

diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 23e4261ee194..090344bbf66e 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,6 +1,5 @@
-DIST ckb-0.5.0.tar.gz 1868880 BLAKE2B 867923f4eaf5d0e9d4ec14c5bd5952d88436c12a0d615528e083705cff7346a654dc801e743519e5482e8beb1cd28284710000e69b20032856b0e22d48792ee3 SHA512 d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1
+AUX ckb-0.6.0-fix-bashism.patch 692 BLAKE2B 25c5756e809f01045569e933447090ace40e66b002a0497d8211e091680eebb480b7d7075e73e238478d715cecb3ccf8c35db17375f11709222979fa7b3ca47a SHA512 8feab11579fa689e81d68d87ec3539f3db2b7299841ac14880be330a77cabc0a5e130022705c6edb21d694987b93605f2a27c1c0ce857e457e14e90566b06ea9
 DIST ckb-0.6.0.tar.gz 1835972 BLAKE2B a6d905cf4a62e9395e008628a2b585681f4fa4af52305a11e49d2f00db990a966be79f97e0ae684031a45bf77b372548b64e2b0f87e344eaa0eb67c07117f89c SHA512 34236199d420b663bb71db9400622bb868a3a0b384b58d5da3f80d2bd7ec9586d4e4ac9caad0b047b8440dc4200e4dd6077f4e0d1edb5a75a1327bf9c9ba9392
-EBUILD ckb-0.5.0-r1.ebuild 1390 BLAKE2B aa692e11f58277dcf21b0c1585c88612173c78e9d18d2931eef64a9e2c2ba1d7846387a83e13d658f7b02c7fc4566137f92920aeca0265fafdbf86edba912cb5 SHA512 3062729bc4735aa8fac53f7b30ab5559f4afac3c5fcbae6f76f8e4a34589433ce35c1ca5c929b73c79e426f0a9f0087b3554afdd0f17dbc191ef45d8b1f50714
-EBUILD ckb-0.6.0.ebuild 1370 BLAKE2B b506e825a04d12ec6a862ff64fd293da9e5f89ce8c73604db6ce51da36a9308631126553e41644bae3211a90d2e1e1562589957fed45b152813b489c6f9d7110 SHA512 c9b13d0abca52f7719f067ba1819e5669c6dd4a4e8809c5b7e70d8fdc9aef0451e2dc903b7b70ae570e351e375e6f7a9222e4e6f1550ab7ed47bbe4991bc5078
+EBUILD ckb-0.6.0-r1.ebuild 1421 BLAKE2B e41e3e0ffab06ad3ec571bd3e481be3be80ef76624abbe308476658890499022f17b1631508556168574a036d2a3e7e08c7ecabe4eb2a7ebb92c11e6b3d5300e SHA512 26b5a55efeb857a7a030ebdd7b41210afa8ee45ff26d9a4e03862bcd17d5fcf5776af7c93fbaa9cacbe872adef8b95c0eee7686e98fdeb782b6e7d44233dd228
 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.5.0-r1.ebuild b/app-misc/ckb/ckb-0.5.0-r1.ebuild
deleted file mode 100644
index 168115f90d2b..000000000000
--- a/app-misc/ckb/ckb-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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-sound/pulseaudio
-		media-sound/apulse[sdk]
-	)
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-wm"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-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/ckb-0.6.0.ebuild b/app-misc/ckb/ckb-0.6.0-r1.ebuild
index 2c6dac302860..ff1d9c5f596f 100644
--- a/app-misc/ckb/ckb-0.6.0.ebuild
+++ b/app-misc/ckb/ckb-0.6.0-r1.ebuild
@@ -40,6 +40,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-bashism.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_UPDATER=yes
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
new file mode 100644
index 000000000000..8cdc2aa59a0e
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.6.0-fix-bashism.patch
@@ -0,0 +1,16 @@
+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
+