summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-10-09 07:43:49 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-10-09 07:43:49 +0000
commitb08843e178c813caee0d404542d2c03b3244f36e (patch)
tree0aea75167a377c9d19f4ceab2c771054ae2b0f55 /x11-base
parentstable x86, bug 195167 (diff)
downloadgentoo-2-b08843e178c813caee0d404542d2c03b3244f36e.tar.gz
gentoo-2-b08843e178c813caee0d404542d2c03b3244f36e.tar.bz2
gentoo-2-b08843e178c813caee0d404542d2c03b3244f36e.zip
Fix quoting issues caught by latest repoman.
(Portage version: 2.1.3.12)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.2.ebuild8
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.3.ebuild8
3 files changed, 13 insertions, 9 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 6ee333ac459e..f300384dd41a 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.593 2007/09/10 09:37:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.594 2007/10/09 07:43:49 dberkholz Exp $
+
+ 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.2.ebuild,
+ xorg-x11-7.3.ebuild:
+ Fix quoting issues caught by latest repoman.
10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.3.ebuild:
Add dep on mkfontdir-1.0.3.
diff --git a/x11-base/xorg-x11/xorg-x11-7.2.ebuild b/x11-base/xorg-x11/xorg-x11-7.2.ebuild
index 55247570fef0..d90eef347bdf 100644
--- a/x11-base/xorg-x11/xorg-x11-7.2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.2.ebuild,v 1.13 2007/08/07 13:35:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.2.ebuild,v 1.14 2007/10/09 07:43:49 dberkholz Exp $
inherit eutils
@@ -75,10 +75,10 @@ pkg_preinst() {
# Bug #112924
# For RC3 - filter out RgbPath line since it also seems to break things
XORGCONF="/etc/X11/xorg.conf"
- if [ -e ${XORGCONF} ]; then
+ if [[ -e ${ROOT}${XORGCONF} ]]; then
mkdir -p "${D}/etc/X11"
- sed "/ModulePath/d" ${XORGCONF} > "${D}"${XORGCONF}
- sed -i "/RgbPath/d" "${D}"${XORGCONF}
+ sed "/ModulePath/d" "${ROOT}${XORGCONF}" > "${D}${XORGCONF}"
+ sed -i "/RgbPath/d" "${D}${XORGCONF}"
fi
}
diff --git a/x11-base/xorg-x11/xorg-x11-7.3.ebuild b/x11-base/xorg-x11/xorg-x11-7.3.ebuild
index 2d87db1d9995..3abe5042100b 100644
--- a/x11-base/xorg-x11/xorg-x11-7.3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.3.ebuild,v 1.2 2007/09/10 09:37:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.3.ebuild,v 1.3 2007/10/09 07:43:49 dberkholz Exp $
inherit eutils
@@ -76,10 +76,10 @@ pkg_preinst() {
# Bug #112924
# For RC3 - filter out RgbPath line since it also seems to break things
XORGCONF="/etc/X11/xorg.conf"
- if [ -e ${XORGCONF} ]; then
+ if [[ -e ${ROOT}${XORGCONF} ]]; then
mkdir -p "${D}/etc/X11"
- sed "/ModulePath/d" ${XORGCONF} > "${D}"${XORGCONF}
- sed -i "/RgbPath/d" "${D}"${XORGCONF}
+ sed "/ModulePath/d" "${ROOT}${XORGCONF}" > "${D}${XORGCONF}"
+ sed -i "/RgbPath/d" "${D}${XORGCONF}"
fi
}