commit:     40d39cd5790452bf92d47c7c08524215330628cd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 19:06:34 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 19:09:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d39cd5

x11-misc/xorg-cf-files: Drop unnecessary ED slash strips

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 22e8a389248..8f1985d5f80 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -35,22 +35,22 @@ src_configure() {
 src_install() {
        default
        echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/host.def || die
+               "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
        sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die 
"failed libdir sed"
+               "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
        sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
+               "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
        sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
+               "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
        sed -i -e "/#  define Solaris64bitSubdir/d" \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+               "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
        sed -i -e 's/-DNOSTDHDRS//g' \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+               "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
 
        sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
\
-               "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+               "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
        sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+               "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
        sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" \
-               "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+               "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
 }

Reply via email to