Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/, app-misc/g15daemon/files/
Date: Wed, 09 Sep 2020 12:29:38
Message-Id: 1599654561.32f13dc9e4d6a8643ef98cc5f4fb6b45532dd7fd.polynomial-c@gentoo
1 commit: 32f13dc9e4d6a8643ef98cc5f4fb6b45532dd7fd
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 9 11:12:50 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 9 12:29:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f13dc9
7
8 app-misc/g15daemon: Revbumps / ebuild overhauls
9
10 - EAPI-7 bump
11 - Added workaround for successful build with gcc-10 (#706712)
12 - Fixed default config (#481454)
13 - Fixed docdir
14 - Attempt to fix direct call of CC (#729294)
15 - Removed bashisms from configure
16
17 Bug: https://bugs.gentoo.org/729294
18 Bug: https://bugs.gentoo.org/741382
19 Closes: https://bugs.gentoo.org/481454
20 Closes: https://bugs.gentoo.org/706712
21 Package-Manager: Portage-3.0.6, Repoman-3.0.1
22 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
23
24 app-misc/g15daemon/files/g15daemon-1.2.7.confd | 2 +-
25 .../files/g15daemon-1.9.5.3-avoid_bashisms.patch | 20 ++++++++
26 .../g15daemon/files/g15daemon-1.9.5.3-docdir.patch | 11 +++++
27 .../g15daemon-1.9.5.3-forgotten-open-mode.patch | 4 +-
28 .../files/g15daemon-1.9.5.3-g510-keys.patch | 5 +-
29 .../files/g15daemon-1.9.5.3-overflow-fix.patch | 4 +-
30 ...5.3-r13.ebuild => g15daemon-1.9.5.3-r14.ebuild} | 48 ++++++++++---------
31 app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 47 ++++++++++---------
32 app-misc/g15daemon/g15daemon-9999.ebuild | 54 +++++++++++-----------
33 9 files changed, 119 insertions(+), 76 deletions(-)
34
35 diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
36 index 08ea97f4976..5ce5392b93b 100644
37 --- a/app-misc/g15daemon/files/g15daemon-1.2.7.confd
38 +++ b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
39 @@ -2,7 +2,7 @@
40
41 # Key to switch the client-screens. Default is the MR key,
42 # Set to "yes" to use L1 key instead (black round key below the LCD, above the multimedia keys).
43 -CLIENT_SWITCH_L1="no"
44 +CLIENT_SWITCH_L1="yes"
45
46 # Set to "yes" to switch off the lcd backlight when stopping g15daemon.
47 BACKLIGHT_OFF="no"
48
49 diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch
50 new file mode 100644
51 index 00000000000..194d68eefee
52 --- /dev/null
53 +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch
54 @@ -0,0 +1,20 @@
55 +--- g15daemon-1.9.5.3/configure.in
56 ++++ g15daemon-1.9.5.3/configure.in
57 +@@ -53,7 +53,7 @@
58 + AC_ARG_ENABLE([--disable-uinput],[ --disable-uinput do not build linux uinput plugin (default: autodetect)])
59 +
60 + if test "x$enable_uinput" != "xno"; then
61 +- if test "x$have_linux_uinput_h" == "xyes"; then
62 ++ if test "x$have_linux_uinput_h" = "xyes"; then
63 + #if HAVE_LINUX_UINPUT_H
64 + dnl check for uinput.h version 2.4 or 2.6 ?
65 + AC_CHECK_MEMBER([struct uinput_user_dev.id],
66 +@@ -110,7 +110,7 @@
67 + AM_CONDITIONAL(UINPUT_INTERFACE_PLUGIN, [test x$uinput = xtrue])
68 +
69 + dnl Some versions of libusb do not honour timeout and block. Suns' version is one of them.
70 +-if test "x$libusb_blocks" == "xtrue"; then
71 ++if test "x$libusb_blocks" = "xtrue"; then
72 + AC_DEFINE([LIBUSB_BLOCKS], [1],[Define if libusb implementation blocks on read or write])
73 + fi
74 +
75
76 diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch
77 new file mode 100644
78 index 00000000000..9c76e4cbc6a
79 --- /dev/null
80 +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch
81 @@ -0,0 +1,11 @@
82 +--- g15daemon-1.9.5.3/Makefile.am
83 ++++ g15daemon-1.9.5.3/Makefile.am
84 +@@ -5,7 +5,7 @@
85 +
86 + EXTRA_DIST = debian contrib Documentation lang-bindings patches rpm README.usage FAQ LICENSE images README.Linux README.FreeBSD README.Solaris
87 +
88 +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
89 ++docdir = @docdir@
90 + doc_DATA = FAQ README.usage README ChangeLog TODO AUTHORS NEWS LICENSE README.Linux README.FreeBSD README.Solaris
91 +
92 + man1_MANS = $(top_srcdir)/Documentation/g15daemon.1
93
94 diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
95 index b475f1d58d6..d4a5381992e 100644
96 --- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
97 +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
98 @@ -1,5 +1,5 @@
99 ---- ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2008-01-26 06:02:07.000000000 +0100
100 -+++ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2009-02-01 17:00:55.203009264 +0100
101 +--- g15daemon-1.9.5.3/g15daemon/utility_funcs.c
102 ++++ g15daemon-1.9.5.3/g15daemon/utility_funcs.c
103 @@ -356,7 +356,7 @@
104 config_items_t * item=NULL;
105 char line[1024];
106
107 diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
108 index e0083676679..a53001f1932 100644
109 --- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
110 +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
111 @@ -1,8 +1,7 @@
112 From https://sourceforge.net/tracker/?func=detail&aid=3152167&group_id=167869&atid=844658
113
114 -diff -aNru trunk/g15daemon-wip/plugins/g15_plugin_uinput.c mod/g15daemon-wip/plugins/g15_plugin_uinput.c
115 ---- trunk/g15daemon-wip/plugins/g15_plugin_uinput.c 2011-06-26 06:50:50.000000000 +0000
116 -+++ mod/g15daemon-wip/plugins/g15_plugin_uinput.c 2011-06-26 06:51:42.000000000 +0000
117 +--- g15daemon-wip/plugins/g15_plugin_uinput.c
118 ++++ g15daemon-wip/plugins/g15_plugin_uinput.c
119 @@ -164,146 +164,195 @@
120
121 static void g15_process_keys(g15daemon_t *masterlist, unsigned int currentkeys, unsigned int lastkeys)
122
123 diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
124 index 71cbf914d83..07bb68601d7 100644
125 --- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
126 +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch
127 @@ -1,5 +1,5 @@
128 ---- ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2008-01-25 05:45:05.000000000 +0100
129 -+++ ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2011-02-14 22:51:55.203009264 +0100
130 +--- g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c
131 ++++ g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c
132 @@ -217,7 +217,7 @@
133 if(poll(pfd,1,100)>0){
134 if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) {
135
136 diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild
137 similarity index 78%
138 rename from app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
139 rename to app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild
140 index 9351249d7a8..407950bcbb2 100644
141 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
142 +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild
143 @@ -1,11 +1,11 @@
144 # Copyright 1999-2020 Gentoo Authors
145 # Distributed under the terms of the GNU General Public License v2
146
147 -EAPI=5
148 +EAPI=7
149
150 GENTOO_DEPEND_ON_PERL="no"
151
152 -inherit eutils linux-info perl-module base
153 +inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev
154
155 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
156 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
157 @@ -29,14 +29,17 @@ RDEPEND="${DEPEND}"
158 PATCHES=(
159 "${FILESDIR}/${P}-forgotten-open-mode.patch"
160 "${FILESDIR}/${P}-overflow-fix.patch"
161 + "${FILESDIR}/${P}-docdir.patch"
162 + "${FILESDIR}/${P}-avoid_bashisms.patch"
163 )
164 +
165 uinput_check() {
166 ebegin "Checking for uinput support"
167 local rc=1
168 linux_config_exists && linux_chkconfig_present INPUT_UINPUT
169 rc=$?
170
171 - if [[ $rc -ne 0 ]] ; then
172 + if [[ ${rc} -ne 0 ]] ; then
173 eerror "To use g15daemon, you need to compile your kernel with uinput support."
174 eerror "Please enable uinput support in your kernel config, found at:"
175 eerror
176 @@ -48,36 +51,40 @@ uinput_check() {
177 }
178
179 pkg_setup() {
180 + export CC="$(tc-getCC)" #729294
181 +
182 linux-info_pkg_setup
183 uinput_check
184 }
185
186 src_unpack() {
187 unpack ${A}
188 - if use perl; then
189 + if use perl ; then
190 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
191 fi
192 }
193
194 src_prepare() {
195 - if use perl; then
196 + if use perl ; then
197 perl-module_src_prepare
198 sed -i \
199 -e '1i#!/usr/bin/perl' \
200 - "${S}"/contrib/testbindings.pl
201 + "${S}"/contrib/testbindings.pl || die
202 else
203 # perl-module_src_prepare always calls base_src_prepare
204 - base_src_prepare
205 + default
206 fi
207 + mv configure.{in,ac} || die
208 + eautoreconf
209 }
210
211 src_configure() {
212 - econf \
213 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
214 - $(use_enable static-libs static)
215 + append-cflags -fcommon #706712
216 +
217 + econf $(use_enable static-libs static)
218
219 - if use perl; then
220 - cd "${WORKDIR}/G15Daemon-0.2"
221 + if use perl ; then
222 + cd "${WORKDIR}/G15Daemon-0.2" || die
223 perl-module_src_configure
224 fi
225 }
226 @@ -85,8 +92,8 @@ src_configure() {
227 src_compile() {
228 default
229
230 - if use perl; then
231 - cd "${WORKDIR}/G15Daemon-0.2"
232 + if use perl ; then
233 + cd "${WORKDIR}/G15Daemon-0.2" || die
234 perl-module_src_compile
235 fi
236 }
237 @@ -94,23 +101,22 @@ src_compile() {
238 src_install() {
239 default
240
241 - find "${ED}" -name '*.la' -exec rm -f {} +
242 + find "${ED}" -type f -name '*.la' -delete || die
243
244 # remove odd docs installed my make
245 - rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
246 + rm "${ED}"/usr/share/doc/${PF}/README.usage || die
247
248 insinto /usr/share/${PN}/contrib
249 doins contrib/xmodmaprc
250 doins contrib/xmodmap.sh
251 - if use perl; then
252 + if use perl ; then
253 doins contrib/testbindings.pl
254 fi
255
256 newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
257 newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
258 dobin "${FILESDIR}/g15daemon-hotplug"
259 - insinto /lib/udev/rules.d
260 - doins "${FILESDIR}/99-g15daemon.rules"
261 + udev_dorules "${FILESDIR}/99-g15daemon.rules"
262
263 insinto /etc
264 doins "${FILESDIR}"/g15daemon.conf
265 @@ -119,9 +125,9 @@ src_install() {
266 exeinto /usr/lib/pm-utils/sleep.d
267 doexe "${FILESDIR}"/20g15daemon
268
269 - if use perl; then
270 + if use perl ; then
271 ebegin "Installing Perl Bindings (G15Daemon.pm)"
272 - cd "${WORKDIR}/G15Daemon-0.2"
273 + cd "${WORKDIR}/G15Daemon-0.2" || die
274 docinto perl
275 perl-module_src_install
276 fi
277
278 diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
279 index df58caed05f..7955e66c251 100644
280 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
281 +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
282 @@ -1,11 +1,11 @@
283 # Copyright 1999-2020 Gentoo Authors
284 # Distributed under the terms of the GNU General Public License v2
285
286 -EAPI=5
287 +EAPI=7
288
289 GENTOO_DEPEND_ON_PERL="no"
290
291 -inherit eutils linux-info perl-module base
292 +inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev
293
294 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
295 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
296 @@ -30,6 +30,8 @@ PATCHES=(
297 "${FILESDIR}/${P}-forgotten-open-mode.patch"
298 "${FILESDIR}/${P}-overflow-fix.patch"
299 "${FILESDIR}/${P}-g510-keys.patch"
300 + "${FILESDIR}/${P}-docdir.patch"
301 + "${FILESDIR}/${P}-avoid_bashisms.patch"
302 )
303
304 uinput_check() {
305 @@ -38,7 +40,7 @@ uinput_check() {
306 linux_config_exists && linux_chkconfig_present INPUT_UINPUT
307 rc=$?
308
309 - if [[ $rc -ne 0 ]] ; then
310 + if [[ ${rc} -ne 0 ]] ; then
311 eerror "To use g15daemon, you need to compile your kernel with uinput support."
312 eerror "Please enable uinput support in your kernel config, found at:"
313 eerror
314 @@ -50,36 +52,40 @@ uinput_check() {
315 }
316
317 pkg_setup() {
318 + export CC="$(tc-getCC)" #729294
319 +
320 linux-info_pkg_setup
321 uinput_check
322 }
323
324 src_unpack() {
325 unpack ${A}
326 - if use perl; then
327 + if use perl ; then
328 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
329 fi
330 }
331
332 src_prepare() {
333 - if use perl; then
334 + if use perl ; then
335 perl-module_src_prepare
336 sed -i \
337 -e '1i#!/usr/bin/perl' \
338 - "${S}"/contrib/testbindings.pl
339 + "${S}"/contrib/testbindings.pl || die
340 else
341 # perl-module_src_prepare always calls base_src_prepare
342 - base_src_prepare
343 + default
344 fi
345 + mv configure.{in,ac} || die
346 + eautoreconf
347 }
348
349 src_configure() {
350 - econf \
351 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
352 - $(use_enable static-libs static)
353 + append-cflags -fcommon #706712
354 +
355 + econf $(use_enable static-libs static)
356
357 - if use perl; then
358 - cd "${WORKDIR}/G15Daemon-0.2"
359 + if use perl ; then
360 + cd "${WORKDIR}/G15Daemon-0.2" || die
361 perl-module_src_configure
362 fi
363 }
364 @@ -87,8 +93,8 @@ src_configure() {
365 src_compile() {
366 default
367
368 - if use perl; then
369 - cd "${WORKDIR}/G15Daemon-0.2"
370 + if use perl ; then
371 + cd "${WORKDIR}/G15Daemon-0.2" || die
372 perl-module_src_compile
373 fi
374 }
375 @@ -96,23 +102,22 @@ src_compile() {
376 src_install() {
377 default
378
379 - find "${ED}" -name '*.la' -exec rm -f {} +
380 + find "${ED}" -type f -name '*.la' -delete || die
381
382 # remove odd docs installed my make
383 - rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
384 + rm "${ED}"/usr/share/doc/${PF}/README.usage || die
385
386 insinto /usr/share/${PN}/contrib
387 doins contrib/xmodmaprc
388 doins contrib/xmodmap.sh
389 - if use perl; then
390 + if use perl ; then
391 doins contrib/testbindings.pl
392 fi
393
394 newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
395 newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
396 dobin "${FILESDIR}/g15daemon-hotplug"
397 - insinto /lib/udev/rules.d
398 - doins "${FILESDIR}/99-g15daemon.rules"
399 + udev_dorules "${FILESDIR}/99-g15daemon.rules"
400
401 insinto /etc
402 doins "${FILESDIR}"/g15daemon.conf
403 @@ -121,9 +126,9 @@ src_install() {
404 exeinto /usr/lib/pm-utils/sleep.d
405 doexe "${FILESDIR}"/20g15daemon
406
407 - if use perl; then
408 + if use perl ; then
409 ebegin "Installing Perl Bindings (G15Daemon.pm)"
410 - cd "${WORKDIR}/G15Daemon-0.2"
411 + cd "${WORKDIR}/G15Daemon-0.2" || die
412 docinto perl
413 perl-module_src_install
414 fi
415
416 diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
417 index c7300da76d0..23fb3430ee4 100644
418 --- a/app-misc/g15daemon/g15daemon-9999.ebuild
419 +++ b/app-misc/g15daemon/g15daemon-9999.ebuild
420 @@ -1,13 +1,13 @@
421 # Copyright 1999-2020 Gentoo Authors
422 # Distributed under the terms of the GNU General Public License v2
423
424 -EAPI=5
425 +EAPI=7
426
427 GENTOO_DEPEND_ON_PERL="no"
428 ESVN_PROJECT=${PN}/trunk
429 ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip"
430
431 -inherit eutils linux-info perl-module base subversion autotools
432 +inherit autotools flag-o-matic linux-info perl-module subversion toolchain-funcs udev
433
434 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
435 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
436 @@ -30,9 +30,9 @@ RDEPEND="${DEPEND}"
437
438 PATCHES=(
439 "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
440 + "${FILESDIR}/${PN}-1.9.5.3-docdir.patch"
441 + "${FILESDIR}/${PN}-1.9.5.3-avoid_bashisms.patch"
442 )
443 -# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
444 -# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
445
446 uinput_check() {
447 ebegin "Checking for uinput support"
448 @@ -40,7 +40,7 @@ uinput_check() {
449 linux_config_exists && linux_chkconfig_present INPUT_UINPUT
450 rc=$?
451
452 - if [[ $rc -ne 0 ]] ; then
453 + if [[ ${rc} -ne 0 ]] ; then
454 eerror "To use g15daemon, you need to compile your kernel with uinput support."
455 eerror "Please enable uinput support in your kernel config, found at:"
456 eerror
457 @@ -52,46 +52,49 @@ uinput_check() {
458 }
459
460 pkg_setup() {
461 + export CC="$(tc-getCC)" #729294
462 +
463 linux-info_pkg_setup
464 uinput_check
465 }
466
467 src_unpack() {
468 - if [[ ${PV} = *9999* ]]; then
469 + if [[ ${PV} = *9999* ]] ; then
470 subversion_src_unpack
471 else
472 unpack ${A}
473 fi
474 - if use perl; then
475 + if use perl ; then
476 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
477 fi
478 }
479
480 src_prepare() {
481 - if [[ ${PV} = *9999* ]]; then
482 + if [[ ${PV} = *9999* ]] ; then
483 subversion_wc_info
484 fi
485 - if use perl; then
486 + if use perl ; then
487 perl-module_src_prepare
488 sed -i \
489 -e '1i#!/usr/bin/perl' \
490 - "${S}"/contrib/testbindings.pl
491 + "${S}"/contrib/testbindings.pl || die
492 else
493 # perl-module_src_prepare always calls base_src_prepare
494 - base_src_prepare
495 + default
496 fi
497 - if [[ ${PV} = *9999* ]]; then
498 + if [[ ${PV} = *9999* ]] ; then
499 + mv configure.{in,ac} || die
500 eautoreconf
501 fi
502 }
503
504 src_configure() {
505 - econf \
506 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
507 - $(use_enable static-libs static)
508 + append-cflags -fcommon #706712
509 +
510 + econf $(use_enable static-libs static)
511
512 - if use perl; then
513 - cd "${WORKDIR}/G15Daemon-0.2"
514 + if use perl ; then
515 + cd "${WORKDIR}/G15Daemon-0.2" || die
516 perl-module_src_configure
517 fi
518 }
519 @@ -99,8 +102,8 @@ src_configure() {
520 src_compile() {
521 default
522
523 - if use perl; then
524 - cd "${WORKDIR}/G15Daemon-0.2"
525 + if use perl ; then
526 + cd "${WORKDIR}/G15Daemon-0.2" || die
527 perl-module_src_compile
528 fi
529 }
530 @@ -108,23 +111,22 @@ src_compile() {
531 src_install() {
532 default
533
534 - find "${ED}" -name '*.la' -exec rm -f {} +
535 + find "${ED}" -type f -name '*.la' -delete || die
536
537 # remove odd docs installed my make
538 - rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
539 + rm "${ED}"/usr/share/doc/${PF}/README.usage || die
540
541 insinto /usr/share/${PN}/contrib
542 doins contrib/xmodmaprc
543 doins contrib/xmodmap.sh
544 - if use perl; then
545 + if use perl ; then
546 doins contrib/testbindings.pl
547 fi
548
549 newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
550 newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
551 dobin "${FILESDIR}/g15daemon-hotplug"
552 - insinto /lib/udev/rules.d
553 - doins "${FILESDIR}/99-g15daemon.rules"
554 + udev_dorules "${FILESDIR}/99-g15daemon.rules"
555
556 insinto /etc
557 doins "${FILESDIR}"/g15daemon.conf
558 @@ -133,9 +135,9 @@ src_install() {
559 exeinto /usr/lib/pm-utils/sleep.d
560 doexe "${FILESDIR}"/20g15daemon
561
562 - if use perl; then
563 + if use perl ; then
564 ebegin "Installing Perl Bindings (G15Daemon.pm)"
565 - cd "${WORKDIR}/G15Daemon-0.2"
566 + cd "${WORKDIR}/G15Daemon-0.2" || die
567 docinto perl
568 perl-module_src_install
569 fi
Report Message
Find on MARC Find on Google Groups