Gentoo Archives: gentoo-commits

From: John Helmert III <ajak@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/files/, app-misc/ckb/
Date: Fri, 09 Sep 2022 17:24:57
Message-Id: 1662744172.18a0c46a9c8a7a0a07437a9b0480a79ac9647b33.ajak@gentoo
1 commit: 18a0c46a9c8a7a0a07437a9b0480a79ac9647b33
2 Author: John Helmert III <ajak <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 9 17:22:39 2022 +0000
4 Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 9 17:22:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a0c46a
7
8 app-misc/ckb: drop 0.4.4-r2
9
10 Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
11
12 app-misc/ckb/Manifest | 1 -
13 app-misc/ckb/ckb-0.4.4-r2.ebuild | 65 -----------------------
14 app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch | 29 ----------
15 app-misc/ckb/files/ckb.initd | 29 ----------
16 4 files changed, 124 deletions(-)
17
18 diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
19 index 2d5a0b1a5219..4cdf752d6a62 100644
20 --- a/app-misc/ckb/Manifest
21 +++ b/app-misc/ckb/Manifest
22 @@ -1,2 +1 @@
23 -DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
24 DIST ckb-0.5.0.tar.gz 1868880 BLAKE2B 867923f4eaf5d0e9d4ec14c5bd5952d88436c12a0d615528e083705cff7346a654dc801e743519e5482e8beb1cd28284710000e69b20032856b0e22d48792ee3 SHA512 d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1
25
26 diff --git a/app-misc/ckb/ckb-0.4.4-r2.ebuild b/app-misc/ckb/ckb-0.4.4-r2.ebuild
27 deleted file mode 100644
28 index c1bff1e3aab4..000000000000
29 --- a/app-misc/ckb/ckb-0.4.4-r2.ebuild
30 +++ /dev/null
31 @@ -1,65 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit xdg cmake
38 -
39 -DESCRIPTION="Corsair K65/K70/K95 Driver"
40 -HOMEPAGE="https://github.com/ckb-next/ckb-next"
41 -SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="amd64"
46 -IUSE="systemd"
47 -
48 -RDEPEND="
49 - dev-libs/libdbusmenu-qt
50 - dev-libs/quazip:0=[qt5(+)]
51 - dev-qt/qtcore:5
52 - dev-qt/qtdbus:5
53 - dev-qt/qtgui:5
54 - dev-qt/qtnetwork:5
55 - dev-qt/qtwidgets:5
56 - dev-qt/qtx11extras:5
57 - media-sound/pulseaudio
58 - virtual/libudev:=
59 - x11-libs/libX11
60 - x11-libs/libxcb:=
61 - x11-libs/xcb-util-wm"
62 -DEPEND="${RDEPEND}"
63 -BDEPEND="dev-qt/linguist-tools:5"
64 -
65 -S="${WORKDIR}/${PN}-next-${PV}"
66 -
67 -PATCHES=(
68 - "${FILESDIR}/${P}-libinput-1.2.0.patch"
69 -)
70 -
71 -src_configure() {
72 - local mycmakeargs=(
73 - -DDISABLE_UPDATER=yes
74 - -DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
75 - )
76 - cmake_src_configure
77 -}
78 -
79 -src_install() {
80 - cmake_src_install
81 - dodoc CHANGELOG.md
82 -
83 - newinitd "${FILESDIR}"/ckb.initd ckb-daemon
84 -}
85 -
86 -pkg_postinst() {
87 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
88 - elog "The ckb daemon will have to be started before use:"
89 - elog
90 - if use systemd ; then
91 - elog "# systemctl start ckb-next-daemon"
92 - else
93 - elog "# rc-service ckb start"
94 - fi
95 - fi
96 -}
97
98 diff --git a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
99 deleted file mode 100644
100 index 211d5e4ea01e..000000000000
101 --- a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
102 +++ /dev/null
103 @@ -1,29 +0,0 @@
104 -From dc4dc54c5ebac7e4b455d8df35076fc044a581a7 Mon Sep 17 00:00:00 2001
105 -From: Tasos Sahanidis <tasos@××××××××.com>
106 -Date: Mon, 20 Sep 2021 14:48:18 +0300
107 -Subject: [PATCH] Don't enable unneeded axes in mouse device
108 -
109 -Specifically, we used to enable HI_RES wheel events without ever
110 -sending any. This breaks scrolling in latest libinput as it expects
111 -us to actually send HI_RES events.
112 ----
113 - src/daemon/input_linux.c | 6 ++++--
114 - 1 file changed, 4 insertions(+), 2 deletions(-)
115 -
116 -diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
117 -index 68cc0ebb..a9ac8c8e 100644
118 ---- a/src/daemon/input_linux.c
119 -+++ b/src/daemon/input_linux.c
120 -@@ -25,8 +25,10 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
121 - ioctl(fd, UI_SET_KEYBIT, i);
122 - // Enable mouse axes
123 - ioctl(fd, UI_SET_EVBIT, EV_REL);
124 -- for(int i = 0; i < REL_CNT; i++)
125 -- ioctl(fd, UI_SET_RELBIT, i);
126 -+ ioctl(fd, UI_SET_RELBIT, REL_X);
127 -+ ioctl(fd, UI_SET_RELBIT, REL_Y);
128 -+ ioctl(fd, UI_SET_RELBIT, REL_WHEEL);
129 -+ ioctl(fd, UI_SET_RELBIT, REL_HWHEEL);
130 - } else {
131 - // Enable common keyboard keys
132 - for(int i = KEY_ESC; i <= KEY_MEDIA; i++)
133
134 diff --git a/app-misc/ckb/files/ckb.initd b/app-misc/ckb/files/ckb.initd
135 deleted file mode 100644
136 index 76af0fd8438b..000000000000
137 --- a/app-misc/ckb/files/ckb.initd
138 +++ /dev/null
139 @@ -1,29 +0,0 @@
140 -#!/sbin/openrc-run
141 -## Copyright 1999-2015 Gentoo Foundation
142 -# Distributed under the terms of the GNU General Public License v2
143 -
144 -extra_started_commands="reload"
145 -command="/usr/bin/ckb-daemon"
146 -description="Controller for Corsair Keyboard Driver"
147 -pidfile="/run/ckb.pid"
148 -logfile="/var/run/ckb.log"
149 -
150 -start() {
151 - ebegin "Starting Corsair Keyboard Driver"
152 - start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}" --background \
153 - --stdout "${logfile}" --stderr "${logfile}"
154 - eend $?
155 -}
156 -
157 -stop() {
158 - ebegin "Stopping Corsair Keyboard Driver"
159 - start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}"
160 - eend $?
161 -
162 -}
163 -
164 -reload() {
165 - stop
166 - sleep 3
167 - start
168 -}