Fix quoting issues caught by latest repoman.

(Portage version: 2.1.3.12)

8 files changed, 135 insertions, 128 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 5d8fd6d20744..32757d3e4c13 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.91 2007/09/08 18:40:29 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.92 2007/10/09 08:11:29 dberkholz Exp $
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  ati-drivers-8.27.10-r1.ebuild, ati-drivers-8.28.8.ebuild,
+  ati-drivers-8.32.5.ebuild, ati-drivers-8.33.6.ebuild,
+  ati-drivers-8.33.6-r1.ebuild, ati-drivers-8.37.6-r1.ebuild,
+  ati-drivers-8.40.4.ebuild:
+  Fix quoting issues caught by latest repoman.
 
   08 Sep 2007; Christoph Mende <angelos@gentoo.org>
   ati-drivers-8.39.4.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
index cfa8d54649a1..da262d9f013b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.27.10-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-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild,v 1.9 2007/07/22 02:31:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild,v 1.10 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -126,7 +126,7 @@ src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
@@ -140,14 +140,14 @@ src_unpack() {
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
 
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}"/ati-powermode.sh.patch
 	fi
 }
 
 src_compile() {
 	einfo "Building the DRM module..."
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	cd "${WORKDIR}"/common/lib/modules/fglrx/build_mod
 	ln -s \
 	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
 	|| die "cannot find precompiled core"
@@ -183,16 +183,16 @@ pkg_preinst() {
 	# we don't have stale libs floating around ...
 	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
 	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+		rm -rf "${ROOT}"/usr/lib/opengl/ati/*
 	fi
 }
 
 src_install() {
 	local ATI_LIBGL_PATH=""
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	cd "${WORKDIR}"/common/lib/modules/fglrx/build_mod
 	linux-mod_src_install
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	local native_dir
 	use x86 && native_dir="lib"
@@ -221,44 +221,44 @@ src_install() {
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
+		echo 'ATIEVENTSDOPTS=""' > "${D}"/etc/conf.d/atieventsd
 	fi
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
+	doins -r "${WORKDIR}"/common/usr/include
 
 	#documentation
 	if use doc; then
 		dodir /usr/share/doc/fglrx
 		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
+			"${D}"/usr/share/doc/fglrx
 	fi
 
 	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
+	cp "${FILESDIR}"/09ati "${T}"/
 
 	if use acpi
 	then
 		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
 		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
+		doexe "${ATIETC}"/ati-powermode.sh
 		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
+		doins "${ATIETC}"/events/a-ac-aticonfig
+		doins "${ATIETC}"/events/a-lid-aticonfig
 	fi
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
 		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
-		cat >>${T}/09ati <<EOF
+		cat >>"${T}"/09ati <<EOF
 
 LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
-	doenvd ${T}/09ati
+	doenvd "${T}"/09ati
 }
 
 src_install-libs() {
@@ -291,7 +291,7 @@ src_install-libs() {
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
 		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
+		> "$D"/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi
 	# X and DRI driver
@@ -326,10 +326,10 @@ src_install-libs() {
 		has_version "x11-base/xorg-server"
 	then
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	else
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	fi
 
 	#Not the best place
@@ -338,13 +338,13 @@ src_install-libs() {
 
 	# misc ati configuration files for /etc
 	dodir /etc
-	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
-	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv "${D}"/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxrc "${D}"/etc/
 	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/logo* "${D}"/etc/ati/
 	if use acpi
 	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh "${D}"/etc/ati/
 	fi
 }
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
index a54cb226e5e1..a48e970c4586 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8.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-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.9 2007/08/14 18:10:08 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.10 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -125,7 +125,7 @@ src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
@@ -139,14 +139,14 @@ src_unpack() {
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
 
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}"/ati-powermode.sh.patch
 	fi
 }
 
 src_compile() {
 	einfo "Building the DRM module..."
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	cd "${WORKDIR}"/common/lib/modules/fglrx/build_mod
 	ln -s \
 	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
 	|| die "cannot find precompiled core"
@@ -182,16 +182,16 @@ pkg_preinst() {
 	# we don't have stale libs floating around ...
 	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
 	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+		rm -rf "${ROOT}"/usr/lib/opengl/ati/*
 	fi
 }
 
 src_install() {
 	local ATI_LIBGL_PATH=""
-	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	cd "${WORKDIR}"/common/lib/modules/fglrx/build_mod
 	linux-mod_src_install
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	local native_dir
 	use x86 && native_dir="lib"
@@ -220,44 +220,44 @@ src_install() {
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
+		echo 'ATIEVENTSDOPTS=""' > "${D}"/etc/conf.d/atieventsd
 	fi
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
+	doins -r "${WORKDIR}"/common/usr/include
 
 	#documentation
 	if use doc; then
 		dodir /usr/share/doc/fglrx
 		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
+			"${D}"/usr/share/doc/fglrx
 	fi
 
 	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
+	cp "${FILESDIR}"/09ati "${T}"/
 
 	if use acpi
 	then
 		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
 		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
+		doexe "${ATIETC}"/ati-powermode.sh
 		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
+		doins "${ATIETC}"/events/a-ac-aticonfig
+		doins "${ATIETC}"/events/a-lid-aticonfig
 	fi
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
 		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
-		cat >>${T}/09ati <<EOF
+		cat >>"${T}"/09ati <<EOF
 
 LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
-	doenvd ${T}/09ati
+	doenvd "${T}"/09ati
 }
 
 src_install-libs() {
@@ -290,7 +290,7 @@ src_install-libs() {
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
 		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
+		> "$D"/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi
 	# X and DRI driver
@@ -325,10 +325,10 @@ src_install-libs() {
 		has_version "x11-base/xorg-server"
 	then
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	else
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	fi
 
 	#Not the best place
@@ -337,13 +337,13 @@ src_install-libs() {
 
 	# misc ati configuration files for /etc
 	dodir /etc
-	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv ${D}/etc/
-	cp -pP ${COMMON_DIR}/etc/fglrxrc ${D}/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxprofiles.csv "${D}"/etc/
+	cp -pP ${COMMON_DIR}/etc/fglrxrc "${D}"/etc/
 	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/logo* "${D}"/etc/ati/
 	if use acpi
 	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh "${D}"/etc/ati/
 	fi
 }
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
index 54ad353ad93e..8c71e4253a84 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.32.5.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-drivers/ati-drivers/ati-drivers-8.32.5.ebuild,v 1.9 2007/07/22 02:31:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild,v 1.10 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -110,12 +110,12 @@ src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
 
-	epatch ${FILESDIR}/${PN}-2.6.19.patch
+	epatch "${FILESDIR}"/${PN}-2.6.19.patch
 
 	if use acpi
 	then
@@ -126,8 +126,8 @@ src_unpack() {
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
 
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}"/ati-powermode.sh.patch
 	fi
 }
 
@@ -158,7 +158,7 @@ pkg_preinst() {
 	# we don't have stale libs floating around ...
 	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
 	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+		rm -rf "${ROOT}"/usr/lib/opengl/ati/*
 	fi
 }
 
@@ -166,7 +166,7 @@ src_install() {
 	local ATI_LIBGL_PATH=""
 	linux-mod_src_install
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	local native_dir
 	use x86 && native_dir="lib"
@@ -195,44 +195,44 @@ src_install() {
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
+		echo 'ATIEVENTSDOPTS=""' > "${D}"/etc/conf.d/atieventsd
 	fi
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
+	doins -r "${WORKDIR}"/common/usr/include
 
 	#documentation
 	if use doc; then
 		dodir /usr/share/doc/fglrx
 		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
+			"${D}"/usr/share/doc/fglrx
 	fi
 
 	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
+	cp "${FILESDIR}"/09ati "${T}"/
 
 	if use acpi
 	then
 		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
 		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
+		doexe "${ATIETC}"/ati-powermode.sh
 		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
+		doins "${ATIETC}"/events/a-ac-aticonfig
+		doins "${ATIETC}"/events/a-lid-aticonfig
 	fi
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
 		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
-		cat >>${T}/09ati <<EOF
+		cat >>"${T}"/09ati <<EOF
 
 LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
-	doenvd ${T}/09ati
+	doenvd "${T}"/09ati
 }
 
 src_install-libs() {
@@ -265,7 +265,7 @@ src_install-libs() {
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
 		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
+		> "$D"/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi
 	# X and DRI driver
@@ -300,10 +300,10 @@ src_install-libs() {
 		has_version "x11-base/xorg-server"
 	then
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	else
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	fi
 
 	#Not the best place
@@ -312,12 +312,12 @@ src_install-libs() {
 
 	# misc ati configuration files for /etc
 	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv "${D}"/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc "${D}"/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/logo* "${D}"/etc/ati/
 	if use acpi
 	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh "${D}"/etc/ati/
 	fi
 }
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
index e334c6833fdd..c10b41be07c9 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6-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-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild,v 1.5 2007/07/22 02:31:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild,v 1.6 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -115,12 +115,12 @@ src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
 
-	epatch ${FILESDIR}/${PN}-2.6.20.patch
+	epatch "${FILESDIR}"/${PN}-2.6.20.patch
 
 	if use acpi
 	then
@@ -131,8 +131,8 @@ src_unpack() {
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
 
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}"/ati-powermode.sh.patch
 	fi
 }
 
@@ -163,7 +163,7 @@ pkg_preinst() {
 	# we don't have stale libs floating around ...
 	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
 	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+		rm -rf "${ROOT}"/usr/lib/opengl/ati/*
 	fi
 }
 
@@ -171,7 +171,7 @@ src_install() {
 	local ATI_LIBGL_PATH=""
 	linux-mod_src_install
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	local native_dir
 	use x86 && native_dir="lib"
@@ -200,44 +200,44 @@ src_install() {
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
+		echo 'ATIEVENTSDOPTS=""' > "${D}"/etc/conf.d/atieventsd
 	fi
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
+	doins -r "${WORKDIR}"/common/usr/include
 
 	#documentation
 	if use doc; then
 		dodir /usr/share/doc/fglrx
 		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
+			"${D}"/usr/share/doc/fglrx
 	fi
 
 	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
+	cp "${FILESDIR}"/09ati "${T}"/
 
 	if use acpi
 	then
 		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
 		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
+		doexe "${ATIETC}"/ati-powermode.sh
 		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
+		doins "${ATIETC}"/events/a-ac-aticonfig
+		doins "${ATIETC}"/events/a-lid-aticonfig
 	fi
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
 		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
-		cat >>${T}/09ati <<EOF
+		cat >>"${T}"/09ati <<EOF
 
 LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
-	doenvd ${T}/09ati
+	doenvd "${T}"/09ati
 }
 
 src_install-libs() {
@@ -270,7 +270,7 @@ src_install-libs() {
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
 		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
+		> "$D"/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi
 	# X and DRI driver
@@ -305,10 +305,10 @@ src_install-libs() {
 		has_version "x11-base/xorg-server"
 	then
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	else
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	fi
 
 	#Not the best place
@@ -317,12 +317,12 @@ src_install-libs() {
 
 	# misc ati configuration files for /etc
 	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv "${D}"/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc "${D}"/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/logo* "${D}"/etc/ati/
 	if use acpi
 	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh "${D}"/etc/ati/
 	fi
 }
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
index b0c749b46076..8a2faebc3c44 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6.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-drivers/ati-drivers/ati-drivers-8.33.6.ebuild,v 1.4 2007/07/22 02:31:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild,v 1.5 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -114,12 +114,12 @@ src_unpack() {
 	local OLDBIN="/usr/X11R6/bin"
 
 	ebegin "Unpacking Ati drivers"
-	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	sh "${DISTDIR}"/${A} --extract "${WORKDIR}" &> /dev/null
 	eend $? || die "unpack failed"
 
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
 
-	epatch ${FILESDIR}/${PN}-2.6.20.patch
+	epatch "${FILESDIR}"/${PN}-2.6.20.patch
 
 	if use acpi
 	then
@@ -130,8 +130,8 @@ src_unpack() {
 		"${WORKDIR}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
 
-		cd ${WORKDIR}
-		epatch ${FILESDIR}/ati-powermode.sh.patch
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}"/ati-powermode.sh.patch
 	fi
 }
 
@@ -162,7 +162,7 @@ pkg_preinst() {
 	# we don't have stale libs floating around ...
 	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
 	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+		rm -rf "${ROOT}"/usr/lib/opengl/ati/*
 	fi
 }
 
@@ -170,7 +170,7 @@ src_install() {
 	local ATI_LIBGL_PATH=""
 	linux-mod_src_install
 
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 
 	local native_dir
 	use x86 && native_dir="lib"
@@ -199,44 +199,44 @@ src_install() {
 		doexe ${ARCH_DIR}/usr/sbin/*
 		insinto /opt/ati/man/man8
 		doins common/usr/share/man/man8/*
-		newinitd ${FILESDIR}/atieventsd.rc6 atieventsd
+		newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd
 		dodir /etc/conf.d
-		echo 'ATIEVENTSDOPTS=""' > ${D}/etc/conf.d/atieventsd
+		echo 'ATIEVENTSDOPTS=""' > "${D}"/etc/conf.d/atieventsd
 	fi
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/common/usr/include
+	doins -r "${WORKDIR}"/common/usr/include
 
 	#documentation
 	if use doc; then
 		dodir /usr/share/doc/fglrx
 		cp -pPR common/usr/share/doc/fglrx/* \
-			${D}/usr/share/doc/fglrx
+			"${D}"/usr/share/doc/fglrx
 	fi
 
 	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
+	cp "${FILESDIR}"/09ati "${T}"/
 
 	if use acpi
 	then
 		local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi"
 		exeinto /etc/acpi
-		doexe ${ATIETC}/ati-powermode.sh
+		doexe "${ATIETC}"/ati-powermode.sh
 		insinto /etc/acpi/events
-		doins ${ATIETC}/events/a-ac-aticonfig
-		doins ${ATIETC}/events/a-lid-aticonfig
+		doins "${ATIETC}"/events/a-ac-aticonfig
+		doins "${ATIETC}"/events/a-lid-aticonfig
 	fi
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
 		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
-		cat >>${T}/09ati <<EOF
+		cat >>"${T}"/09ati <<EOF
 
 LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
-	doenvd ${T}/09ati
+	doenvd "${T}"/09ati
 }
 
 src_install-libs() {
@@ -269,7 +269,7 @@ src_install-libs() {
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
 		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
-		> $D/${ATI_ROOT}/lib/libGL.la
+		> "$D"/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi
 	# X and DRI driver
@@ -304,10 +304,10 @@ src_install-libs() {
 		has_version "x11-base/xorg-server"
 	then
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	else
 		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
-			${D}/usr/$(get_libdir)
+			"${D}"/usr/$(get_libdir)
 	fi
 
 	#Not the best place
@@ -316,12 +316,12 @@ src_install-libs() {
 
 	# misc ati configuration files for /etc
 	dodir /etc/ati
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc ${D}/etc/ati/
-	cp -pP ${COMMON_DIR}/etc/ati/logo* ${D}/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv "${D}"/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/fglrxrc "${D}"/etc/ati/
+	cp -pP ${COMMON_DIR}/etc/ati/logo* "${D}"/etc/ati/
 	if use acpi
 	then
-		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh ${D}/etc/ati/
+		cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh "${D}"/etc/ati/
 	fi
 }
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
index 6d6456b4c63c..e9e99facc4c4 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.37.6-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-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild,v 1.5 2007/08/01 22:48:37 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild,v 1.6 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi qt3 multilib"
 
@@ -172,7 +172,7 @@ src_unpack() {
 Add the following to fix bug #182597
 	if kernel_is 2 6 22; then
 		cd "${S}"
-		epatch ${FILESDIR}/${PV}/fix-ioctl-for-2.6.22.patch || die "Failed to patch for 2.6.22 kernel."
+		epatch "${FILESDIR}"/${PV}/fix-ioctl-for-2.6.22.patch || die "Failed to patch for 2.6.22 kernel."
 	fi
 }
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild
index 1275acfa8868..da82deb27afe 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.40.4.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-drivers/ati-drivers/ati-drivers-8.40.4.ebuild,v 1.2 2007/08/14 18:10:08 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.40.4.ebuild,v 1.3 2007/10/09 08:11:29 dberkholz Exp $
 
 IUSE="acpi multilib"
 
@@ -166,10 +166,10 @@ src_unpack() {
 	cd ..
 
 	# Misc. patches.
-	epatch ${FILESDIR}/${PV}/${P}-warnings.patch
+	epatch "${FILESDIR}"/${PV}/${P}-warnings.patch
 
 	if kernel_is ge 2 6 23; then
-		epatch ${FILESDIR}/${PV}/${PN}-2.6.23.patch
+		epatch "${FILESDIR}"/${PV}/${PN}-2.6.23.patch
 	fi
 }