commit:     186273c339c1fdbbc5d3621d8be036b31fef40e2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 12:54:34 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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
 }

Reply via email to