1 |
commit: 228c08213b11ac66f587a7c7d3cfbf03022aa389 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 15 00:11:13 2022 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 15 00:11:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=228c0821 |
7 |
|
8 |
sys-libs/gpm: Current ::gentoo stable is fine |
9 |
|
10 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
11 |
|
12 |
sys-libs/gpm/Manifest | 2 - |
13 |
.../files/gpm-1.20.7-musl-missing-headers.patch | 33 -------- |
14 |
.../files/gpm-1.20.7-musl-portable-sigaction.patch | 16 ---- |
15 |
sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch | 30 ------- |
16 |
sys-libs/gpm/files/gpm.conf.d | 23 ------ |
17 |
sys-libs/gpm/files/gpm.rc6-2 | 29 ------- |
18 |
sys-libs/gpm/files/gpm.service | 12 --- |
19 |
sys-libs/gpm/gpm-1.20.7-r2.ebuild | 95 ---------------------- |
20 |
sys-libs/gpm/metadata.xml | 8 -- |
21 |
9 files changed, 248 deletions(-) |
22 |
|
23 |
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest |
24 |
deleted file mode 100644 |
25 |
index b637cdcc..00000000 |
26 |
--- a/sys-libs/gpm/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1,2 +0,0 @@ |
29 |
-DIST gpm-1.20.7-docs.patch.xz 41668 SHA256 a1b73e8916d1ae5e336a6c366c2be51b668176d743bb137a53c623f5a634faf6 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4 WHIRLPOOL f6832979bc5b3ca1c61f150ab8795f744dc3d44fa404038dd5de97c4fd939e2e1fb4b40bcb27daf5cb81846a0841954dbfa5b8d6e37e341b834d9dce6382dcf1 |
30 |
-DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a |
31 |
|
32 |
diff --git a/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch b/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch |
33 |
deleted file mode 100644 |
34 |
index c981658e..00000000 |
35 |
--- a/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch |
36 |
+++ /dev/null |
37 |
@@ -1,33 +0,0 @@ |
38 |
-diff -Naur gpm-1.20.7.orig/src/daemon/open_console.c gpm-1.20.7/src/daemon/open_console.c |
39 |
---- gpm-1.20.7.orig/src/daemon/open_console.c 2012-10-26 21:21:38.000000000 +0000 |
40 |
-+++ gpm-1.20.7/src/daemon/open_console.c 2015-07-20 19:31:22.225131984 +0000 |
41 |
-@@ -22,6 +22,7 @@ |
42 |
- #include <fcntl.h> /* open and co. */ |
43 |
- #include <sys/stat.h> /* stat() */ |
44 |
- #include <sys/ioctl.h> /* ioctl */ |
45 |
-+#include <sys/sysmacros.h> /* major */ |
46 |
- |
47 |
- /* Linux specific (to be outsourced in gpm2 */ |
48 |
- #include <linux/serial.h> /* for serial console check */ |
49 |
-diff -Naur gpm-1.20.7.orig/src/prog/display-buttons.c gpm-1.20.7/src/prog/display-buttons.c |
50 |
---- gpm-1.20.7.orig/src/prog/display-buttons.c 2012-10-26 21:21:38.000000000 +0000 |
51 |
-+++ gpm-1.20.7/src/prog/display-buttons.c 2015-07-20 19:27:48.489140025 +0000 |
52 |
-@@ -36,6 +36,7 @@ |
53 |
- #include <stdio.h> /* printf() */ |
54 |
- #include <time.h> /* time() */ |
55 |
- #include <errno.h> /* errno */ |
56 |
-+#include <sys/select.h> /* fd_set, select, FD_* */ |
57 |
- #include <gpm.h> /* gpm information */ |
58 |
- |
59 |
- /* display resulting data */ |
60 |
-diff -Naur gpm-1.20.7.orig/src/prog/display-coords.c gpm-1.20.7/src/prog/display-coords.c |
61 |
---- gpm-1.20.7.orig/src/prog/display-coords.c 2012-10-26 21:21:38.000000000 +0000 |
62 |
-+++ gpm-1.20.7/src/prog/display-coords.c 2015-07-20 19:28:45.829137867 +0000 |
63 |
-@@ -37,6 +37,7 @@ |
64 |
- #include <stdio.h> /* printf() */ |
65 |
- #include <time.h> /* time() */ |
66 |
- #include <errno.h> /* errno */ |
67 |
-+#include <sys/select.h> /* fd_set, select, FD_* */ |
68 |
- #include <gpm.h> /* gpm information */ |
69 |
- |
70 |
- /* display resulting data */ |
71 |
|
72 |
diff --git a/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch b/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch |
73 |
deleted file mode 100644 |
74 |
index 270109ee..00000000 |
75 |
--- a/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch |
76 |
+++ /dev/null |
77 |
@@ -1,16 +0,0 @@ |
78 |
-diff -Naur gpm-1.20.7.orig/src/prog/gpm-root.y gpm-1.20.7/src/prog/gpm-root.y |
79 |
---- gpm-1.20.7.orig/src/prog/gpm-root.y 2012-10-26 21:21:38.000000000 +0000 |
80 |
-+++ gpm-1.20.7/src/prog/gpm-root.y 2015-07-20 19:37:50.489117377 +0000 |
81 |
-@@ -1199,8 +1199,11 @@ |
82 |
- #if defined(__GLIBC__) |
83 |
- __sigemptyset(&childaction.sa_mask); |
84 |
- #else /* __GLIBC__ */ |
85 |
-- childaction.sa_mask=0; |
86 |
-+ sigemptyset(&childaction.sa_mask); |
87 |
- #endif /* __GLIBC__ */ |
88 |
-+#ifndef SA_INTERRUPT |
89 |
-+# define SA_INTERRUPT 0x20000000 /* from GLIBC's <bits/sigaction.h> */ |
90 |
-+#endif |
91 |
- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */ |
92 |
- sigaction(SIGCHLD,&childaction,NULL); |
93 |
- |
94 |
|
95 |
diff --git a/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch b/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch |
96 |
deleted file mode 100644 |
97 |
index d8ab2d19..00000000 |
98 |
--- a/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch |
99 |
+++ /dev/null |
100 |
@@ -1,30 +0,0 @@ |
101 |
-From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001 |
102 |
-From: Mike Frysinger <vapier@g.o> |
103 |
-Date: Mon, 14 Mar 2016 15:39:54 -0400 |
104 |
-Subject: [PATCH] fix building w/newer glibc |
105 |
- |
106 |
-Linux C libraries are looking to disentangle sysmacros.h from the |
107 |
-sys/types.h include, so make sure we pull in the header when it is |
108 |
-found. |
109 |
---- |
110 |
- src/daemon/open_console.c | 4 ++++ |
111 |
- 1 file changed, 4 insertions(+) |
112 |
- |
113 |
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c |
114 |
-index 4d6c0af..6dd43e6 100644 |
115 |
---- a/src/daemon/open_console.c |
116 |
-+++ b/src/daemon/open_console.c |
117 |
-@@ -24,6 +24,10 @@ |
118 |
- #include <sys/types.h> /* major() */ |
119 |
- #include <sys/ioctl.h> /* ioctl */ |
120 |
- |
121 |
-+#ifdef HAVE_SYS_SYSMACROS_H |
122 |
-+#include <sys/sysmacros.h> /* major() w/newer glibc */ |
123 |
-+#endif |
124 |
-+ |
125 |
- /* Linux specific (to be outsourced in gpm2 */ |
126 |
- #include <linux/serial.h> /* for serial console check */ |
127 |
- #include <asm/ioctls.h> /* for serial console check */ |
128 |
--- |
129 |
-2.6.2 |
130 |
- |
131 |
|
132 |
diff --git a/sys-libs/gpm/files/gpm.conf.d b/sys-libs/gpm/files/gpm.conf.d |
133 |
deleted file mode 100644 |
134 |
index f21c2575..00000000 |
135 |
--- a/sys-libs/gpm/files/gpm.conf.d |
136 |
+++ /dev/null |
137 |
@@ -1,23 +0,0 @@ |
138 |
-# /etc/init.d/gpm |
139 |
- |
140 |
-# Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry |
141 |
- |
142 |
-MOUSE=ps2 |
143 |
-#MOUSE=imps2 |
144 |
-#MOUSEDEV=/dev/psaux |
145 |
-MOUSEDEV=/dev/input/mice |
146 |
- |
147 |
-# Extra settings |
148 |
- |
149 |
-#RESPONSIVENESS= |
150 |
-#REPEAT_TYPE=raw |
151 |
- |
152 |
-# Please uncomment this line if you want gpm to understand charsets used |
153 |
-# in URLs and names with ~ or : in them, etc. This is a good idea to turn on! |
154 |
- |
155 |
-#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\"" |
156 |
- |
157 |
-# Various other options, see gpm(8) manpage for more. |
158 |
- |
159 |
-#APPEND="-g 1 -A60" |
160 |
-#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60" |
161 |
|
162 |
diff --git a/sys-libs/gpm/files/gpm.rc6-2 b/sys-libs/gpm/files/gpm.rc6-2 |
163 |
deleted file mode 100644 |
164 |
index 7f735278..00000000 |
165 |
--- a/sys-libs/gpm/files/gpm.rc6-2 |
166 |
+++ /dev/null |
167 |
@@ -1,29 +0,0 @@ |
168 |
-#!/sbin/runscript |
169 |
-# Copyright 1999-2012 Gentoo Foundation |
170 |
-# Distributed under the terms of the GNU General Public License v2 |
171 |
-# $Id$ |
172 |
- |
173 |
-#NB: Config is in /etc/conf.d/gpm |
174 |
- |
175 |
-command=/usr/sbin/gpm |
176 |
-command_args=" |
177 |
- -m ${MOUSEDEV} |
178 |
- -t ${MOUSE} |
179 |
- ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} |
180 |
- ${REPEAT_TYPE:+ -R${REPEAT_TYPE}} |
181 |
- ${APPEND} |
182 |
-" |
183 |
- |
184 |
-pidfile=/var/run/gpm.pid |
185 |
- |
186 |
-depend() { |
187 |
- need localmount |
188 |
- use hotplug logger |
189 |
-} |
190 |
- |
191 |
-start_pre() { |
192 |
- if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then |
193 |
- eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first" |
194 |
- return 1 |
195 |
- fi |
196 |
-} |
197 |
|
198 |
diff --git a/sys-libs/gpm/files/gpm.service b/sys-libs/gpm/files/gpm.service |
199 |
deleted file mode 100644 |
200 |
index 966ad800..00000000 |
201 |
--- a/sys-libs/gpm/files/gpm.service |
202 |
+++ /dev/null |
203 |
@@ -1,12 +0,0 @@ |
204 |
-[Unit] |
205 |
-Description=Console Mouse manager |
206 |
-After=syslog.target |
207 |
- |
208 |
-[Service] |
209 |
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t exps2 |
210 |
-StandardOutput=syslog |
211 |
-Type=forking |
212 |
-PIDFile=/var/run/gpm.pid |
213 |
- |
214 |
-[Install] |
215 |
-WantedBy=multi-user.target |
216 |
|
217 |
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild |
218 |
deleted file mode 100644 |
219 |
index 157250c8..00000000 |
220 |
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild |
221 |
+++ /dev/null |
222 |
@@ -1,95 +0,0 @@ |
223 |
-# Copyright 1999-2016 Gentoo Foundation |
224 |
-# Distributed under the terms of the GNU General Public License v2 |
225 |
- |
226 |
-# emacs support disabled due to #99533 #335900 |
227 |
- |
228 |
-EAPI=5 |
229 |
- |
230 |
-inherit eutils systemd toolchain-funcs autotools multilib-minimal usr-ldscript |
231 |
- |
232 |
-DESCRIPTION="Console-based mouse driver" |
233 |
-HOMEPAGE="http://www.nico.schottelius.org/software/gpm/" |
234 |
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma |
235 |
- mirror://gentoo/${P}-docs.patch.xz" |
236 |
- |
237 |
-LICENSE="GPL-2" |
238 |
-SLOT="0" |
239 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
240 |
-IUSE="selinux static-libs" |
241 |
- |
242 |
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] |
243 |
- selinux? ( sec-policy/selinux-gpm )" |
244 |
-DEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] |
245 |
- app-arch/xz-utils |
246 |
- sys-apps/texinfo |
247 |
- virtual/yacc" |
248 |
- |
249 |
-src_prepare() { |
250 |
- epatch "${FILESDIR}"/${P}-sysmacros.patch |
251 |
- |
252 |
- # Hack up the docs until we get this sorted upstream. |
253 |
- # https://github.com/telmich/gpm/issues/8 |
254 |
- epatch "${WORKDIR}"/${P}-docs.patch |
255 |
- touch -r . doc/* || die |
256 |
- |
257 |
- # fix ABI values |
258 |
- sed -i \ |
259 |
- -e '/^abi_lev=/s:=.*:=1:' \ |
260 |
- -e '/^abi_age=/s:=.*:=20:' \ |
261 |
- configure.ac.footer || die |
262 |
- # Rebuild autotools since release doesn't include them. |
263 |
- # Should be fixed with the next release though. |
264 |
- # https://github.com/telmich/gpm/pull/15 |
265 |
- sed -i -e '/ACLOCAL/,$d' autogen.sh || die |
266 |
- |
267 |
- epatch "${FILESDIR}"/${P}-musl-missing-headers.patch |
268 |
- epatch "${FILESDIR}"/${P}-musl-portable-sigaction.patch |
269 |
- |
270 |
- ./autogen.sh |
271 |
- eautoreconf |
272 |
- |
273 |
- # Out-of-tree builds are broken. |
274 |
- # https://github.com/telmich/gpm/issues/16 |
275 |
- multilib_copy_sources |
276 |
-} |
277 |
- |
278 |
-multilib_src_configure() { |
279 |
- econf \ |
280 |
- --sysconfdir=/etc/gpm \ |
281 |
- $(use_enable static-libs static) \ |
282 |
- emacs=/bin/false |
283 |
-} |
284 |
- |
285 |
-_emake() { |
286 |
- emake \ |
287 |
- EMACS=: ELISP="" \ |
288 |
- $(multilib_is_native_abi || echo "PROG= ") \ |
289 |
- "$@" |
290 |
-} |
291 |
- |
292 |
-multilib_src_compile() { |
293 |
- _emake |
294 |
-} |
295 |
- |
296 |
-multilib_src_test() { |
297 |
- _emake check |
298 |
-} |
299 |
- |
300 |
-multilib_src_install() { |
301 |
- _emake DESTDIR="${D}" install |
302 |
- |
303 |
- dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so |
304 |
- gen_usr_ldscript -a gpm |
305 |
-} |
306 |
- |
307 |
-multilib_src_install_all() { |
308 |
- insinto /etc/gpm |
309 |
- doins conf/gpm-*.conf |
310 |
- |
311 |
- dodoc README TODO |
312 |
- dodoc doc/Announce doc/FAQ doc/README* |
313 |
- |
314 |
- newinitd "${FILESDIR}"/gpm.rc6-2 gpm |
315 |
- newconfd "${FILESDIR}"/gpm.conf.d gpm |
316 |
- systemd_dounit "${FILESDIR}"/gpm.service |
317 |
-} |
318 |
|
319 |
diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml |
320 |
deleted file mode 100644 |
321 |
index 56c12441..00000000 |
322 |
--- a/sys-libs/gpm/metadata.xml |
323 |
+++ /dev/null |
324 |
@@ -1,8 +0,0 @@ |
325 |
-<?xml version="1.0" encoding="UTF-8"?> |
326 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
327 |
-<pkgmetadata> |
328 |
-<maintainer type="project"> |
329 |
- <email>base-system@g.o</email> |
330 |
- <name>Gentoo Base System</name> |
331 |
-</maintainer> |
332 |
-</pkgmetadata> |