Fix quoting issues caught by latest repoman.

Package-Manager: portage-2.1.3.12

9 files changed, 171 insertions, 164 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/Manifest b/x11-drivers/ati-drivers/Manifest
index ec64af0c54cf..f0537d9ca03e 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -64,26 +64,26 @@ DIST ati-driver-installer-8.36.5-x86.x86_64.run 53331877 RMD160 5581d7ad761f60c8
 DIST ati-driver-installer-8.37.6-x86.x86_64.run 53449730 RMD160 909473365e144281f03d6d7bd65168838ae54526 SHA1 bc7e32d6ba91967c2661d74874edc046190cf9a1 SHA256 42c607053e616b38b02f87c5734a8191331907f8fa8fa91a7eec41400292608b
 DIST ati-driver-installer-8.39.4-x86.x86_64.run 40085391 RMD160 b23da1864ab4718ddfbc077950443507f30af70a SHA1 2b1b66169df36c3e6c811562b63642ff4dce2b1d SHA256 c8c37f2e13dc10aa223c7dc50aa04cba211c913d254704908f5d3cd57debac22
 DIST ati-driver-installer-8.40.4-x86.x86_64.run 40335704 RMD160 8a35e68aa9108186ffd91244209377387b3313e5 SHA1 6260c8596529eac34fabe3437678afe6e2761490 SHA256 765386dbe60ba66088b0d6050d1e462432e7cfaddca33d70875b2bd554ddc7a2
