1 |
commit: 57c5a4151f5bcd6c4f3924464e33ec0bc0b57e07 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 28 16:12:08 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 28 16:12:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c5a415 |
7 |
|
8 |
app-misc/lirc: [QA] Remove unnecessary slash strip |
9 |
|
10 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
app-misc/lirc/lirc-0.10.1-r1.ebuild | 34 +++++++++++++++++----------------- |
14 |
1 file changed, 17 insertions(+), 17 deletions(-) |
15 |
|
16 |
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild |
17 |
index d054d313239..6a926167769 100644 |
18 |
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild |
19 |
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild |
20 |
@@ -94,7 +94,7 @@ src_install() { |
21 |
|
22 |
if use !gtk ; then |
23 |
# lirc-setup requires gtk |
24 |
- rm "${ED%/}"/usr/bin/lirc-setup || die |
25 |
+ rm "${ED}"/usr/bin/lirc-setup || die |
26 |
fi |
27 |
|
28 |
newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd |
29 |
@@ -109,37 +109,37 @@ src_install() { |
30 |
newconfd "${FILESDIR}"/irexec-confd irexec |
31 |
|
32 |
keepdir /etc/lirc |
33 |
- if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then |
34 |
- newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example |
35 |
+ if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then |
36 |
+ newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example |
37 |
fi |
38 |
|
39 |
find "${ED}" -name '*.la' -delete || die |
40 |
|
41 |
# Avoid QA notice |
42 |
- rm -d "${ED%/}"/var/run/lirc || die |
43 |
- rm -d "${ED%/}"/var/run || die |
44 |
+ rm -d "${ED}"/var/run/lirc || die |
45 |
+ rm -d "${ED}"/var/run || die |
46 |
} |
47 |
|
48 |
pkg_preinst() { |
49 |
- local dir="${EROOT%/}/etc/modprobe.d" |
50 |
+ local dir="${EROOT}/etc/modprobe.d" |
51 |
if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then |
52 |
elog "Renaming ${dir}/lirc to lirc.conf" |
53 |
mv -f "${dir}/lirc" "${dir}/lirc.conf" || die |
54 |
fi |
55 |
|
56 |
# copy the first file that can be found |
57 |
- if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then |
58 |
- cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
59 |
- elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then |
60 |
- cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die |
61 |
+ if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then |
62 |
+ cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
63 |
+ elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then |
64 |
+ cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die |
65 |
MOVE_OLD_LIRCD_CONF=1 |
66 |
- elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then |
67 |
- cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
68 |
+ elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then |
69 |
+ cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
70 |
fi |
71 |
|
72 |
# stop portage from touching the config file |
73 |
- if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then |
74 |
- rm -f "${ED%/}"/etc/lirc/lircd.conf || die |
75 |
+ if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then |
76 |
+ rm -f "${ED}"/etc/lirc/lircd.conf || die |
77 |
fi |
78 |
} |
79 |
|
80 |
@@ -148,13 +148,13 @@ pkg_postinst() { |
81 |
# without portage knowing about it |
82 |
# so it will not delete it on unmerge or ever touch it again |
83 |
if [[ -e "${T}"/lircd.conf ]]; then |
84 |
- cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die |
85 |
+ cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die |
86 |
if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then |
87 |
elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" |
88 |
- rm -f "${EROOT%/}"/etc/lircd.conf || die |
89 |
+ rm -f "${EROOT}"/etc/lircd.conf || die |
90 |
fi |
91 |
fi |
92 |
|
93 |
einfo "The new default location for lircd.conf is inside of" |
94 |
- einfo "${EROOT%/}/etc/lirc/ directory" |
95 |
+ einfo "${EROOT}/etc/lirc/ directory" |
96 |
} |