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 02E85138334 for ; Sun, 15 Dec 2019 13:00:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50B5EE086C; Sun, 15 Dec 2019 13:00:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3A835E086C for ; Sun, 15 Dec 2019 13:00:26 +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 0B99434D79C for ; Sun, 15 Dec 2019 13:00:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89BDF7FE for ; Sun, 15 Dec 2019 13:00:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1576414804.186273c339c1fdbbc5d3621d8be036b31fef40e2.mgorny@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-r1.ebuild app-portage/eix/eix-0.33.9.ebuild X-VCS-Directories: app-portage/eix/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 186273c339c1fdbbc5d3621d8be036b31fef40e2 X-VCS-Branch: master Date: Sun, 15 Dec 2019 13:00:10 +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: a6b54abc-a362-4b5c-bf58-617bdfad6f3f X-Archives-Hash: 15f32589c4f33e0c142e2367c4de2141 commit: 186273c339c1fdbbc5d3621d8be036b31fef40e2 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 15 12:54:34 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 15 13:00:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=186273c3 app-portage/eix: Fix sourced file paths Fix sourced file paths to use EPREFIX rather than EROOT. ROOT is meant to be only temporary, and used only in pkg_*inst/*rm. The revbump also covers propagating earlier fix to missing slash in the ebuild. Closes: https://bugs.gentoo.org/702814 Signed-off-by: Michał Górny gentoo.org> app-portage/eix/{eix-0.33.9.ebuild => eix-0.33.9-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-portage/eix/eix-0.33.9.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild similarity index 90% rename from app-portage/eix/eix-0.33.9.ebuild rename to app-portage/eix/eix-0.33.9-r1.ebuild index 2c0ec5f0a0b..79b4f2b3dc8 100644 --- a/app-portage/eix/eix-0.33.9.ebuild +++ b/app-portage/eix/eix-0.33.9-r1.ebuild @@ -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 \"${EPREFIX}/usr/share/push/push.sh\":" \ + -e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/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 \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \ -i src/Makefile.am || die eautoreconf }