-EBUILD ati-drivers-8.27.10-r1.ebuild 10543 RMD160 a137a262e4e1bb9e4118d87a1c804a8a0641eb97 SHA1 1a51c25ae3e1a35947c0acedbfeb86443f65b9dc SHA256 22855d255a6cee2204040913cfebef1bb3cfac2d115700b428d8ff6205e0c67a
-MD5 233ad0d0a2e7d383bc357293b876d9f2 ati-drivers-8.27.10-r1.ebuild 10543
-RMD160 a137a262e4e1bb9e4118d87a1c804a8a0641eb97 ati-drivers-8.27.10-r1.ebuild 10543
-SHA256 22855d255a6cee2204040913cfebef1bb3cfac2d115700b428d8ff6205e0c67a ati-drivers-8.27.10-r1.ebuild 10543
-EBUILD ati-drivers-8.28.8.ebuild 10456 RMD160 8a8e6083b90708cece57a0f5cdee56534fc32d15 SHA1 74b91115102bec64d9989f33542e965f3e6fc190 SHA256 8f1c184733ed743165fd0694b1f6e813c467f6c251736d51907b1101d6587c63
-MD5 219570333f63f83461ad868ff9445b94 ati-drivers-8.28.8.ebuild 10456
-RMD160 8a8e6083b90708cece57a0f5cdee56534fc32d15 ati-drivers-8.28.8.ebuild 10456
-SHA256 8f1c184733ed743165fd0694b1f6e813c467f6c251736d51907b1101d6587c63 ati-drivers-8.28.8.ebuild 10456
-EBUILD ati-drivers-8.32.5.ebuild 9895 RMD160 9a0794acebea3582ac88cc81b801d892e612f3a6 SHA1 252febb980d42a15023d3c185c64c2ed21ea6f13 SHA256 0dd6f92b58226a3d27c7a8ef52d80dd70f9fb31d2a762b63a3e573a934f74d43
-MD5 f482fb5fc8ecff29fff3854dc8ef9792 ati-drivers-8.32.5.ebuild 9895
-RMD160 9a0794acebea3582ac88cc81b801d892e612f3a6 ati-drivers-8.32.5.ebuild 9895
-SHA256 0dd6f92b58226a3d27c7a8ef52d80dd70f9fb31d2a762b63a3e573a934f74d43 ati-drivers-8.32.5.ebuild 9895
-EBUILD ati-drivers-8.33.6-r1.ebuild 9963 RMD160 17ed26b312cf2dcf4fa958ea7401241f74575178 SHA1 dce7b41221db8505fa1129c6b8374574cf366f5a SHA256 5cd0ff05aae477503636233af6a2747faccbfba827a895b87cfd9e797ba57a7f
-MD5 075bae244e2e6c1ac83eb5328d2a6163 ati-drivers-8.33.6-r1.ebuild 9963
-RMD160 17ed26b312cf2dcf4fa958ea7401241f74575178 ati-drivers-8.33.6-r1.ebuild 9963
-SHA256 5cd0ff05aae477503636233af6a2747faccbfba827a895b87cfd9e797ba57a7f ati-drivers-8.33.6-r1.ebuild 9963
-EBUILD ati-drivers-8.33.6.ebuild 9939 RMD160 edf67cff13d3ac672d09673d5eac97503ae7bc0b SHA1 4239aedcc99197b621293a36b3ed535bd4aa4390 SHA256 dcf322ac3723535efeb31d2d7945eaf67b6b60da42b3312ed0dde742d1f5b7e5
-MD5 28f41cc4f792839f8422d522f8f0163e ati-drivers-8.33.6.ebuild 9939
-RMD160 edf67cff13d3ac672d09673d5eac97503ae7bc0b ati-drivers-8.33.6.ebuild 9939
-SHA256 dcf322ac3723535efeb31d2d7945eaf67b6b60da42b3312ed0dde742d1f5b7e5 ati-drivers-8.33.6.ebuild 9939
+EBUILD ati-drivers-8.27.10-r1.ebuild 10596 RMD160 bce7d9cb27fa3342f73ef12d79cf3e16960218db SHA1 a22b257c42ede25733c3d1bac5c80b33307095bd SHA256 725d493439465972c1325e467c0985484125ffe1d8c3c9d0a784a3bdacf2c9c0
+MD5 9b3fb647c1651898d11978a490b6bce6 ati-drivers-8.27.10-r1.ebuild 10596
+RMD160 bce7d9cb27fa3342f73ef12d79cf3e16960218db ati-drivers-8.27.10-r1.ebuild 10596
+SHA256 725d493439465972c1325e467c0985484125ffe1d8c3c9d0a784a3bdacf2c9c0 ati-drivers-8.27.10-r1.ebuild 10596
+EBUILD ati-drivers-8.28.8.ebuild 10512 RMD160 f4f966e53c8c90a4cf4da4322895915f50ecb607 SHA1 e47376567935c2244588ee0c5d66b4fa43d752fc SHA256 759f234624b66f4c923080782e337d0177d0345ed7816644eacf4cc18a1f212e
+MD5 897b42632d72c7356961b8796904b3d9 ati-drivers-8.28.8.ebuild 10512
+RMD160 f4f966e53c8c90a4cf4da4322895915f50ecb607 ati-drivers-8.28.8.ebuild 10512
+SHA256 759f234624b66f4c923080782e337d0177d0345ed7816644eacf4cc18a1f212e ati-drivers-8.28.8.ebuild 10512
+EBUILD ati-drivers-8.32.5.ebuild 9946 RMD160 3d91888e37599536385a1552d6936bbe79ee76d1 SHA1 5c504d74030cb021bb7fe2bd514aabde7baa9a85 SHA256 42f6b2cdc92dc043ce094160c4e2479c57f3248399bdddbd5904f03199e62eaf
+MD5 24fbc356de6593a673d9909a325303ba ati-drivers-8.32.5.ebuild 9946
+RMD160 3d91888e37599536385a1552d6936bbe79ee76d1 ati-drivers-8.32.5.ebuild 9946
+SHA256 42f6b2cdc92dc043ce094160c4e2479c57f3248399bdddbd5904f03199e62eaf ati-drivers-8.32.5.ebuild 9946
+EBUILD ati-drivers-8.33.6-r1.ebuild 10013 RMD160 4eb714f78dba42bd04f4d6e8f54644426357712c SHA1 a53026f49ab94a8c588e6f9602a400c1bdd50a87 SHA256 0e4a6c1ff15d99332cd10054dcb1017c4d458e13c3936d5a6477a406189f0a0d
+MD5 7c191d1e0db6ba7068abbe18252fc6ed ati-drivers-8.33.6-r1.ebuild 10013
+RMD160 4eb714f78dba42bd04f4d6e8f54644426357712c ati-drivers-8.33.6-r1.ebuild 10013
+SHA256 0e4a6c1ff15d99332cd10054dcb1017c4d458e13c3936d5a6477a406189f0a0d ati-drivers-8.33.6-r1.ebuild 10013
+EBUILD ati-drivers-8.33.6.ebuild 9989 RMD160 85404111c847b435c8b9c38fc58d141a0595af0e SHA1 9cd4786f2d97030bea04a6e050164ff43e8d129f SHA256 d314a46f2d7384d2a0a01e0760d9727f57ef394dab79a3869dc6bc8245d47e28
+MD5 7fb932bd450de49b1824a3c08924edd0 ati-drivers-8.33.6.ebuild 9989
+RMD160 85404111c847b435c8b9c38fc58d141a0595af0e ati-drivers-8.33.6.ebuild 9989
+SHA256 d314a46f2d7384d2a0a01e0760d9727f57ef394dab79a3869dc6bc8245d47e28 ati-drivers-8.33.6.ebuild 9989
 EBUILD ati-drivers-8.34.8.ebuild 12894 RMD160 2b1ea0b397fdf682ef292ef7f41c3c60d377ce5d SHA1 f85753c1a83cb6a5287e0d33c30104fe391d88fa SHA256 b06576d0c19be43716184d8c7375365afbc751b1ca0144f7c2d5d8e7a4324b5d
 MD5 ef5ae4b50c8c40d538bce22407d07ba3 ati-drivers-8.34.8.ebuild 12894
 RMD160 2b1ea0b397fdf682ef292ef7f41c3c60d377ce5d ati-drivers-8.34.8.ebuild 12894
