Fix quoting issues caught by latest repoman.

Package-Manager: portage-2.1.3.12

10 files changed, 112 insertions, 99 deletions

diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog
index b77efc8d6250..4a4120021c27 100644
--- a/x11-base/kdrive/ChangeLog
+++ b/x11-base/kdrive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/kdrive
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.43 2007/07/22 02:23:43 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.44 2007/10/09 07:40:47 dberkholz Exp $
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  kdrive-4.3.0-r5.ebuild:
+  Fix quoting issues caught by latest repoman.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   kdrive-4.3.0-r5.ebuild:
diff --git a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild b/x11-base/kdrive/kdrive-4.3.0-r5.ebuild
index 0f2bee258270..fe8a23b4dd28 100644
--- a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild
+++ b/x11-base/kdrive/kdrive-4.3.0-r5.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/kdrive/kdrive-4.3.0-r5.ebuild,v 1.21 2007/07/22 02:23:43 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.22 2007/10/09 07:40:47 dberkholz Exp $
 
 # If you don't want to build the Xvesa server, do this.
 # VESA="no" emerge kdrive
@@ -78,7 +78,7 @@ src_unpack() {
 
 		# See linux.cf for MMX, 3DNOW and SSE autodetection. (spyderous)
 
-		cd ${S}
+		cd "${S}"
 		touch config/cf/host.def
 		echo "#define XVendorString \"Gentoo Linux (KDrive ${PV}, revision ${PR})\"
 #define KDriveXServer YES
@@ -104,7 +104,7 @@ src_unpack() {
 			echo "#define ProjectRoot /usr/X11R6" >> config/cf/host.def
 			# If the libs exist locally we do not need to build against
 			# kdrives personal libraries, dont patch to do this.
-			mv ${PATCH_DIR}/0020* ${PATCH_DIR}/excluded
+			mv "${PATCH_DIR}"/0020* "${PATCH_DIR}"/excluded
 		else
 			echo "#define BuildScreenSaverExt YES" >> config/cf/host.def
 			echo "#define BuildScreenSaverLibrary YES" >> config/cf/host.def
@@ -195,8 +195,8 @@ src_unpack() {
 	eend 0
 
 	# Bulk patching from all over
-	cd ${WORKDIR}
-	EPATCH_SUFFIX="patch" epatch ${PATCH_DIR}
+	cd "${WORKDIR}"
+	EPATCH_SUFFIX="patch" epatch "${PATCH_DIR}"
 
 	# We need to modify xmakefile after it has been created
 	if [ ! "`best_version x11-base/xorg-server`" ] ; then
@@ -206,25 +206,25 @@ src_unpack() {
 			MY_LIBROOT="${S}/lib"
 			MY_HERE="./"
 
-			mkdir -p ${MY_PROJROOT}
-			cd ${MY_INCROOT}
+			mkdir -p "${MY_PROJROOT}"
+			cd "${MY_INCROOT}"
 			for i in `ls ${MY_HERE}` ; do
-				ln -sf ${MY_INCROOT}/${i} ${MY_PROJROOT}
+				ln -sf "${MY_INCROOT}"/${i} "${MY_PROJROOT}"
 			done
 
-			cd ${MY_LIBROOT}
+			cd "${MY_LIBROOT}"
 			for i in `ls ${MY_HERE}` ; do
-				ln -sf ${MY_LIBROOT}/${i} ${MY_PROJROOT}
+				ln -sf "${MY_LIBROOT}"/${i} "${MY_PROJROOT}"
 			done
 
-			cd ${MY_PROJROOT} && rm -f Imakefile Makefile
-			ln -sf ${MY_PROJROOT}/extensions ${MY_PROJROOT}/X11/extensions
-			ln -sf ${S}/lib ${S}/usr/X11R6/lib
+			cd "${MY_PROJROOT}" && rm -f Imakefile Makefile
+			ln -sf "${MY_PROJROOT}"/extensions "${MY_PROJROOT}"/X11/extensions
+			ln -sf "${S}"/lib "${S}"/usr/X11R6/lib
 	    eend 0
 	fi
 
 	# Fixing bugs #68531 and #65758 -- this will disable toshiba dpms support
-	sed '/#ifndef TOSHIBA_SMM/,/#endif/d' -i ${S}/programs/Xserver/hw/kdrive/vesa/vesa.c
+	sed '/#ifndef TOSHIBA_SMM/,/#endif/d' -i "${S}"/programs/Xserver/hw/kdrive/vesa/vesa.c
 }
 
 src_compile() {
@@ -243,20 +243,20 @@ src_compile() {
 	# for a whole pile of nothing. As such we are just going to copy
 	# across the three needed man pages.
 	einfo "Making and installing man pages..."
-	mkdir -p ${MANDIR}
+	mkdir -p "${MANDIR}"
 	MY_MAN_BASE="${S}/programs/Xserver/hw/kdrive"
 
 	if ! use fbdev ; then
 		# We need to regenerate some makefiles for fbdev
 		echo "#define XfbdevServer YES" >> config/cf/host.def
-		cd ${S}/programs && make Makefiles > /dev/null || die "Xfbdev Makefile regeneration error..."
+		cd "${S}"/programs && make Makefiles > /dev/null || die "Xfbdev Makefile regeneration error..."
 	fi
 
 	# We have a complete set of makefiles so lets just build what we need
-	cd ${MY_MAN_BASE}
-	emake DESTDIR=${MANDIR} install.man || die "Kdrive man page install..."
-	emake DESTDIR=${MANDIR} -C vesa install.man || die "Xvesa man page install..."
-	emake DESTDIR=${MANDIR} -C fbdev install.man || die "Xfbdev man page install..."
+	cd "${MY_MAN_BASE}"
+	emake DESTDIR="${MANDIR}" install.man || die "Kdrive man page install..."
+	emake DESTDIR="${MANDIR}" -C vesa install.man || die "Xvesa man page install..."
+	emake DESTDIR="${MANDIR}" -C fbdev install.man || die "Xfbdev man page install..."
 
 }
 
@@ -286,13 +286,13 @@ src_install() {
 	done
 
 	# Install our startx script
-	doexe ${PATCH_DIR}/startxkd
+	doexe "${PATCH_DIR}"/startxkd
 
 	# Install man pages
 	if [ "`best_version x11-base/xorg-server`" ] ; then
-		doman ${MANDIR}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
+		doman "${MANDIR}"/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
 	else
-		doman ${MANDIR}/${S}/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
+		doman "${MANDIR}"/"${S}"/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x
 	fi
 }
 
diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index eba0011da8eb..4af83b7ccbb7 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.53 2007/07/02 14:43:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.54 2007/10/09 07:36:00 dberkholz Exp $
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  x11-drm-20051223.ebuild, x11-drm-20060608.ebuild,
+  x11-drm-20060608-r1.ebuild, x11-drm-20070314.ebuild:
+  Fix quoting issues caught by latest repoman.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   x11-drm-20051223.ebuild:
diff --git a/x11-base/x11-drm/x11-drm-20051223.ebuild b/x11-base/x11-drm/x11-drm-20051223.ebuild
index 18b31acf61dd..dd90fb8d825e 100644
--- a/x11-base/x11-drm/x11-drm-20051223.ebuild
+++ b/x11-base/x11-drm/x11-drm-20051223.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/x11-drm/x11-drm-20051223.ebuild,v 1.13 2007/07/02 14:43:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20051223.ebuild,v 1.14 2007/10/09 07:36:00 dberkholz Exp $
 
 inherit eutils x11 linux-mod
 
@@ -82,26 +82,26 @@ src_unpack() {
 	unpack linux-drm-${PV}-kernelsource.tar.bz2
 	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 
 	patch_prepare
 
 	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
 
 	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
 
-	cp ${S}/tests/*.c ${SRC_BUILD}
+	cp "${S}"/tests/*.c "${SRC_BUILD}"
 
-	cd ${S}
+	cd "${S}"
 	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
 }
 
 src_compile() {
 	einfo "Building DRM in ${SRC_BUILD}..."
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 
 	# This now uses an M= build system. Makefile does most of the work.
 	unset ARCH
@@ -113,7 +113,7 @@ src_compile() {
 	# Building the programs. These are useful for developers and getting info from DRI and DRM.
 	#
 	# libdrm objects are needed for drmstat.
-	cd ${S}
+	cd "${S}"
 	econf || die "libdrm configure failed."
 	emake || die "libdrm build failed."
 
@@ -122,7 +122,7 @@ src_compile() {
 		echo "Please disable in-kernel DRM support to use this package."
 	fi
 
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
 	make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
 	make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
@@ -130,7 +130,7 @@ src_compile() {
 
 src_install() {
 	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 
 	unset ARCH
 	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
@@ -151,8 +151,8 @@ src_install() {
 
 	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
 	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
+	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 pkg_postinst() {
@@ -220,8 +220,8 @@ patch_prepare() {
 	#     All trees (0**), Standard only (1**), Others (none right now)
 	#     2.4 vs. 2.6 kernels
 
-	kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
+	kernel_is 2 4 && mv -f "${PATCHDIR}"/*kernel-2.6* "${EXCLUDED}"
+	kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
 
 	# There is only one tree being maintained now. No numeric exclusions need
 	# to be done based on DRM tree.
diff --git a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
index f224e9b57131..8559291e7007 100644
--- a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608-r1.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/x11-drm/x11-drm-20060608-r1.ebuild,v 1.6 2007/03/14 18:18:53 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.7 2007/10/09 07:36:00 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -62,27 +62,27 @@ src_unpack() {
 	unpack linux-drm-${PV}-kernelsource.tar.bz2
 	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 
 	patch_prepare
 
 	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
 
 	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
 
-	cp ${S}/tests/*.c ${SRC_BUILD}
+	cp "${S}"/tests/*.c "${SRC_BUILD}"
 
 	src_unpack_os
 
-	cd ${S}
+	cd "${S}"
 	eautoreconf -v --install
 }
 
 src_compile() {
-	cd ${S}
+	cd "${S}"
 	# Building the programs. These are useful for developers and getting info from DRI and DRM.
 	#
 	# libdrm objects are needed for drmstat.
@@ -96,7 +96,7 @@ src_compile() {
 
 src_install() {
 	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 
 	src_install_os
 
@@ -206,8 +206,8 @@ patch_prepare() {
 	#     2.4 vs. 2.6 kernels
 	if use kernel_linux
 	then
-	    kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	    kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
+	    kernel_is 2 4 && mv -f "${PATCHDIR}"/*kernel-2.6* "${EXCLUDED}"
+	    kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
 	fi
 
 	# There is only one tree being maintained now. No numeric exclusions need
@@ -222,7 +222,7 @@ src_unpack_freebsd() {
 		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
 		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
 		SUBDIRS=${VIDCARDS//.ko}
-		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" ${SRC_BUILD}/Makefile
+		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
 	fi
 }
 
@@ -255,7 +255,7 @@ src_install_os() {
 
 src_compile_linux() {
 	# This now uses an M= build system. Makefile does most of the work.
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	unset ARCH
 	emake M="${SRC_BUILD}" \
 		LINUXDIR="${KERNEL_DIR}" \
@@ -268,13 +268,13 @@ src_compile_linux() {
 	fi
 
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
 	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
 }
 
 src_compile_freebsd() {
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
 	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
 	unset CFLAGS; unset LDFLAGS
@@ -293,7 +293,7 @@ src_compile_freebsd() {
 	emake dristat || die "Building dristat failed."
 	emake drmstat || die "Building drmstat failed."
 	# Move these where the linux stuff expects them
-	mv dristat drmstat ${SRC_BUILD}
+	mv dristat drmstat "${SRC_BUILD}"
 }
 
 die_error() {
@@ -305,7 +305,7 @@ die_error() {
 }
 
 src_install_linux() {
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	unset ARCH
 	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	emake KV="${KV_FULL}" \
@@ -321,12 +321,12 @@ src_install_linux() {
 
 	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
 	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
+	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	dodir "/boot/modules"
 	MAKE=make \
 		emake \
diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild
index 4b4c99fe7dd6..315609b07087 100644
--- a/x11-base/x11-drm/x11-drm-20060608.ebuild
+++ b/x11-base/x11-drm/x11-drm-20060608.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/x11-drm/x11-drm-20060608.ebuild,v 1.12 2007/03/14 18:18:53 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.13 2007/10/09 07:36:00 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -70,26 +70,26 @@ src_unpack() {
 	unpack linux-drm-${PV}-kernelsource.tar.bz2
 	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 
 	patch_prepare
 
 	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
 
 	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
 
-	cp ${S}/tests/*.c ${SRC_BUILD}
+	cp "${S}"/tests/*.c "${SRC_BUILD}"
 
-	cd ${S}
+	cd "${S}"
 	eautoreconf -v --install
 }
 
 src_compile() {
 	einfo "Building DRM in ${SRC_BUILD}..."
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 
 	# This now uses an M= build system. Makefile does most of the work.
 	unset ARCH
@@ -101,7 +101,7 @@ src_compile() {
 	# Building the programs. These are useful for developers and getting info from DRI and DRM.
 	#
 	# libdrm objects are needed for drmstat.
-	cd ${S}
+	cd "${S}"
 	econf || die "libdrm configure failed."
 	emake || die "libdrm build failed."
 
@@ -110,7 +110,7 @@ src_compile() {
 		echo "Please disable in-kernel DRM support to use this package."
 	fi
 
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
 	make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
 	make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
@@ -118,7 +118,7 @@ src_compile() {
 
 src_install() {
 	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 
 	unset ARCH
 	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
@@ -140,8 +140,8 @@ src_install() {
 
 	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
 	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
+	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 pkg_postinst() {
@@ -209,8 +209,8 @@ patch_prepare() {
 	#     All trees (0**), Standard only (1**), Others (none right now)
 	#     2.4 vs. 2.6 kernels
 
-	kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
+	kernel_is 2 4 && mv -f "${PATCHDIR}"/*kernel-2.6* "${EXCLUDED}"
+	kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
 
 	# There is only one tree being maintained now. No numeric exclusions need
 	# to be done based on DRM tree.
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
index 54785838ce5a..60239bbae733 100644
--- a/x11-base/x11-drm/x11-drm-20070314.ebuild
+++ b/x11-base/x11-drm/x11-drm-20070314.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/x11-drm/x11-drm-20070314.ebuild,v 1.2 2007/03/14 18:18:53 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.3 2007/10/09 07:36:00 dberkholz Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -61,27 +61,27 @@ src_unpack() {
 	unpack linux-drm-${PV}-kernelsource.tar.bz2
 	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 
 	patch_prepare
 
 	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"
 
 	# Substitute new directory under /lib/modules/${KV_FULL}
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
 
-	cp ${S}/tests/*.c ${SRC_BUILD}
+	cp "${S}"/tests/*.c "${SRC_BUILD}"
 
 	src_unpack_os
 
-	cd ${S}
+	cd "${S}"
 	eautoreconf -v --install
 }
 
 src_compile() {
-	cd ${S}
+	cd "${S}"
 	# Building the programs. These are useful for developers and getting info from DRI and DRM.
 	#
 	# libdrm objects are needed for drmstat.
@@ -95,7 +95,7 @@ src_compile() {
 
 src_install() {
 	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 
 	src_install_os
 
@@ -202,7 +202,7 @@ patch_prepare() {
 	#     2.4 vs. 2.6 kernels
 	if use kernel_linux
 	then
-	    kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
+	    kernel_is 2 6 && mv -f "${PATCHDIR}"/*kernel-2.4* "${EXCLUDED}"
 	fi
 
 	# There is only one tree being maintained now. No numeric exclusions need
@@ -217,7 +217,7 @@ src_unpack_freebsd() {
 		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
 		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
 		SUBDIRS=${VIDCARDS//.ko}
-		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" ${SRC_BUILD}/Makefile
+		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" "${SRC_BUILD}"/Makefile
 	fi
 }
 
@@ -250,7 +250,7 @@ src_install_os() {
 
 src_compile_linux() {
 	# This now uses an M= build system. Makefile does most of the work.
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	unset ARCH
 	emake M="${SRC_BUILD}" \
 		LINUXDIR="${KERNEL_DIR}" \
@@ -263,13 +263,13 @@ src_compile_linux() {
 	fi
 
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
 	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
 }
 
 src_compile_freebsd() {
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
 	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
 	unset CFLAGS; unset LDFLAGS
@@ -288,7 +288,7 @@ src_compile_freebsd() {
 	emake dristat || die "Building dristat failed."
 	emake drmstat || die "Building drmstat failed."
 	# Move these where the linux stuff expects them
-	mv dristat drmstat ${SRC_BUILD}
+	mv dristat drmstat "${SRC_BUILD}"
 }
 
 die_error() {
@@ -299,7 +299,7 @@ die_error() {
 }
 
 src_install_linux() {
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	unset ARCH
 	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
 	emake KV="${KV_FULL}" \
@@ -315,12 +315,12 @@ src_install_linux() {
 
 	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
 	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
+	sed 's:%PN%:'${PN}':g' "${FILESDIR}"/modules.d-${PN} > "${D}"/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' "${D}"/etc/modules.d/${PN}
 }
 
 src_install_freebsd() {
-	cd ${SRC_BUILD}
+	cd "${SRC_BUILD}"
 	dodir "/boot/modules"
 	MAKE=make \
 		emake \
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
 }