Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/, app-misc/ckb/files/
Date: Sun, 29 Nov 2020 13:52:35
Message-Id: 1606657935.14c8358fd544a72d4187e781f2b024d9fe185139.soap@gentoo
1 commit: 14c8358fd544a72d4187e781f2b024d9fe185139
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 29 13:52:15 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 13:52:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c8358f
7
8 app-misc/ckb: remove old versions
9
10 Closes: https://github.com/gentoo/gentoo/pull/16489
11 Package-Manager: Portage-2.3.99, Repoman-2.3.23
12 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 app-misc/ckb/Manifest | 3 --
16 app-misc/ckb/ckb-0.2.9-r1.ebuild | 53 ---------------------
17 app-misc/ckb/ckb-0.4.0.ebuild | 50 --------------------
18 app-misc/ckb/ckb-0.4.1.ebuild | 49 --------------------
19 app-misc/ckb/ckb-0.4.2.ebuild | 49 --------------------
20 app-misc/ckb/files/ckb-0.4.0-modprobe.patch | 72 -----------------------------
21 6 files changed, 276 deletions(-)
22
23 diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
24 index 0d1474d32f3..fa95dc0c740 100644
25 --- a/app-misc/ckb/Manifest
26 +++ b/app-misc/ckb/Manifest
27 @@ -1,4 +1 @@
28 -DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
29 -DIST ckb-0.4.0.tar.gz 838586 BLAKE2B 42d786d1934cce6bb082ba4c9f7081401153fa2bd209f290659cfd42787ef69fad9ad86c35df973f1934a03699a1472aa2a1ceb8ef70f46316558e764e5cd88c SHA512 81058d1e31e7328dac1b3a83cb443b9d9f29593e872d189766c1dfe8b502965fd9ea7a962423e94d5053c99d8dd8c50bd98638c11631a2ca586fb9ade700284f
30 -DIST ckb-0.4.1.tar.gz 845316 BLAKE2B 03b6d09ab9297fea30ecff5485fcb33d7ad00335b25ce8bbd7727db1b794c7016a8f161562b5271e29fcefb332b50797d91ff8c09724b96b8929033763ad6624 SHA512 294a29146978c722fdfbb9c2581ed3fc492b2ffead0de8c434bfe90e6aff6e61748517c0f98ae0d8747e7a95684cf22badf778b35358dbaa8acbc18a25ade993
31 DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
32
33 diff --git a/app-misc/ckb/ckb-0.2.9-r1.ebuild b/app-misc/ckb/ckb-0.2.9-r1.ebuild
34 deleted file mode 100644
35 index a0d3d2a09f0..00000000000
36 --- a/app-misc/ckb/ckb-0.2.9-r1.ebuild
37 +++ /dev/null
38 @@ -1,53 +0,0 @@
39 -# Copyright 1999-2019 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -inherit desktop qmake-utils systemd
45 -
46 -DESCRIPTION="Corsair K65/K70/K95 Driver"
47 -HOMEPAGE="https://github.com/ckb-next/ckb-next"
48 -SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="~amd64"
53 -IUSE=""
54 -
55 -DEPEND="
56 - >=dev-libs/quazip-0.7.2[qt5(+)]
57 - dev-qt/qtcore:5
58 - dev-qt/qtgui:5
59 - dev-qt/qtnetwork:5
60 - dev-qt/qtwidgets:5
61 - virtual/libudev:=
62 - x11-libs/libX11
63 -"
64 -RDEPEND="${DEPEND}"
65 -
66 -DOCS=( README.md BUILD.md DAEMON.md )
67 -
68 -S="${WORKDIR}/${PN}-next-${PV}"
69 -
70 -src_prepare() {
71 - default
72 - sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
73 - sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
74 - sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
75 -}
76 -
77 -src_configure() {
78 - eqmake5
79 -}
80 -
81 -src_install() {
82 - dobin bin/ckb bin/ckb-daemon
83 - dodir /usr/bin/ckb-animations
84 - exeinto /usr/libexec/ckb-animations
85 - doexe bin/ckb-animations/*
86 -
87 - newinitd "${FILESDIR}"/ckb.initd ckb-daemon
88 - domenu usr/ckb.desktop
89 - doicon usr/ckb.png
90 - systemd_dounit service/systemd/ckb-daemon.service
91 -}
92
93 diff --git a/app-misc/ckb/ckb-0.4.0.ebuild b/app-misc/ckb/ckb-0.4.0.ebuild
94 deleted file mode 100644
95 index a0ae0373699..00000000000
96 --- a/app-misc/ckb/ckb-0.4.0.ebuild
97 +++ /dev/null
98 @@ -1,50 +0,0 @@
99 -# Copyright 1999-2019 Gentoo Authors
100 -# Distributed under the terms of the GNU General Public License v2
101 -
102 -EAPI=7
103 -
104 -inherit desktop cmake-utils systemd
105 -
106 -DESCRIPTION="Corsair K65/K70/K95 Driver"
107 -HOMEPAGE="https://github.com/ckb-next/ckb-next"
108 -SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
109 -
110 -LICENSE="GPL-2"
111 -SLOT="0"
112 -KEYWORDS="~amd64"
113 -IUSE=""
114 -
115 -DEPEND="
116 - >=dev-libs/quazip-0.7.2[qt5(+)]
117 - dev-qt/qtcore:5
118 - dev-qt/qtgui:5
119 - dev-qt/qtnetwork:5
120 - dev-qt/qtwidgets:5
121 - virtual/libudev:=
122 - x11-libs/libX11
123 -"
124 -RDEPEND="${DEPEND}"
125 -
126 -DOCS=( CHANGELOG.md README.md )
127 -PATCHES=( "${FILESDIR}/${P}-modprobe.patch" )
128 -S="${WORKDIR}/${PN}-next-${PV}"
129 -
130 -src_configure() {
131 - local mycmakeargs=(
132 - -DDISABLE_UPDATER=yes
133 - )
134 - cmake-utils_src_configure
135 -}
136 -
137 -src_install() {
138 - newinitd "${FILESDIR}"/ckb.initd ckb-daemon
139 - cmake-utils_src_install
140 -}
141 -
142 -pkg_postinst() {
143 - xdg_icon_cache_update
144 -}
145 -
146 -pkg_postrm() {
147 - xdg_icon_cache_update
148 -}
149
150 diff --git a/app-misc/ckb/ckb-0.4.1.ebuild b/app-misc/ckb/ckb-0.4.1.ebuild
151 deleted file mode 100644
152 index b9d31b54b0e..00000000000
153 --- a/app-misc/ckb/ckb-0.4.1.ebuild
154 +++ /dev/null
155 @@ -1,49 +0,0 @@
156 -# Copyright 1999-2019 Gentoo Authors
157 -# Distributed under the terms of the GNU General Public License v2
158 -
159 -EAPI=7
160 -
161 -inherit desktop cmake-utils systemd
162 -
163 -DESCRIPTION="Corsair K65/K70/K95 Driver"
164 -HOMEPAGE="https://github.com/ckb-next/ckb-next"
165 -SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
166 -
167 -LICENSE="GPL-2"
168 -SLOT="0"
169 -KEYWORDS="~amd64"
170 -IUSE=""
171 -
172 -DEPEND="
173 - >=dev-libs/quazip-0.7.2[qt5(+)]
174 - dev-qt/qtcore:5
175 - dev-qt/qtgui:5
176 - dev-qt/qtnetwork:5
177 - dev-qt/qtwidgets:5
178 - virtual/libudev:=
179 - x11-libs/libX11
180 -"
181 -RDEPEND="${DEPEND}"
182 -
183 -DOCS=( CHANGELOG.md README.md )
184 -S="${WORKDIR}/${PN}-next-${PV}"
185 -
186 -src_configure() {
187 - local mycmakeargs=(
188 - -DDISABLE_UPDATER=yes
189 - )
190 - cmake-utils_src_configure
191 -}
192 -
193 -src_install() {
194 - newinitd "${FILESDIR}"/ckb.initd ckb-daemon
195 - cmake-utils_src_install
196 -}
197 -
198 -pkg_postinst() {
199 - xdg_icon_cache_update
200 -}
201 -
202 -pkg_postrm() {
203 - xdg_icon_cache_update
204 -}
205
206 diff --git a/app-misc/ckb/ckb-0.4.2.ebuild b/app-misc/ckb/ckb-0.4.2.ebuild
207 deleted file mode 100644
208 index b9d31b54b0e..00000000000
209 --- a/app-misc/ckb/ckb-0.4.2.ebuild
210 +++ /dev/null
211 @@ -1,49 +0,0 @@
212 -# Copyright 1999-2019 Gentoo Authors
213 -# Distributed under the terms of the GNU General Public License v2
214 -
215 -EAPI=7
216 -
217 -inherit desktop cmake-utils systemd
218 -
219 -DESCRIPTION="Corsair K65/K70/K95 Driver"
220 -HOMEPAGE="https://github.com/ckb-next/ckb-next"
221 -SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
222 -
223 -LICENSE="GPL-2"
224 -SLOT="0"
225 -KEYWORDS="~amd64"
226 -IUSE=""
227 -
228 -DEPEND="
229 - >=dev-libs/quazip-0.7.2[qt5(+)]
230 - dev-qt/qtcore:5
231 - dev-qt/qtgui:5
232 - dev-qt/qtnetwork:5
233 - dev-qt/qtwidgets:5
234 - virtual/libudev:=
235 - x11-libs/libX11
236 -"
237 -RDEPEND="${DEPEND}"
238 -
239 -DOCS=( CHANGELOG.md README.md )
240 -S="${WORKDIR}/${PN}-next-${PV}"
241 -
242 -src_configure() {
243 - local mycmakeargs=(
244 - -DDISABLE_UPDATER=yes
245 - )
246 - cmake-utils_src_configure
247 -}
248 -
249 -src_install() {
250 - newinitd "${FILESDIR}"/ckb.initd ckb-daemon
251 - cmake-utils_src_install
252 -}
253 -
254 -pkg_postinst() {
255 - xdg_icon_cache_update
256 -}
257 -
258 -pkg_postrm() {
259 - xdg_icon_cache_update
260 -}
261
262 diff --git a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
263 deleted file mode 100644
264 index 31dc3303b32..00000000000
265 --- a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
266 +++ /dev/null
267 @@ -1,72 +0,0 @@
268 ----
269 - src/daemon/input_linux.c | 21 ++++++++++++++-------
270 - src/gui/mainwindow.cpp | 14 ++++++++------
271 - 2 files changed, 22 insertions(+), 13 deletions(-)
272 -
273 -diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
274 -index 0391243e..8489f5b5 100644
275 ---- a/src/daemon/input_linux.c
276 -+++ b/src/daemon/input_linux.c
277 -@@ -55,13 +55,20 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
278 - ///
279 - /// Some tips on using [uinput_user_dev in](http://thiemonge.org/getting-started-with-uinput)
280 - int os_inputopen(usbdevice* kb){
281 -- /// First check whether the uinput module is loaded by the kernel.
282 -- ///
283 -- // Load the uinput module (if it's not loaded already)
284 -- if(system("modprobe uinput") != 0) {
285 -- ckb_fatal("Failed to load uinput module\n");
286 -- return 1;
287 -+ /// Let's see if uinput is already available
288 -+ int fd = open("/dev/uinput", O_RDWR);
289 -+ if(fd < 0){
290 -+ fd = open("/dev/input/uinput", O_RDWR);
291 -+ }
292 -+
293 -+ // If not available, load the module
294 -+ if(fd < 0){
295 -+ if(system("modprobe uinput") != 0) {
296 -+ ckb_fatal("Failed to load uinput module\n");
297 -+ return 1;
298 -+ }
299 - }
300 -+ close(fd);
301 -
302 - if(IS_SINGLE_EP(kb)) {
303 - kb->uinput_kb = 0;
304 -@@ -79,7 +86,7 @@ int os_inputopen(usbdevice* kb){
305 - indev.id.product = kb->product;
306 - indev.id.version = kb->fwversion;
307 - // Open keyboard
308 -- int fd = uinputopen(&indev, 0);
309 -+ fd = uinputopen(&indev, 0);
310 - kb->uinput_kb = fd;
311 - if(fd <= 0)
312 - return 0;
313 -diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
314 -index 968764e7..1eb95bda 100644
315 ---- a/src/gui/mainwindow.cpp
316 -+++ b/src/gui/mainwindow.cpp
317 -@@ -282,14 +282,16 @@ void MainWindow::updateVersion(){
318 - if(kextstatOut.isEmpty())
319 - daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices."));
320 - #elif defined(Q_OS_LINUX)
321 -- QProcess modprobe;
322 -- modprobe.start("modprobe", QStringList("uinput"));
323 -+ if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
324 -+ QProcess modprobe;
325 -+ modprobe.start("modprobe", QStringList("uinput"));
326 -
327 -- if(!modprobe.waitForFinished())
328 -- qDebug() << "Modprobe error";
329 -+ if(!modprobe.waitForFinished())
330 -+ qDebug() << "Modprobe error";
331 -
332 -- if(modprobe.exitCode())
333 -- daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
334 -+ if(modprobe.exitCode())
335 -+ daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
336 -+ }
337 - #endif
338 - settingsWidget->setStatus(tr("No devices connected") + daemonWarning);
339 - }