@@ -96,10 +96,10 @@ EBUILD ati-drivers-8.36.5.ebuild 12954 RMD160 f026020e84688b6e7e69cfe1648018c40e
 MD5 c252df0ca78dc1f78ac8d04d79442e55 ati-drivers-8.36.5.ebuild 12954
 RMD160 f026020e84688b6e7e69cfe1648018c40ef2e340 ati-drivers-8.36.5.ebuild 12954
 SHA256 5db17e1dd0cdf54b482bd2c5ceea43a664b1b0d7878afc801e83234f1f86a510 ati-drivers-8.36.5.ebuild 12954
-EBUILD ati-drivers-8.37.6-r1.ebuild 14637 RMD160 e4f37d494f9d3e3396b40a110406b5baa9d21aba SHA1 f649600aa42fde3cd74253638e914495c456dea9 SHA256 1cf7b20a00a508531a2eefdba3a32fe90e7cfbf928407c5bb93a6a7dcedb8ce5
-MD5 1498b45d7f1d2b9f1212a690ab9c4cde ati-drivers-8.37.6-r1.ebuild 14637
-RMD160 e4f37d494f9d3e3396b40a110406b5baa9d21aba ati-drivers-8.37.6-r1.ebuild 14637
-SHA256 1cf7b20a00a508531a2eefdba3a32fe90e7cfbf928407c5bb93a6a7dcedb8ce5 ati-drivers-8.37.6-r1.ebuild 14637
+EBUILD ati-drivers-8.37.6-r1.ebuild 14642 RMD160 7157d8a38a537282b6277c7bf2f56b47588ef32c SHA1 a6ceb61ccff59c9290f733b7799276d55e20447c SHA256 a37d48d3274e9f97363666dedae58b5b34443b67d64054c3ec69690609253d9f
+MD5 a9a4ce1893c8f167a2920302e9e97dc7 ati-drivers-8.37.6-r1.ebuild 14642
+RMD160 7157d8a38a537282b6277c7bf2f56b47588ef32c ati-drivers-8.37.6-r1.ebuild 14642
+SHA256 a37d48d3274e9f97363666dedae58b5b34443b67d64054c3ec69690609253d9f ati-drivers-8.37.6-r1.ebuild 14642
 EBUILD ati-drivers-8.37.6.ebuild 12954 RMD160 ef974ed96be35d627bd0527ecfb31ca7a94abfdb SHA1 4b6f43583aeb918af63341820323d0f0f276f9d3 SHA256 ab7157088d4121e4c332e73bb1cf71bb1e68b9c79e0a7922e2e109cc3d25b8b2
 MD5 b255b1b94892ce01ed400b19b7662064 ati-drivers-8.37.6.ebuild 12954
 RMD160 ef974ed96be35d627bd0527ecfb31ca7a94abfdb ati-drivers-8.37.6.ebuild 12954
