Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, media-gfx/splashutils/files/, media-gfx/splashutils/
Date: Wed, 28 Nov 2018 13:19:26
Message-Id: 1543411136.3119a14e237a11489eaa12ec120a8771111e98aa.mgorny@gentoo
1 commit: 3119a14e237a11489eaa12ec120a8771111e98aa
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 28 13:18:56 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 28 13:18:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3119a14e
7
8 media-gfx/splashutils: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 media-gfx/splashutils/Manifest | 7 -
13 .../files/splashutils-1.5.4.4-freetype-bz2.patch | 15 -
14 .../files/splashutils-1.5.4.4-ft25.patch | 42 ---
15 .../splashutils-1.5.4.4-gentoo-typo-fix.patch | 19 -
16 .../files/splashutils-1.5.4.4-multi-keyboard.patch | 381 ---------------------
17 .../files/splashutils-1.5.4.4-no-la.patch | 12 -
18 .../files/splashutils-1.5.4.4-sys-queue.patch | 8 -
19 .../files/splashutils-1.5.4.4-sysmacros.patch | 11 -
20 media-gfx/splashutils/metadata.xml | 13 -
21 .../splashutils/splashutils-1.5.4.4-r8.ebuild | 240 -------------
22 profiles/package.mask | 7 -
23 11 files changed, 755 deletions(-)
24
25 diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
26 deleted file mode 100644
27 index c39d5347416..00000000000
28 --- a/media-gfx/splashutils/Manifest
29 +++ /dev/null
30 @@ -1,7 +0,0 @@
31 -DIST freetype-2.3.12.tar.bz2 1453034 BLAKE2B f0b0da50ecd6685a5c0b645252f99399ddcdcf823b4ce712e861899dab41009308473f149646101ca59f597f99b8e7659a8605475d7c6c912a941cb76d9d65fd SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b
32 -DIST jpegsrc.v8a.tar.gz 962018 BLAKE2B 6f776ca7cbe6b4d8095914f95f968cfef14e91f2b888fe92376d72c36b5b4fa72e9f1089611e2ad257bac5e77262e0523dde596f12305ccde35e51cfdea2d513 SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d
33 -DIST libpng-1.4.3.tar.bz2 658335 BLAKE2B 21c6e134a4f0877543ae1b229a3d26348b4b8dcc7ea17a5874399c8736220969c726d64a07a8954fa9c948e4aa57802bf58a41c42a44003f4ac50ec5154198fb SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61
34 -DIST miscsplashutils-0.1.8.tar.bz2 91997 BLAKE2B f0b47b51b7270ce8ba57fd989f289a940f4dfbab406cfdab9e2ad1e770a00928e169b75acb80e7525295483224e9cdcba0646f61630f1ef4875af392d078c674 SHA512 fa017e264249feda45839030728e90c82f775354c3f2c29a88362938c4a31b19e6d61f967512305642f8b96575f4d756ba197e672a361760e40080c23ec0442a
35 -DIST splashutils-gentoo-1.0.17.tar.bz2 15814 BLAKE2B 8c6e2fea3825e5821ab2a20d0f95dc7050438544b9cdc31dc972e3792050dc7d1687842bfda69f93a721103ced5c7168391f53c0f18906a7def2df4a6fb6127c SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167
36 -DIST splashutils-lite-1.5.4.4.tar.bz2 441340 BLAKE2B a2b348fe675a45d54b25ab60b20f5d4f92e673f5639b674027d0e78496c06948026670e2073c9257a3a0134a18752cc1381b2ba2be2d89d66b711cc7ad68ee2b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613
37 -DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
38
39 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
40 deleted file mode 100644
41 index 3438fd523b2..00000000000
42 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
43 +++ /dev/null
44 @@ -1,15 +0,0 @@
45 -=== modified file 'fbtruetype/Makefile'
46 ---- fbtruetype/Makefile 2011-10-01 14:10:17 +0000
47 -+++ fbtruetype/Makefile 2011-10-01 14:15:02 +0000
48 -@@ -23,8 +23,8 @@
49 - OBJECTS = fbtruetype.o messages.o console.o ttf.o luxisri.o
50 -
51 - LDFLAGS += -L$(LIBDIR)
52 --LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
53 --LIBSD = -lfreetype -lm
54 -+LIBSS = $(shell pkg-config freetype2 --libs --static) -lm
55 -+LIBSD = $(shell pkg-config freetype2 --libs) -lm
56 -
57 - CFLAGS += -I/usr/include/freetype2
58 - COMPILE = $(CC) $(CFLAGS)
59 -
60
61 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch
62 deleted file mode 100644
63 index b5194d5499a..00000000000
64 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch
65 +++ /dev/null
66 @@ -1,42 +0,0 @@
67 -Gentoo-bug: https://bugs.gentoo.org/506124
68 -Signed-off-by: Lars Wendler (Polynomial-C)
69 -Modified-by: Sergey Popov (Pinkbyte)
70 ---- miscsplashutils-0.1.8/fbtruetype/ttf.c
71 -+++ miscsplashutils-0.1.8/fbtruetype/ttf.c
72 -@@ -13,8 +13,8 @@
73 - #include <ft2build.h>
74 - #include FT_FREETYPE_H
75 - /* #include <freetype/freetype.h> */
76 --#include <freetype/ftoutln.h>
77 --#include <freetype/ttnameid.h>
78 -+#include FT_OUTLINE_H
79 -+#include FT_TRUETYPE_IDS_H
80 -
81 - #include "ttf.h"
82 -
83 ---- splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:04.330595381 +0300
84 -+++ splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:24.287596342 +0300
85 -@@ -25,8 +25,8 @@
86 - #include <assert.h>
87 -
88 - #include <ft2build.h>
89 --#include <freetype/ftoutln.h>
90 --#include <freetype/ttnameid.h>
91 -+#include FT_OUTLINE_H
92 -+#include FT_TRUETYPE_IDS_H
93 -
94 - #include "common.h"
95 - #include "render.h"
96 ---- splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:33.852605470 +0300
97 -+++ splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:52.504606368 +0300
98 -@@ -1,8 +1,8 @@
99 - #ifndef _TTF_H
100 - #define _TTF_H
101 - #include <ft2build.h>
102 --#include <freetype/ftoutln.h>
103 --#include <freetype/ttnameid.h>
104 -+#include FT_OUTLINE_H
105 -+#include FT_TRUETYPE_IDS_H
106 -
107 - #define CACHED_METRICS 0x10
108 - #define CACHED_BITMAP 0x01
109
110 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch
111 deleted file mode 100644
112 index 4b8d51375e7..00000000000
113 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch
114 +++ /dev/null
115 @@ -1,19 +0,0 @@
116 -commit 74dda8291efae78f00bb781148c8fd4fccaeb764
117 -Author: Michał Januszewski <spock@g.o>
118 -Date: Tue Jun 14 23:23:33 2011 +0200
119 -
120 - Fix typo in the Gentoo initscript.
121 -
122 -diff --git a/gentoo/init-fbcondecor b/gentoo/init-fbcondecor
123 -index b66f40a..ce921b6 100755
124 ---- a/gentoo/init-fbcondecor
125 -+++ b/gentoo/init-fbcondecor
126 -@@ -12,7 +12,7 @@ start() {
127 - splash_setup
128 -
129 - if [ -z "${FBCONDECOR_TTYS}" ]; then
130 -- FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER}:-12}")
131 -+ FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER:-12}}")
132 - fi
133 -
134 - local err=0
135
136 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch
137 deleted file mode 100644
138 index 23f15fd8f9c..00000000000
139 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch
140 +++ /dev/null
141 @@ -1,381 +0,0 @@
142 -diff -ru a/core/src/common.h b/core/src/common.h
143 ---- a/core/src/common.h 2013-01-11 06:35:35.000000000 +0200
144 -+++ b/core/src/common.h 2013-01-11 06:34:08.000000000 +0200
145 -@@ -34,6 +34,10 @@
146 - #define PATH_PROC FBSPLASH_DIR"/proc"
147 - #endif
148 -
149 -+/* Maximum number of keyboard connected to a machine.
150 -+ * The number is big (8) to be on the safe side */
151 -+#define MAX_KBDS 8
152 -+
153 - /* Useful short-named types */
154 - typedef u_int8_t u8;
155 - typedef u_int16_t u16;
156 -diff -ru a/core/src/daemon.c b/core/src/daemon.c
157 ---- a/core/src/daemon.c 2013-01-11 06:35:35.000000000 +0200
158 -+++ b/core/src/daemon.c 2013-01-11 06:34:08.000000000 +0200
159 -@@ -20,6 +20,7 @@
160 - #include <sys/ioctl.h>
161 - #include <sys/wait.h>
162 - #include <sys/mman.h>
163 -+#include <sys/select.h>
164 - #include <pthread.h>
165 - #include <errno.h>
166 - #include <dirent.h>
167 -@@ -29,6 +30,8 @@
168 - #include "common.h"
169 - #include "daemon.h"
170 -
171 -+#define EV_BUF_SIZE 8
172 -+
173 - /* Threading structures */
174 - pthread_mutex_t mtx_tty = PTHREAD_MUTEX_INITIALIZER;
175 - pthread_mutex_t mtx_paint = PTHREAD_MUTEX_INITIALIZER;
176 -@@ -41,7 +44,8 @@
177 - int ctty = CTTY_VERBOSE;
178 -
179 - /* File descriptors */
180 --int fd_evdev = -1;
181 -+int fd_evdevs[MAX_KBDS];
182 -+int evdev_count = 0;
183 - #ifdef CONFIG_GPM
184 - int fd_gpm = -1;
185 - #endif
186 -@@ -51,7 +55,6 @@
187 -
188 - /* Misc settings */
189 - char *notify[2];
190 --char *evdev = NULL;
191 -
192 - /* Service list */
193 - list svcs = { NULL, NULL };
194 -@@ -400,56 +403,83 @@
195 - }
196 - }
197 -
198 -+__u16 get_ev_key_pressed(int fd_evdev, int ev_buf_size,
199 -+ struct input_event *ev_buf) {
200 -+ size_t rb;
201 -+ int i;
202 -+ rb = read(fd_evdev, ev_buf, sizeof(struct input_event) * ev_buf_size);
203 -+ if (rb < (int) sizeof(struct input_event))
204 -+ return 0;
205 -+
206 -+ for (i = 0; i < (int) (rb / sizeof(struct input_event)); i++) {
207 -+ if (ev_buf[i].type != EV_KEY || ev_buf[i].value != 0)
208 -+ continue;
209 -+ return ev_buf[i].code;
210 -+ }
211 -+}
212 -+
213 - /*
214 - * Event device monitor thread.
215 - */
216 - void* thf_switch_evdev(void *unused)
217 - {
218 -- int i, h, oldstate;
219 -- size_t rb;
220 -- struct input_event ev[8];
221 -+ int i, h, oldstate, nfds, retval, fd_evdev;
222 -+ fd_set rfds;
223 -+ struct input_event ev_buf[EV_BUF_SIZE];
224 -+ __u16 key_pressed = 0;
225 -
226 - while (1) {
227 -- rb = read(fd_evdev, ev, sizeof(struct input_event)*8);
228 -- if (rb < (int) sizeof(struct input_event))
229 -- continue;
230 -+ nfds = 0, fd_evdev = -1;
231 -+ FD_ZERO(&rfds);
232 -+ for (i = 0;i < evdev_count;i++) {
233 -+ FD_SET(fd_evdevs[i], &rfds);
234 -+ nfds = max(nfds, fd_evdevs[i]);
235 -+ }
236 -
237 -- for (i = 0; i < (int) (rb / sizeof(struct input_event)); i++) {
238 -- if (ev[i].type != EV_KEY || ev[i].value != 0)
239 -- continue;
240 -+ nfds++;
241 -
242 -- switch (ev[i].code) {
243 -- case KEY_F2:
244 -- pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
245 -- pthread_mutex_lock(&mtx_paint);
246 -- if (ctty == CTTY_SILENT) {
247 -- h = config.tty_v;
248 -- } else {
249 -- h = config.tty_s;
250 -+ retval = select(nfds, &rfds, NULL, NULL, NULL);
251 -+ if (retval == -1)
252 -+ perror("select()");
253 -+ else if (retval) {
254 -+ for (i = 0;i < evdev_count;i++) {
255 -+ if (FD_ISSET(fd_evdevs[i], &rfds)) {
256 -+ fd_evdev = fd_evdevs[i];
257 -+ break;
258 - }
259 -- pthread_mutex_unlock(&mtx_paint);
260 -- pthread_setcancelstate(oldstate, NULL);
261 -+ }
262 -+ key_pressed = get_ev_key_pressed(fd_evdev, EV_BUF_SIZE, ev_buf);
263 -+ if (key_pressed == -1)
264 -+ continue;
265 -+ switch (key_pressed) {
266 -+ case KEY_F2:
267 -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
268 -+ pthread_mutex_lock(&mtx_paint);
269 -+ h = (ctty == CTTY_SILENT) ? config.tty_v : config.tty_s;
270 -+ pthread_mutex_unlock(&mtx_paint);
271 -+ pthread_setcancelstate(oldstate, NULL);
272 -+
273 -+ /* Switch to the new tty. This ioctl has to be done on
274 -+ * the silent tty. Sometimes init will mess with the
275 -+ * settings of the verbose console which will prevent
276 -+ * console switching from working properly.
277 -+ *
278 -+ * Don't worry about fd_tty[config.tty_s]
279 -+ * not being protected by a mutex --
280 -+ * this thread is always killed before any changes
281 -+ * are made to fd_tty[config.tty_s].
282 -+ */
283 -+ ioctl(fd_tty[config.tty_s], VT_ACTIVATE, h);
284 -+ break;
285 -
286 -- /* Switch to the new tty. This ioctl has to be done on
287 -- * the silent tty. Sometimes init will mess with the
288 -- * settings of the verbose console which will prevent
289 -- * console switching from working properly.
290 -- *
291 -- * Don't worry about fd_tty[config.tty_s] not being protected by a
292 -- * mutex -- this thread is always killed before any changes
293 -- * are made to fd_tty[config.tty_s].
294 -- */
295 -- ioctl(fd_tty[config.tty_s], VT_ACTIVATE, h);
296 -- break;
297 --
298 -- case KEY_F3:
299 -- config.textbox_visible = !config.textbox_visible;
300 -- invalidate_textbox(theme, config.textbox_visible);
301 -- cmd_paint(NULL);
302 -- break;
303 -+ case KEY_F3:
304 -+ config.textbox_visible = !config.textbox_visible;
305 -+ invalidate_textbox(theme, config.textbox_visible);
306 -+ cmd_paint(NULL);
307 -+ break;
308 - }
309 -- }
310 -- }
311 -+ } /* end of else if (retval) */
312 -+ } /* end of while(1) */
313 -
314 - pthread_exit(NULL);
315 - }
316 -@@ -519,7 +549,7 @@
317 -
318 - /* Do we have to start a monitor thread? */
319 - if (update & UPD_MON) {
320 -- if (fd_evdev != -1) {
321 -+ if (evdev_count >= 0) {
322 - if (pthread_create(&th_switchmon, NULL, &thf_switch_evdev, NULL)) {
323 - iprint(MSG_ERROR, "Evdev monitor thread creation failed.\n");
324 - exit(3);
325 -diff -ru a/core/src/daemon.h b/core/src/daemon.h
326 ---- a/core/src/daemon.h 2013-01-11 06:35:35.000000000 +0200
327 -+++ b/core/src/daemon.h 2013-01-11 06:34:08.000000000 +0200
328 -@@ -40,13 +40,13 @@
329 - extern int fd_tty_s, fd_tty1, fd_tty0;
330 -
331 - /*
332 -- * Event device on which the daemon listens for F2 keypresses.
333 -- * The proper device has to be detected by an external program and
334 -+ * Event devices on which the daemon listens for F2 keypresses.
335 -+ * The proper devices have to be detected by an external program and
336 - * then enabled by sending an appropriate command to the splash
337 - * daemon.
338 - */
339 --extern int fd_evdev;
340 --extern char *evdev;
341 -+extern int fd_evdevs[];
342 -+extern int evdev_count;
343 -
344 - #ifdef CONFIG_GPM
345 - #include <gpm.h>
346 -diff -ru a/core/src/daemon_cmd.c b/core/src/daemon_cmd.c
347 ---- a/core/src/daemon_cmd.c 2013-01-11 06:35:35.000000000 +0200
348 -+++ b/core/src/daemon_cmd.c 2013-01-11 06:34:08.000000000 +0200
349 -@@ -239,18 +239,35 @@
350 - */
351 - int cmd_set_event_dev(void **args)
352 - {
353 -- if (evdev)
354 -- free(evdev);
355 --
356 -- evdev = strdup(args[0]);
357 -+ char *evdevs;
358 -+ char *evdev;
359 -+ int i, j, fd_evdev = -1;
360 -
361 - pthread_cancel(th_switchmon);
362 -+ for (i = 0;i < evdev_count;i++) {
363 -+ close(fd_evdevs[i]);
364 -+ }
365 -+ evdevs = strdup(args[1]);
366 -+ evdev_count = *(int*)args[0];
367 -+ j = 0;
368 -+ for (i = 0;i < evdev_count;i++, evdevs = NULL) {
369 -+ evdev = strtok(evdevs, ",");
370 -+ fd_evdev = open(evdev, O_RDONLY);
371 -+ if (fd_evdev != -1) {
372 -+ fd_evdevs[j] = fd_evdev;
373 -+ j++;
374 -+ } else {
375 -+ perror("failed to open event device");
376 -+ }
377 -+ }
378 -+ if (j == 0) { /* all input devices failed to open */
379 -+ evdev_count = -1;
380 -+ free(evdevs);
381 -+ return -1;
382 -+ }
383 -
384 -- if (fd_evdev != -1)
385 -- close(fd_evdev);
386 --
387 -- fd_evdev = open(evdev, O_RDONLY);
388 --
389 -+ evdev_count = j;
390 -+ free(evdevs);
391 - switchmon_start(UPD_MON, config.tty_s);
392 -
393 - return 0;
394 -@@ -524,8 +541,8 @@
395 -
396 - { .cmd = "set event dev",
397 - .handler = cmd_set_event_dev,
398 -- .args = 1,
399 -- .specs = "s"
400 -+ .args = 2,
401 -+ .specs = "ds"
402 - },
403 -
404 - { .cmd = "set message",
405 -@@ -628,7 +645,7 @@
406 - continue;
407 -
408 - for (j = 0; j < known_cmds[i].args; j++) {
409 -- for (; buf[k] == ' '; buf[k] = 0, k++);
410 -+ for (; buf[k] == ' '; buf[k] = '\0', k++);
411 - if (!buf[k]) {
412 - args[j] = NULL;
413 - continue;
414 -diff -ru a/core/src/libfbsplash.c b/core/src/libfbsplash.c
415 ---- a/core/src/libfbsplash.c 2013-01-11 06:35:35.000000000 +0200
416 -+++ b/core/src/libfbsplash.c 2013-01-11 06:34:08.000000000 +0200
417 -@@ -588,6 +588,8 @@
418 - return -1;
419 - }
420 -
421 -+#define EVDV_BUF_LEN 128
422 -+
423 - /**
424 - * Try to set the event device for the splash daemon.
425 - *
426 -@@ -595,10 +597,14 @@
427 - */
428 - int fbsplash_set_evdev(void)
429 - {
430 -- char buf[128];
431 -+ char buf[EVDV_BUF_LEN];
432 -+ char evdev_devs[EVDV_BUF_LEN * MAX_KBDS];
433 - FILE *fp;
434 - int i, j;
435 --
436 -+ int kbd_count;
437 -+ int max_chars, chars_left, dev_path_len;
438 -+ char dev_path[] = PATH_DEV "/input/";
439 -+ dev_path_len = strlen(dev_path);
440 - char *evdev_cmds[] = {
441 - "/bin/grep -Hsi keyboard " PATH_SYS "/class/input/input*/name | /bin/sed -e 's#.*input\\([0-9]*\\)/name.*#event\\1#'",
442 - "/bin/grep -Hsi keyboard " PATH_SYS "/class/input/event*/device/driver/description | /bin/grep -o 'event[0-9]\\+'",
443 -@@ -608,22 +614,43 @@
444 -
445 - /* Try to activate the event device interface so that F2 can
446 - * be used to switch from verbose to silent. */
447 -- buf[0] = 0;
448 -- for (i = 0; i < sizeof(evdev_cmds)/sizeof(char*); i++) {
449 -+ buf[0] = '\0';
450 -+ kbd_count = 0;
451 -+ max_chars = sizeof(evdev_devs) / sizeof(char*);
452 -+ chars_left = max_chars - 1;
453 -+ evdev_devs[0] = '\0';
454 -+ for (i = 0; i < sizeof(evdev_cmds) / sizeof(char*); i++) {
455 - fp = popen(evdev_cmds[i], "r");
456 - if (fp) {
457 -- fgets(buf, 128, fp);
458 -- if ((j = strlen(buf)) > 0) {
459 -- if (buf[j-1] == '\n')
460 -- buf[j-1] = 0;
461 -- break;
462 -+ while (fgets(buf, 128, fp) && kbd_count < MAX_KBDS) {
463 -+ if ((j = strlen(buf)) > 0) {
464 -+ if (buf[j-1] == '\n')
465 -+ buf[j-1] = ',';
466 -+ if (chars_left < (j + dev_path_len)) {
467 -+ break;
468 -+ }
469 -+ kbd_count++;
470 -+ strncat(evdev_devs, dev_path, chars_left);
471 -+ chars_left -= dev_path_len;
472 -+ strncat(evdev_devs, buf, chars_left);
473 -+ chars_left -= j;
474 -+ }
475 -+ }
476 -+ /* replace the last ',' with '\n' */
477 -+ if (chars_left > 0 && evdev_devs[0] != '\0') {
478 -+ j = strlen(evdev_devs);
479 -+ if (j > 2) {
480 -+ evdev_devs[j - 1] = '\n';
481 -+ }
482 - }
483 - pclose(fp);
484 - }
485 -+ if (kbd_count > 0)
486 -+ break;
487 - }
488 -
489 -- if (buf[0] != 0) {
490 -- fbsplash_send("set event dev " PATH_DEV "/input/%s\n", buf);
491 -+ if (evdev_devs[0] != '\0') {
492 -+ fbsplash_send("set event dev %d %s", kbd_count, evdev_devs);
493 - return 0;
494 - } else {
495 - return -1;
496 -@@ -661,6 +688,8 @@
497 - return 0;
498 - }
499 -
500 -+#define MAX_CMD 2048
501 -+
502 - /**
503 - * Send stuff to the splash daemon using the splash FIFO.
504 - *
505 -@@ -668,7 +697,7 @@
506 - */
507 - int fbsplash_send(const char *fmt, ...)
508 - {
509 -- char cmd[256];
510 -+ char cmd[MAX_CMD];
511 - va_list ap;
512 -
513 - if (!fp_fifo) {
514 -@@ -690,7 +719,7 @@
515 - }
516 -
517 - va_start(ap, fmt);
518 -- vsnprintf(cmd, 256, fmt, ap);
519 -+ vsnprintf(cmd, MAX_CMD, fmt, ap);
520 - va_end(ap);
521 -
522 - fprintf(fp_fifo, cmd);
523
524 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-no-la.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-no-la.patch
525 deleted file mode 100644
526 index 0dae2589b7f..00000000000
527 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-no-la.patch
528 +++ /dev/null
529 @@ -1,12 +0,0 @@
530 ---- splashutils-1.5.4.4/src/Makefile.am.orig 2011-06-13 01:43:39.000000000 +0400
531 -+++ splashutils-1.5.4.4/src/Makefile.am 2015-08-09 23:37:23.191078543 +0300
532 -@@ -119,7 +119,7 @@
533 - fbsplash.h
534 - libfbsplashrender_la_CFLAGS = $(AM_CFLAGS)
535 - libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version)
536 --libfbsplashrender_la_LIBADD = libfbsplash.la
537 -+libfbsplashrender_la_LIBADD =
538 -
539 - libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS)
540 - libfbsplashrender_la_LIBADD += $(JPEG_LIBS)
541 -
542
543 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch
544 deleted file mode 100644
545 index 8ede7322c0d..00000000000
546 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch
547 +++ /dev/null
548 @@ -1,8 +0,0 @@
549 ---- splash.c 2011-06-13 04:45:59.000000000 +0700
550 -+++ splash.c 2014-11-14 20:04:43.000000000 +0700
551 -@@ -21,4 +21,5 @@
552 - #include <sys/wait.h>
553 - #include <sys/ioctl.h>
554 -+#include <sys/queue.h>
555 - #include <linux/kd.h>
556 - #include <linux/fb.h>
557
558 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch
559 deleted file mode 100644
560 index 7ed37ea6aff..00000000000
561 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch
562 +++ /dev/null
563 @@ -1,11 +0,0 @@
564 ---- src/common.c.old 2018-02-25 22:23:32.382369471 +0800
565 -+++ src/common.c 2018-02-25 22:23:02.236854316 +0800
566 -@@ -19,6 +19,7 @@
567 - #include <termios.h>
568 - #include <sys/ioctl.h>
569 - #include <sys/types.h>
570 -+#include <sys/sysmacros.h>
571 - #include <sys/mman.h>
572 - #include <dirent.h>
573 - #include <errno.h>
574 -
575
576 diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml
577 deleted file mode 100644
578 index c3a139b7fba..00000000000
579 --- a/media-gfx/splashutils/metadata.xml
580 +++ /dev/null
581 @@ -1,13 +0,0 @@
582 -<?xml version="1.0" encoding="UTF-8"?>
583 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
584 -<pkgmetadata>
585 -<!-- maintainer-needed -->
586 - <use>
587 - <flag name="fbcondecor">
588 - Support for the fbcondecor kernel patch.
589 - </flag>
590 - </use>
591 - <upstream>
592 - <remote-id type="sourceforge">freetype</remote-id>
593 - </upstream>
594 -</pkgmetadata>
595
596 diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
597 deleted file mode 100644
598 index 824b2760294..00000000000
599 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
600 +++ /dev/null
601 @@ -1,240 +0,0 @@
602 -# Copyright 1999-2018 Gentoo Foundation
603 -# Distributed under the terms of the GNU General Public License v2
604 -
605 -EAPI=5
606 -inherit autotools eutils multilib toolchain-funcs
607 -
608 -MISCSPLASH="miscsplashutils-0.1.8"
609 -GENTOOSPLASH="splashutils-gentoo-1.0.17"
610 -V_JPEG="8a"
611 -V_PNG="1.4.3"
612 -V_ZLIB="1.2.3"
613 -V_FT="2.3.12"
614 -
615 -ZLIBSRC="libs/zlib-${V_ZLIB}"
616 -LPNGSRC="libs/libpng-${V_PNG}"
617 -JPEGSRC="libs/jpeg-${V_JPEG}"
618 -FT2SRC="libs/freetype-${V_FT}"
619 -
620 -RESTRICT="test"
621 -IUSE="hardened +png +truetype gpm fbcondecor"
622 -
623 -DESCRIPTION="Framebuffer splash utilities"
624 -HOMEPAGE="https://sourceforge.net/projects/fbsplash.berlios/"
625 -SRC_URI="
626 - mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2
627 - mirror://sourceforge/fbsplash.berlios/${GENTOOSPLASH}.tar.bz2
628 - mirror://gentoo/${MISCSPLASH}.tar.bz2
629 - mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
630 - ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
631 - mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
632 - http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2
633 -"
634 -
635 -LICENSE="GPL-2"
636 -SLOT="0"
637 -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
638 -
639 -RDEPEND="
640 - gpm? ( sys-libs/gpm[static-libs(+)] )
641 - truetype? (
642 - >=media-libs/freetype-2[static-libs]
643 - app-arch/bzip2[static-libs(+)]
644 - sys-libs/zlib[static-libs(+)]
645 - )
646 - png? (
647 - >=media-libs/libpng-1.4.3[static-libs]
648 - sys-libs/zlib[static-libs(+)]
649 - )
650 - virtual/jpeg:0[static-libs]
651 - app-arch/cpio
652 - media-gfx/fbgrab
653 - !sys-apps/lcdsplash
654 - sys-apps/openrc"
655 -
656 -DEPEND="${RDEPEND}
657 - >=dev-libs/klibc-1.5
658 - virtual/pkgconfig
659 -"
660 -
661 -S="${WORKDIR}/${P/_/-}"
662 -SG="${WORKDIR}/${GENTOOSPLASH}"
663 -SM="${WORKDIR}/${MISCSPLASH}"
664 -
665 -pkg_setup() {
666 - if use hardened; then
667 - ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
668 - ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
669 - ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
670 - ewarn "the splash kernel helper."
671 - fi
672 -}
673 -
674 -src_prepare() {
675 - mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
676 -
677 - # We need to delete the Makefile and let it be rebuilt when splashutils
678 - # is being configured. Either that, or we end up with a segfaulting kernel
679 - # helper.
680 - rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
681 -
682 - cd "${SG}"
683 - epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
684 - epatch "${FILESDIR}/splashutils-1.5.4.4-sys-queue.patch"
685 -
686 - if use truetype ; then
687 - cd "${SM}"
688 - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
689 - cd "${WORKDIR}"
690 - epatch "${FILESDIR}/splashutils-1.5.4.4-ft25.patch"
691 - fi
692 -
693 - cd "${S}"
694 - ln -sf "${S}/src" "${WORKDIR}/core"
695 -
696 - #epatch "${FILESDIR}/${P}-bzip2.patch"
697 - epatch "${FILESDIR}/${P}-multi-keyboard.patch"
698 - # Bug #557126
699 - epatch "${FILESDIR}/${P}-no-la.patch"
700 -
701 - if ! tc-is-cross-compiler && \
702 - has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
703 - ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
704 - ewarn "splashutils, you're on your own, as this configuration is not supported."
705 - else
706 - # This should make splashutils compile on systems with hardened GCC.
707 - sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
708 - fi
709 -
710 - if ! use truetype ; then
711 - sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
712 - fi
713 -
714 - # Latest version of klibc defined its own version of ferror, so there is
715 - # not need for the hack in klibc_compat.h
716 - if has_version ">=dev-libs/klibc-1.5.20"; then
717 - echo > "libs/klibc_compat.h"
718 - fi
719 -
720 - rm -f m4/*
721 - epatch_user
722 - export PKG_CONFIG="pkg-config --static"
723 - eautoreconf
724 - epatch "${FILESDIR}"/splashutils-1.5.4.4-sysmacros.patch
725 -}
726 -
727 -src_configure() {
728 - tc-export CC
729 - cd "${SM}"
730 - emake CC="${CC}" LIB=$(get_libdir) STRIP=true
731 -
732 - cd "${S}"
733 - econf \
734 - $(use_with png) \
735 - --without-mng \
736 - $(use_with gpm) \
737 - $(use_with truetype ttf) \
738 - $(use_with truetype ttf-kernel) \
739 - $(use_enable fbcondecor) \
740 - --docdir=/usr/share/doc/${PF} \
741 - --with-freetype2-src=${FT2SRC} \
742 - --with-jpeg-src=${JPEGSRC} \
743 - --with-lpng-src=${LPNGSRC} \
744 - --with-zlib-src=${ZLIBSRC} \
745 - --with-essential-libdir=/$(get_libdir)
746 -}
747 -
748 -src_compile() {
749 - emake CC="${CC}" STRIP="true"
750 -
751 - cd "${SG}"
752 - emake LIB=$(get_libdir)
753 -}
754 -
755 -src_install() {
756 - local LIB=$(get_libdir)
757 -
758 - cd "${SM}"
759 - emake DESTDIR="${D}" LIB=${LIB} install
760 -
761 - cd "${S}"
762 - emake DESTDIR="${D}" STRIP="true" install
763 -
764 - mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
765 - gen_usr_ldscript libfbsplash.so
766 -
767 - echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
768 - doenvd 99splash
769 -
770 - if use fbcondecor ; then
771 - newinitd "${SG}"/init-fbcondecor fbcondecor
772 - newconfd "${SG}"/fbcondecor.conf fbcondecor
773 - fi
774 - newconfd "${SG}"/splash.conf splash
775 -
776 - insinto /usr/share/${PN}
777 - doins "${SG}"/initrd.splash
778 -
779 - insinto /etc/splash
780 - doins "${SM}"/fbtruetype/luxisri.ttf
781 -
782 - cd "${SG}"
783 - make DESTDIR="${D}" LIB=${LIB} install
784 - prune_libtool_files
785 -
786 - sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
787 - keepdir /${LIB}/splash/{tmp,cache,bin,sys}
788 - dosym /${LIB}/splash/bin/fbres /sbin/fbres
789 -}
790 -
791 -pkg_preinst() {
792 - has_version "<${CATEGORY}/${PN}-1.0"
793 - previous_less_than_1_0=$?
794 -
795 - has_version "<${CATEGORY}/${PN}-1.5.3"
796 - previous_less_than_1_5_3=$?
797 -}
798 -
799 -pkg_postinst() {
800 - if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
801 - elog "This package has been designed with udev in mind. Other solutions, such as"
802 - elog "devfs or a static /dev tree might work, but are generally discouraged and"
803 - elog "not supported. If you decide to switch to udev, you might want to have a"
804 - elog "look at 'The Gentoo udev Guide', which can be found at"
805 - elog " https://wiki.gentoo.org/wiki/Udev"
806 - elog ""
807 - fi
808 -
809 - if [[ $previous_less_than_1_0 = 0 ]] ; then
810 - elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
811 - elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
812 - elog ""
813 - fi
814 -
815 - if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
816 - elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
817 - elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish"
818 - elog "to use fbcondecor, run:"
819 - elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
820 - elog "and re-emerge splashutils."
821 - fi
822 -
823 - if ! test -f /proc/cmdline ||
824 - ! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
825 - elog "It is required that you add 'console=tty1' to your kernel"
826 - elog "command line parameters."
827 - elog ""
828 - elog "After these modifications, the relevant part of the kernel command"
829 - elog "line might look like:"
830 - elog " splash=silent,fadein,theme:emergence console=tty1"
831 - elog ""
832 - fi
833 -
834 - if ! has_version 'media-gfx/splash-themes-livecd' &&
835 - ! has_version 'media-gfx/splash-themes-gentoo'; then
836 - elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
837 - elog "core splashutils package. To get some themes you might want to emerge:"
838 - elog " media-gfx/splash-themes-livecd"
839 - elog " media-gfx/splash-themes-gentoo"
840 - fi
841 -}
842
843 diff --git a/profiles/package.mask b/profiles/package.mask
844 index 9c3e80ead4b..4ba31d5b4fd 100644
845 --- a/profiles/package.mask
846 +++ b/profiles/package.mask
847 @@ -490,13 +490,6 @@ dev-db/pgadmin3
848 # See #669278
849 =xfce-base/xfconf-4.13.6
850
851 -# Pacho Ramos <pacho@g.o> (21 Oct 2018)
852 -# Lots of pending bugs for years, this needs a dedicated maintainer that
853 -# fixes them: bug #354157, #354639, #398075, #398077, #417375, #499654,
854 -# #539358, #591682, #625798, #639912, #662316, #664270...
855 -# Removal in a month.
856 -media-gfx/splashutils
857 -
858 # Sobhan Mohammadpour <sobhan@g.o> (15 Oct 2018)
859 # Masked for testing.
860 sys-apps/bubblewrap