1 |
commit: 8de6a91d7e7e61b849ffcd493b28e01a79f7fea7 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 15 00:07:07 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 15 00:07:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de6a91d |
7 |
|
8 |
sys-apps/kbd: drop 2.2.0-r2, 2.3.0-r1 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sys-apps/kbd/Manifest | 2 - |
13 |
sys-apps/kbd/files/kbd-2.2.0-cflags.patch | 33 -------- |
14 |
...bd-2.2.0-kbdfile-dont_stop_on_first_error.patch | 31 -------- |
15 |
sys-apps/kbd/kbd-2.2.0-r2.ebuild | 78 ------------------- |
16 |
sys-apps/kbd/kbd-2.3.0-r1.ebuild | 87 ---------------------- |
17 |
5 files changed, 231 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest |
20 |
index be4a70b1248..3db59f47a2c 100644 |
21 |
--- a/sys-apps/kbd/Manifest |
22 |
+++ b/sys-apps/kbd/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 |
25 |
-DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927 |
26 |
DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb |
27 |
|
28 |
diff --git a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch |
29 |
deleted file mode 100644 |
30 |
index 86c0f45074a..00000000000 |
31 |
--- a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch |
32 |
+++ /dev/null |
33 |
@@ -1,33 +0,0 @@ |
34 |
-From 3b4f3ffbc9fedff83a0618f3dd3c6aafced3e72a Mon Sep 17 00:00:00 2001 |
35 |
-From: Lars Wendler <polynomial-c@g.o> |
36 |
-Date: Wed, 31 Jul 2019 18:07:33 +0200 |
37 |
-Subject: [PATCH] configure.ac: respect user CFLAGS |
38 |
- |
39 |
-Do not override user CFLAGS. Do not unconditionally add -g to CFLAGS. |
40 |
- |
41 |
-Gentoo-bug: https://bugs.gentoo.org/691142 |
42 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
43 |
---- |
44 |
- configure.ac | 6 +++--- |
45 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
46 |
- |
47 |
-diff --git a/configure.ac b/configure.ac |
48 |
-index 6bf6401..0f5ed2f 100644 |
49 |
---- a/configure.ac |
50 |
-+++ b/configure.ac |
51 |
-@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; then |
52 |
- fi |
53 |
- |
54 |
- case "$GCC,$ac_cv_prog_cc_g" in |
55 |
-- yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;; |
56 |
-- yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;; |
57 |
-- ,yes) CFLAGS="-g" ;; |
58 |
-+ yes,yes) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; |
59 |
-+ yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; |
60 |
-+ ,yes) CFLAGS="$CFLAGS" ;; |
61 |
- esac |
62 |
- |
63 |
- CC_CHECK_CFLAGS_APPEND([\ |
64 |
--- |
65 |
-2.22.0 |
66 |
- |
67 |
|
68 |
diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch |
69 |
deleted file mode 100644 |
70 |
index 4b545f5bc2a..00000000000 |
71 |
--- a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch |
72 |
+++ /dev/null |
73 |
@@ -1,31 +0,0 @@ |
74 |
-From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001 |
75 |
-From: Alexey Gladkov <gladkov.alexey@×××××.com> |
76 |
-Date: Tue, 6 Aug 2019 13:59:34 +0200 |
77 |
-Subject: [PATCH] libkbdfile: Do not stop on the first error |
78 |
- |
79 |
-The kbdfile_find() gets a list of directories in which the filename. If |
80 |
-we could not find the filename in the first directory, you do not need |
81 |
-to return an error. |
82 |
- |
83 |
-Link: https://github.com/legionus/kbd/issues/31 |
84 |
- |
85 |
-Signed-off-by: Alexey Gladkov <gladkov.alexey@×××××.com> |
86 |
---- |
87 |
- src/libkbdfile/kbdfile.c | 4 ++-- |
88 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
89 |
- |
90 |
-diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c |
91 |
-index 804f04a..fb8e035 100644 |
92 |
---- a/src/libkbdfile/kbdfile.c |
93 |
-+++ b/src/libkbdfile/kbdfile.c |
94 |
-@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp) |
95 |
- rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp); |
96 |
- free(dir); |
97 |
- |
98 |
-- if (rc <= 0) |
99 |
-- return rc; |
100 |
-+ if (!rc) |
101 |
-+ return 0; |
102 |
- } |
103 |
- |
104 |
- return 1; |
105 |
|
106 |
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild |
107 |
deleted file mode 100644 |
108 |
index b7b82aca99e..00000000000 |
109 |
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild |
110 |
+++ /dev/null |
111 |
@@ -1,78 +0,0 @@ |
112 |
-# Copyright 1999-2020 Gentoo Authors |
113 |
-# Distributed under the terms of the GNU General Public License v2 |
114 |
- |
115 |
-EAPI=7 |
116 |
- |
117 |
-inherit autotools pam |
118 |
- |
119 |
-if [[ ${PV} == "9999" ]] ; then |
120 |
- inherit autotools git-r3 |
121 |
- #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" |
122 |
- EGIT_REPO_URI="https://github.com/legionus/kbd.git" |
123 |
- EGIT_BRANCH="master" |
124 |
-else |
125 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" |
126 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
127 |
-fi |
128 |
- |
129 |
-DESCRIPTION="Keyboard and console utilities" |
130 |
-HOMEPAGE="http://kbd-project.org/" |
131 |
- |
132 |
-LICENSE="GPL-2" |
133 |
-SLOT="0" |
134 |
-IUSE="nls pam test" |
135 |
-RESTRICT="!test? ( test )" |
136 |
- |
137 |
-RDEPEND=" |
138 |
- app-arch/gzip |
139 |
- pam? ( |
140 |
- !app-misc/vlock |
141 |
- sys-libs/pam |
142 |
- ) |
143 |
-" |
144 |
-DEPEND="${RDEPEND}" |
145 |
-BDEPEND=" |
146 |
- virtual/pkgconfig |
147 |
- test? ( dev-libs/check ) |
148 |
-" |
149 |
- |
150 |
-PATCHES=( |
151 |
- "${FILESDIR}/${P}-cflags.patch" #691142 |
152 |
- "${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch" |
153 |
-) |
154 |
- |
155 |
-src_unpack() { |
156 |
- if [[ ${PV} == "9999" ]] ; then |
157 |
- git-r3_src_unpack |
158 |
- else |
159 |
- default |
160 |
- fi |
161 |
- |
162 |
- # Rename conflicting keymaps to have unique names, bug #293228 |
163 |
- cd "${S}"/data/keymaps/i386 || die |
164 |
- mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die |
165 |
- mv olpc/es.map olpc/es-olpc.map || die |
166 |
- mv olpc/pt.map olpc/pt-olpc.map || die |
167 |
- mv qwerty/cz.map qwerty/cz-qwerty.map || die |
168 |
-} |
169 |
- |
170 |
-src_prepare() { |
171 |
- default |
172 |
- eautoreconf |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- local myeconfargs=( |
177 |
- $(use_enable nls) |
178 |
- $(use_enable pam vlock) |
179 |
- $(use_enable test tests) |
180 |
- ) |
181 |
- econf "${myeconfargs[@]}" |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- default |
186 |
- docinto html |
187 |
- dodoc docs/doc/*.html |
188 |
- use pam && pamd_mimic_system vlock auth account |
189 |
-} |
190 |
|
191 |
diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild |
192 |
deleted file mode 100644 |
193 |
index 698828be221..00000000000 |
194 |
--- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild |
195 |
+++ /dev/null |
196 |
@@ -1,87 +0,0 @@ |
197 |
-# Copyright 1999-2020 Gentoo Authors |
198 |
-# Distributed under the terms of the GNU General Public License v2 |
199 |
- |
200 |
-EAPI=7 |
201 |
- |
202 |
-inherit pam |
203 |
- |
204 |
-if [[ ${PV} == "9999" ]] ; then |
205 |
- inherit autotools git-r3 |
206 |
- #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" |
207 |
- EGIT_REPO_URI="https://github.com/legionus/kbd.git" |
208 |
- EGIT_BRANCH="master" |
209 |
-else |
210 |
- if [[ $(ver_cut 3) -lt 90 ]] ; then |
211 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" |
212 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
213 |
- else |
214 |
- inherit autotools |
215 |
- SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
216 |
- fi |
217 |
-fi |
218 |
- |
219 |
-DESCRIPTION="Keyboard and console utilities" |
220 |
-HOMEPAGE="http://kbd-project.org/" |
221 |
- |
222 |
-LICENSE="GPL-2" |
223 |
-SLOT="0" |
224 |
-IUSE="nls pam test" |
225 |
-#RESTRICT="!test? ( test )" |
226 |
-# Upstream has strange assumptions how to run tests (see bug #732868) |
227 |
-RESTRICT="test" |
228 |
- |
229 |
-RDEPEND=" |
230 |
- app-arch/gzip |
231 |
- pam? ( |
232 |
- !app-misc/vlock |
233 |
- sys-libs/pam |
234 |
- ) |
235 |
-" |
236 |
-DEPEND="${RDEPEND}" |
237 |
-BDEPEND=" |
238 |
- virtual/pkgconfig |
239 |
- test? ( dev-libs/check ) |
240 |
-" |
241 |
- |
242 |
-src_unpack() { |
243 |
- if [[ ${PV} == "9999" ]] ; then |
244 |
- git-r3_src_unpack |
245 |
- else |
246 |
- default |
247 |
- fi |
248 |
- |
249 |
- # Rename conflicting keymaps to have unique names, bug #293228 |
250 |
- cd "${S}"/data/keymaps/i386 || die |
251 |
- mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die |
252 |
- mv olpc/es.map olpc/es-olpc.map || die |
253 |
- mv olpc/pt.map olpc/pt-olpc.map || die |
254 |
- mv qwerty/cz.map qwerty/cz-qwerty.map || die |
255 |
-} |
256 |
- |
257 |
-src_prepare() { |
258 |
- default |
259 |
- if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then |
260 |
- eautoreconf |
261 |
- fi |
262 |
-} |
263 |
- |
264 |
-src_configure() { |
265 |
- local myeconfargs=( |
266 |
- # USE="test" installs .a files |
267 |
- --disable-static |
268 |
- $(use_enable nls) |
269 |
- $(use_enable pam vlock) |
270 |
- $(use_enable test tests) |
271 |
- ) |
272 |
- econf "${myeconfargs[@]}" |
273 |
-} |
274 |
- |
275 |
-src_install() { |
276 |
- default |
277 |
- docinto html |
278 |
- dodoc docs/doc/*.html |
279 |
- use pam && pamd_mimic_system vlock auth account |
280 |
- |
281 |
- # USE="test" installs .la files |
282 |
- find "${ED}" -type f -name "*.la" -delete || die |
283 |
-} |