From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 4A160138334 for ; Fri, 13 Dec 2019 07:44:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81745E088C; Fri, 13 Dec 2019 07:44:49 +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 28CF7E088C for ; Fri, 13 Dec 2019 07:44:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2E56234D97C for ; Fri, 13 Dec 2019 07:44:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB11A8B1 for ; Fri, 13 Dec 2019 07:44:46 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1576223086.6f827ddcd47d9c69f65a90d5db5c5c86774b733f.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/eix/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/eix/eix-0.33.9.ebuild X-VCS-Directories: app-portage/eix/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 6f827ddcd47d9c69f65a90d5db5c5c86774b733f X-VCS-Branch: master Date: Fri, 13 Dec 2019 07:44:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 78b3ffc0-de69-4fd8-b82e-dec17b7a908c X-Archives-Hash: 6e1080ec12d9428a1ca0d7f755c05125 commit: 6f827ddcd47d9c69f65a90d5db5c5c86774b733f Author: Mikle Kolyada gentoo org> AuthorDate: Fri Dec 13 07:44:23 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Fri Dec 13 07:44:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f827ddc app-portage/eix: make ci green Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> app-portage/eix/eix-0.33.9.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app-portage/eix/eix-0.33.9.ebuild b/app-portage/eix/eix-0.33.9.ebuild index 832dcfd808b..2c0ec5f0a0b 100644 --- a/app-portage/eix/eix-0.33.9.ebuild +++ b/app-portage/eix/eix-0.33.9.ebuild @@ -25,7 +25,7 @@ DEPEND="${BOTHDEPEND} pkg_setup() { # remove stale cache file to prevent collisions - local old_cache=${EROOT%/}/var/cache/${PN} + local old_cache=${EROOT}/var/cache/${PN} if [[ -f ${old_cache} ]]; then rm "${old_cache}" || die fi @@ -35,10 +35,10 @@ src_prepare() { default sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die - sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \ - -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \ + sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}/usr/share/push/push.sh\":" \ + -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}/usr/share/quoter/quoter_pipe.sh\":" \ -i src/eix-functions.sh.in || die - sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \ + sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}/usr/share/eix/eix-functions\\\\\":" \ -i src/Makefile.am || die eautoreconf } @@ -87,14 +87,14 @@ src_install() { dobashcomp bash/eix dotmpfiles tmpfiles.d/eix.conf - rm -r "${ED%/}"/usr/bin/eix-functions.sh || die + rm -r "${ED}"/usr/bin/eix-functions.sh || die } pkg_postinst() { tmpfiles_process eix.conf - local obs=${EROOT%/}/var/cache/eix.previous + local obs=${EROOT}/var/cache/eix.previous if [[ -f ${obs} ]]; then ewarn "Found obsolete ${obs}, please remove it" fi @@ -102,6 +102,6 @@ pkg_postinst() { pkg_postrm() { if [[ ! -n ${REPLACED_BY_VERSION} ]]; then - rm -rf "${EROOT%/}/var/cache/${PN}" || die + rm -rf "${EROOT}/var/cache/${PN}" || die fi }