Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/
Date: Sun, 02 Feb 2020 00:15:06
Message-Id: 1580602490.7e453c034a48aea5d0a335a7622f200bc8090b0a.mattst88@gentoo
1 commit: 7e453c034a48aea5d0a335a7622f200bc8090b0a
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 2 00:14:11 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 2 00:14:50 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e453c03
7
8 x11-misc/xorg-cf-files: Remove unnecessary strip-slash
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 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
16 index 82c580779fc..f8abfd30074 100644
17 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
18 +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
19 @@ -34,13 +34,13 @@ src_configure() {
20
21 src_install() {
22 default
23 - echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
24 + echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
25 "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
26 sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
27 "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
28 sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
29 "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
30 - sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
31 + sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
32 "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
33 sed -i -e "/# define Solaris64bitSubdir/d" \
34 "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die