1 |
commit: 1fe6b8b959464c36e1251490c21f82c05ba2e76a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 3 01:16:02 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 3 01:31:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe6b8b9 |
7 |
|
8 |
sys-apps/kbd: add 2.5.0 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/732868 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
sys-apps/kbd/Manifest | 1 + |
14 |
sys-apps/kbd/{kbd-9999.ebuild => kbd-2.5.0.ebuild} | 44 +++++++++++++++------- |
15 |
sys-apps/kbd/kbd-9999.ebuild | 44 +++++++++++++++------- |
16 |
3 files changed, 61 insertions(+), 28 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest |
19 |
index 3db59f47a2c2..01c0afbdec91 100644 |
20 |
--- a/sys-apps/kbd/Manifest |
21 |
+++ b/sys-apps/kbd/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb |
24 |
+DIST kbd-2.5.0.tar.xz 1490112 BLAKE2B c123982d5c80fa3996f6328d7151a9dcc8c969e7beeb65e83204857b044355a3531dd1efe5634d844bc43f8d5715ec63e41120679a3d34888766ef7bf6014f2b SHA512 740c4c7b8a2729f5d0539399f691d4201dab97c6eec554b82cc8c80935e956072e9735a739f8f4febc9849c1e8d9d195318b1d0d4e10dce4d34b5fb6d84111d7 |
25 |
|
26 |
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-2.5.0.ebuild |
27 |
similarity index 54% |
28 |
copy from sys-apps/kbd/kbd-9999.ebuild |
29 |
copy to sys-apps/kbd/kbd-2.5.0.ebuild |
30 |
index b430d89f0657..d0f3a2573fa7 100644 |
31 |
--- a/sys-apps/kbd/kbd-9999.ebuild |
32 |
+++ b/sys-apps/kbd/kbd-2.5.0.ebuild |
33 |
@@ -1,17 +1,16 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
+# Copyright 1999-2022 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
EAPI=7 |
39 |
|
40 |
-if [[ ${PV} == "9999" ]] ; then |
41 |
+if [[ ${PV} == 9999 ]] ; then |
42 |
inherit autotools git-r3 |
43 |
- #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" |
44 |
- EGIT_REPO_URI="https://github.com/legionus/kbd.git" |
45 |
+ EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" |
46 |
EGIT_BRANCH="master" |
47 |
else |
48 |
if [[ $(ver_cut 3) -lt 90 ]] ; then |
49 |
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" |
50 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
51 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
52 |
else |
53 |
inherit autotools |
54 |
SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
55 |
@@ -19,14 +18,17 @@ else |
56 |
fi |
57 |
|
58 |
DESCRIPTION="Keyboard and console utilities" |
59 |
-HOMEPAGE="http://kbd-project.org/" |
60 |
+HOMEPAGE="https://kbd-project.org/" |
61 |
|
62 |
LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
IUSE="nls pam test" |
65 |
-#RESTRICT="!test? ( test )" |
66 |
-# Upstream has strange assumptions how to run tests (see bug #732868) |
67 |
-RESTRICT="test" |
68 |
+RESTRICT="!test? ( test )" |
69 |
+ |
70 |
+# Testsuite's Makefile.am calls missing(!) |
71 |
+# ... but this seems to be consistent with the autoconf docs? |
72 |
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html |
73 |
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" |
74 |
|
75 |
RDEPEND=" |
76 |
app-arch/gzip |
77 |
@@ -42,23 +44,25 @@ BDEPEND=" |
78 |
" |
79 |
|
80 |
src_unpack() { |
81 |
- if [[ ${PV} == "9999" ]] ; then |
82 |
+ if [[ ${PV} == 9999 ]] ; then |
83 |
git-r3_src_unpack |
84 |
else |
85 |
default |
86 |
fi |
87 |
+} |
88 |
+ |
89 |
+src_prepare() { |
90 |
+ default |
91 |
|
92 |
# Rename conflicting keymaps to have unique names, bug #293228 |
93 |
+ # See also https://github.com/legionus/kbd/issues/76. |
94 |
cd "${S}"/data/keymaps/i386 || die |
95 |
mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die |
96 |
mv olpc/es.map olpc/es-olpc.map || die |
97 |
mv olpc/pt.map olpc/pt-olpc.map || die |
98 |
mv qwerty/cz.map qwerty/cz-qwerty.map || die |
99 |
-} |
100 |
|
101 |
-src_prepare() { |
102 |
- default |
103 |
- if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then |
104 |
+ if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then |
105 |
eautoreconf |
106 |
fi |
107 |
} |
108 |
@@ -67,15 +71,27 @@ src_configure() { |
109 |
local myeconfargs=( |
110 |
# USE="test" installs .a files |
111 |
--disable-static |
112 |
+ --disable-werror |
113 |
$(use_enable nls) |
114 |
$(use_enable pam vlock) |
115 |
$(use_enable test tests) |
116 |
) |
117 |
+ |
118 |
econf "${myeconfargs[@]}" |
119 |
} |
120 |
|
121 |
+src_test() { |
122 |
+ # Cheesy hack for now for https://github.com/legionus/kbd/issues/76 |
123 |
+ mv "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map "${S}"/data/keymaps/i386/qwerty/cz.map || die |
124 |
+ |
125 |
+ default |
126 |
+ |
127 |
+ mv "${S}"/data/keymaps/i386/qwerty/cz.map "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map || die |
128 |
+} |
129 |
+ |
130 |
src_install() { |
131 |
default |
132 |
+ |
133 |
docinto html |
134 |
dodoc docs/doc/*.html |
135 |
|
136 |
|
137 |
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild |
138 |
index b430d89f0657..d0f3a2573fa7 100644 |
139 |
--- a/sys-apps/kbd/kbd-9999.ebuild |
140 |
+++ b/sys-apps/kbd/kbd-9999.ebuild |
141 |
@@ -1,17 +1,16 @@ |
142 |
-# Copyright 1999-2021 Gentoo Authors |
143 |
+# Copyright 1999-2022 Gentoo Authors |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
|
146 |
EAPI=7 |
147 |
|
148 |
-if [[ ${PV} == "9999" ]] ; then |
149 |
+if [[ ${PV} == 9999 ]] ; then |
150 |
inherit autotools git-r3 |
151 |
- #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" |
152 |
- EGIT_REPO_URI="https://github.com/legionus/kbd.git" |
153 |
+ EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" |
154 |
EGIT_BRANCH="master" |
155 |
else |
156 |
if [[ $(ver_cut 3) -lt 90 ]] ; then |
157 |
SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" |
158 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
159 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
160 |
else |
161 |
inherit autotools |
162 |
SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
163 |
@@ -19,14 +18,17 @@ else |
164 |
fi |
165 |
|
166 |
DESCRIPTION="Keyboard and console utilities" |
167 |
-HOMEPAGE="http://kbd-project.org/" |
168 |
+HOMEPAGE="https://kbd-project.org/" |
169 |
|
170 |
LICENSE="GPL-2" |
171 |
SLOT="0" |
172 |
IUSE="nls pam test" |
173 |
-#RESTRICT="!test? ( test )" |
174 |
-# Upstream has strange assumptions how to run tests (see bug #732868) |
175 |
-RESTRICT="test" |
176 |
+RESTRICT="!test? ( test )" |
177 |
+ |
178 |
+# Testsuite's Makefile.am calls missing(!) |
179 |
+# ... but this seems to be consistent with the autoconf docs? |
180 |
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html |
181 |
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" |
182 |
|
183 |
RDEPEND=" |
184 |
app-arch/gzip |
185 |
@@ -42,23 +44,25 @@ BDEPEND=" |
186 |
" |
187 |
|
188 |
src_unpack() { |
189 |
- if [[ ${PV} == "9999" ]] ; then |
190 |
+ if [[ ${PV} == 9999 ]] ; then |
191 |
git-r3_src_unpack |
192 |
else |
193 |
default |
194 |
fi |
195 |
+} |
196 |
+ |
197 |
+src_prepare() { |
198 |
+ default |
199 |
|
200 |
# Rename conflicting keymaps to have unique names, bug #293228 |
201 |
+ # See also https://github.com/legionus/kbd/issues/76. |
202 |
cd "${S}"/data/keymaps/i386 || die |
203 |
mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die |
204 |
mv olpc/es.map olpc/es-olpc.map || die |
205 |
mv olpc/pt.map olpc/pt-olpc.map || die |
206 |
mv qwerty/cz.map qwerty/cz-qwerty.map || die |
207 |
-} |
208 |
|
209 |
-src_prepare() { |
210 |
- default |
211 |
- if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then |
212 |
+ if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then |
213 |
eautoreconf |
214 |
fi |
215 |
} |
216 |
@@ -67,15 +71,27 @@ src_configure() { |
217 |
local myeconfargs=( |
218 |
# USE="test" installs .a files |
219 |
--disable-static |
220 |
+ --disable-werror |
221 |
$(use_enable nls) |
222 |
$(use_enable pam vlock) |
223 |
$(use_enable test tests) |
224 |
) |
225 |
+ |
226 |
econf "${myeconfargs[@]}" |
227 |
} |
228 |
|
229 |
+src_test() { |
230 |
+ # Cheesy hack for now for https://github.com/legionus/kbd/issues/76 |
231 |
+ mv "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map "${S}"/data/keymaps/i386/qwerty/cz.map || die |
232 |
+ |
233 |
+ default |
234 |
+ |
235 |
+ mv "${S}"/data/keymaps/i386/qwerty/cz.map "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map || die |
236 |
+} |
237 |
+ |
238 |
src_install() { |
239 |
default |
240 |
+ |
241 |
docinto html |
242 |
dodoc docs/doc/*.html |