@@ -108,14 +108,14 @@ EBUILD ati-drivers-8.39.4.ebuild 14117 RMD160 6c37341f90a406873902c9012c8c82b5f6
 MD5 860bbcba6cf77035dcbb9786328a5478 ati-drivers-8.39.4.ebuild 14117
 RMD160 6c37341f90a406873902c9012c8c82b5f67d8b2a ati-drivers-8.39.4.ebuild 14117
 SHA256 628567811b455d8e8a9ec4f21effdc014d3f77da1f8f99e0ae244f551c0cf5e4 ati-drivers-8.39.4.ebuild 14117
-EBUILD ati-drivers-8.40.4.ebuild 14172 RMD160 eea60ae9a81d0a47c7147d62b35b1e0f25810990 SHA1 2c9719a65188cf444c67bfafeaebf59c52c3059c SHA256 80c2c0b5fa1b7a0497e64d43f11ba7f6c95f4d3871fb5a247ec18da97358c970
-MD5 9dbb01648951499c19999f28d3eced1c ati-drivers-8.40.4.ebuild 14172
-RMD160 eea60ae9a81d0a47c7147d62b35b1e0f25810990 ati-drivers-8.40.4.ebuild 14172
-SHA256 80c2c0b5fa1b7a0497e64d43f11ba7f6c95f4d3871fb5a247ec18da97358c970 ati-drivers-8.40.4.ebuild 14172
-MISC ChangeLog 41103 RMD160 fe0c974b6d277ed3f2594d66e2f713c213ffe54a SHA1 47fc5fb61d84aa36819b5194627b5ce9783a7c0a SHA256 ab824e08bffd66df8ec8b36d62f9978b144808e197973aed239ee6eedbb246a4
-MD5 04fbdb75f6a54cc606ac717a1ede103c ChangeLog 41103
-RMD160 fe0c974b6d277ed3f2594d66e2f713c213ffe54a ChangeLog 41103
-SHA256 ab824e08bffd66df8ec8b36d62f9978b144808e197973aed239ee6eedbb246a4 ChangeLog 41103
+EBUILD ati-drivers-8.40.4.ebuild 14179 RMD160 f481ffb22def648a9a21dd5af26c43eb7aab1f5e SHA1 86bf9430fab7fc8b897a01b81ace6d0a8ecf6d56 SHA256 ee3be98a764e6bf71f9f1c186e08d7fc815b52cf358c8821f45d7d599d69b207
+MD5 78300b99727736113b680a82f15eb487 ati-drivers-8.40.4.ebuild 14179
+RMD160 f481ffb22def648a9a21dd5af26c43eb7aab1f5e ati-drivers-8.40.4.ebuild 14179
+SHA256 ee3be98a764e6bf71f9f1c186e08d7fc815b52cf358c8821f45d7d599d69b207 ati-drivers-8.40.4.ebuild 14179
+MISC ChangeLog 41415 RMD160 dd12a0411352083a7681947042e69e8f6c12317f SHA1 4f5f814343cb3c7ca41f9a0a7f0b70a43ee639d8 SHA256 c556ec57213acb224eaf9143cc1a53aa80335f460d71f8e173e2134674e4a846
+MD5 d636fb14442df7bf3a46b9372efc5602 ChangeLog 41415
+RMD160 dd12a0411352083a7681947042e69e8f6c12317f ChangeLog 41415
+SHA256 c556ec57213acb224eaf9143cc1a53aa80335f460d71f8e173e2134674e4a846 ChangeLog 41415
 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
@@ -157,9 +157,9 @@ MD5 a70e07c461a1bdaebd820666ad4a2f2f files/digest-ati-drivers-8.40.4 313
 RMD160 2a204e1a4ec40fc3e34581008440b9426fa97401 files/digest-ati-drivers-8.40.4 313
 SHA256 adea60b9ebc1c935674db8e6a3bfbb4d362eb92bcf7c3e768c4a39f537970d20 files/digest-ati-drivers-8.40.4 313
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG4uyjKhnDs22gwa8RArPQAKD9Zc2BbIjuAiF/qDGZ/AuhcwSqnQCg43pk
-tpAdAP3+g0Isx8WxR7HrFZA=
-=E5W5
+iD8DBQFHCze6XVaO67S1rtsRAuJVAJ0QHK9AAhnLbN2QfaNNxtomiirhKACgsE0c
+dKXKJl8PQK6OFucS5rZXH+w=
+=S5fc
 -----END PGP SIGNATURE-----
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
 }