From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1107969-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C8832138334
for <garchives@archives.gentoo.org>; Wed, 28 Aug 2019 16:12:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 98227E084E;
Wed, 28 Aug 2019 16:12:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 46CB9E0849
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Aug 2019 16:12:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C511234A55C
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Aug 2019 16:12:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DEFE771
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Aug 2019 16:12:26 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1567008728.57c5a4151f5bcd6c4f3924464e33ec0bc0b57e07.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/lirc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/lirc/lirc-0.10.1-r1.ebuild
X-VCS-Directories: app-misc/lirc/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 57c5a4151f5bcd6c4f3924464e33ec0bc0b57e07
X-VCS-Branch: master
Date: Wed, 28 Aug 2019 16:12:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fc87e6e6-69a9-49a3-a6e9-840d266f4fdf
X-Archives-Hash: 951a3869aff68388472534b2de7f6625
commit: 57c5a4151f5bcd6c4f3924464e33ec0bc0b57e07
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 16:12:08 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 16:12:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c5a415
app-misc/lirc: [QA] Remove unnecessary slash strip
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-misc/lirc/lirc-0.10.1-r1.ebuild | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
index d054d313239..6a926167769 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -94,7 +94,7 @@ src_install() {
if use !gtk ; then
# lirc-setup requires gtk
- rm "${ED%/}"/usr/bin/lirc-setup || die
+ rm "${ED}"/usr/bin/lirc-setup || die
fi
newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
@@ -109,37 +109,37 @@ src_install() {
newconfd "${FILESDIR}"/irexec-confd irexec
keepdir /etc/lirc
- if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
- newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+ if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+ newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
fi
find "${ED}" -name '*.la' -delete || die
# Avoid QA notice
- rm -d "${ED%/}"/var/run/lirc || die
- rm -d "${ED%/}"/var/run || die
+ rm -d "${ED}"/var/run/lirc || die
+ rm -d "${ED}"/var/run || die
}
pkg_preinst() {
- local dir="${EROOT%/}/etc/modprobe.d"
+ local dir="${EROOT}/etc/modprobe.d"
if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
elog "Renaming ${dir}/lirc to lirc.conf"
mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
fi
# copy the first file that can be found
- if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
- elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
- cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+ if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+ cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+ cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
- cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
+ cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
fi
# stop portage from touching the config file
- if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
- rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+ if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+ rm -f "${ED}"/etc/lirc/lircd.conf || die
fi
}
@@ -148,13 +148,13 @@ pkg_postinst() {
# without portage knowing about it
# so it will not delete it on unmerge or ever touch it again
if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+ cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT%/}"/etc/lircd.conf || die
+ rm -f "${EROOT}"/etc/lircd.conf || die
fi
fi
einfo "The new default location for lircd.conf is inside of"
- einfo "${EROOT%/}/etc/lirc/ directory"
+ einfo "${EROOT}/etc/lirc/ directory"
}