Fix quoting issues caught by latest repoman.

Package-Manager: portage-2.1.3.12

9 files changed, 329 insertions, 314 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 131750424118..a4c7189c18ac 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.157 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.158 2007/10/09 08:23:57 dberkholz Exp $
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-6.5-r3.ebuild,
+  mesa-6.5.1-r1.ebuild, mesa-6.5.1-r4.ebuild, mesa-6.5.2.ebuild,
+  mesa-6.5.2-r1.ebuild, mesa-6.5.3.ebuild, mesa-7.0.1.ebuild:
+  Fix quoting issues caught by latest repoman.
 
   12 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-6.5-r3.ebuild,
   mesa-6.5.1-r1.ebuild, mesa-6.5.1-r4.ebuild, mesa-6.5.2.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 70a88a8b8b5f..5ad3a4dfa3df 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e
 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421
@@ -55,38 +58,38 @@ DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6
 DIST MesaLib-6.5.3.tar.bz2 3351899 RMD160 becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e SHA1 8ab86e54976752028fbffcc21a9e0d2ebefeeff4 SHA256 f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 DIST MesaLib-7.0.1.tar.bz2 3343538 RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 SHA1 deb1002cf377ba8bd9407bd3cf573f8c8be31671 SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
-EBUILD mesa-6.5-r3.ebuild 9158 RMD160 90e42d89822dc6800c31c2074e2d25c54b608425 SHA1 5b8e903504a96cf6765a8aa5b1d1de85c1ddb805 SHA256 b84d528a32724c557e4a708125f05a2e7d4a96aa3c7929c5b4a95a9cad8a8cdc
-MD5 8a032392b8be25d67dff16a65e9a61d0 mesa-6.5-r3.ebuild 9158
-RMD160 90e42d89822dc6800c31c2074e2d25c54b608425 mesa-6.5-r3.ebuild 9158
-SHA256 b84d528a32724c557e4a708125f05a2e7d4a96aa3c7929c5b4a95a9cad8a8cdc mesa-6.5-r3.ebuild 9158
-EBUILD mesa-6.5.1-r1.ebuild 8501 RMD160 be3b1c528e5d44bfd86e20fb2589290a3757c26a SHA1 567c0329a8de45253c0dae73bb65420b3d78e311 SHA256 0ec3f1a1c56dc18e9d07d253aa622f37f78035de1b7aa5548173578341414c90
-MD5 458633f7f21228643ac21bc657f403fe mesa-6.5.1-r1.ebuild 8501
-RMD160 be3b1c528e5d44bfd86e20fb2589290a3757c26a mesa-6.5.1-r1.ebuild 8501
-SHA256 0ec3f1a1c56dc18e9d07d253aa622f37f78035de1b7aa5548173578341414c90 mesa-6.5.1-r1.ebuild 8501
-EBUILD mesa-6.5.1-r4.ebuild 9301 RMD160 09914276f3f0f7150242e9b262610c6656108e9c SHA1 341cea0ce32546fe1b00787a19d0bcf437d7fe64 SHA256 4f20f2edf64dd4bd3fcc0d5a682ff20264010d2db21f636320af09ef3445b9ab
-MD5 1c967e582dcfe3a12a59428cfba7e89f mesa-6.5.1-r4.ebuild 9301
-RMD160 09914276f3f0f7150242e9b262610c6656108e9c mesa-6.5.1-r4.ebuild 9301
-SHA256 4f20f2edf64dd4bd3fcc0d5a682ff20264010d2db21f636320af09ef3445b9ab mesa-6.5.1-r4.ebuild 9301
-EBUILD mesa-6.5.2-r1.ebuild 9003 RMD160 a1a5288b11b64b316601e2e382aa282b81ce4380 SHA1 c843733b61c484e3d0025c730c82a268cacabd0e SHA256 7f6d98b6557620b4160b4234fd3c4d96b9c0307ff01314b28d3d927a18e7d7a6
-MD5 650df0302694d30983941db72493a7d2 mesa-6.5.2-r1.ebuild 9003
-RMD160 a1a5288b11b64b316601e2e382aa282b81ce4380 mesa-6.5.2-r1.ebuild 9003
-SHA256 7f6d98b6557620b4160b4234fd3c4d96b9c0307ff01314b28d3d927a18e7d7a6 mesa-6.5.2-r1.ebuild 9003
-EBUILD mesa-6.5.2.ebuild 8961 RMD160 c597ec081ed588c6a15817f363fbc57a31bba431 SHA1 d2b02311d4efc1f8fafeb7495c0d2efd370d3a39 SHA256 44f845b16ee678c74085e75700b58254ac2893e787fc5eebf8f5668fae64013f
-MD5 1c7c7d16e6b009ef4cd156eac5373361 mesa-6.5.2.ebuild 8961
-RMD160 c597ec081ed588c6a15817f363fbc57a31bba431 mesa-6.5.2.ebuild 8961
-SHA256 44f845b16ee678c74085e75700b58254ac2893e787fc5eebf8f5668fae64013f mesa-6.5.2.ebuild 8961
-EBUILD mesa-6.5.3.ebuild 9369 RMD160 fc50e40734c8ffd919dac5c8f6516f511952ccd7 SHA1 fa601161149b719800809c751bae642601fbcdc7 SHA256 286c410abe2d155dbf90ee91e54ec78967b4eab36f2925b25b5c990e25cb5def
-MD5 ffbd96fb71e9a8681fe0ba82e2828e0a mesa-6.5.3.ebuild 9369
-RMD160 fc50e40734c8ffd919dac5c8f6516f511952ccd7 mesa-6.5.3.ebuild 9369
-SHA256 286c410abe2d155dbf90ee91e54ec78967b4eab36f2925b25b5c990e25cb5def mesa-6.5.3.ebuild 9369
-EBUILD mesa-7.0.1.ebuild 9210 RMD160 68093c6e0880249661c1ff5542d093283a97e7cc SHA1 ff74de9172f56160d452bffc679fee9ee6e8f3d2 SHA256 e03045db24274ba8195692d9aa12e457721134b882007016db0039aa77ffdcfb
-MD5 4309813d86e863eb13668445cc9576b7 mesa-7.0.1.ebuild 9210
-RMD160 68093c6e0880249661c1ff5542d093283a97e7cc mesa-7.0.1.ebuild 9210
-SHA256 e03045db24274ba8195692d9aa12e457721134b882007016db0039aa77ffdcfb mesa-7.0.1.ebuild 9210
-MISC ChangeLog 28623 RMD160 7d617344ac7acd5ca7f27686b6bbed54e7a9774e SHA1 552f10b02e20b8031def6ee5b0437d574f0335db SHA256 01e40a4ed31f9e52d2094c959d996c69beb903c6ce4a79c0e6afff33d6f7cec1
-MD5 1102d189865d80ac3da1cd76cdcef696 ChangeLog 28623
-RMD160 7d617344ac7acd5ca7f27686b6bbed54e7a9774e ChangeLog 28623
-SHA256 01e40a4ed31f9e52d2094c959d996c69beb903c6ce4a79c0e6afff33d6f7cec1 ChangeLog 28623
+EBUILD mesa-6.5-r3.ebuild 9242 RMD160 9a656b3a506faedd4c14ffc66542452d116d4cb8 SHA1 8cb4144d6be56c81d3d2f9b8b8224407a7bb3782 SHA256 8bcffe0d64dfc178691b2ce04828870f8cdb84095a167a2684a3222923040ecb
+MD5 73ad381b2c050d40145df9cdecd498b0 mesa-6.5-r3.ebuild 9242
+RMD160 9a656b3a506faedd4c14ffc66542452d116d4cb8 mesa-6.5-r3.ebuild 9242
+SHA256 8bcffe0d64dfc178691b2ce04828870f8cdb84095a167a2684a3222923040ecb mesa-6.5-r3.ebuild 9242
+EBUILD mesa-6.5.1-r1.ebuild 8583 RMD160 a6a1f027500fa122eede65ccd170c6681fc2805f SHA1 72174131f4134a12ad86d2d370b76767c4c19f92 SHA256 377028a68b584895b49b537366bad1861e789462d1fb60b6cdc802e47205927d
+MD5 00c04ec4939f29daf94a8bc8782ad4a5 mesa-6.5.1-r1.ebuild 8583
+RMD160 a6a1f027500fa122eede65ccd170c6681fc2805f mesa-6.5.1-r1.ebuild 8583
+SHA256 377028a68b584895b49b537366bad1861e789462d1fb60b6cdc802e47205927d mesa-6.5.1-r1.ebuild 8583
+EBUILD mesa-6.5.1-r4.ebuild 9389 RMD160 fcda3f33dc657d552b83d8da73a18a7733b9e8f2 SHA1 91965b6ddf61662e46b5948c12dc39a2175db753 SHA256 48cc6539425aa03d5373223264f90fd280a7eab66461d395640d1567918bf139
+MD5 0a48e0d468fb8813cbb43623fb7bd131 mesa-6.5.1-r4.ebuild 9389
+RMD160 fcda3f33dc657d552b83d8da73a18a7733b9e8f2 mesa-6.5.1-r4.ebuild 9389
+SHA256 48cc6539425aa03d5373223264f90fd280a7eab66461d395640d1567918bf139 mesa-6.5.1-r4.ebuild 9389
+EBUILD mesa-6.5.2-r1.ebuild 9091 RMD160 2e2c4aa5308fc82a8f17824c51446ef5cf709975 SHA1 7b8202d9b3721b407837bc0448e7b998d4174e38 SHA256 94de6a7d02cb0cc352aa102d1420accc7a0a10d04df3cc3285d99c990c460575
+MD5 f2d509664a52f28f5b0fd6f2e00483f0 mesa-6.5.2-r1.ebuild 9091
+RMD160 2e2c4aa5308fc82a8f17824c51446ef5cf709975 mesa-6.5.2-r1.ebuild 9091
+SHA256 94de6a7d02cb0cc352aa102d1420accc7a0a10d04df3cc3285d99c990c460575 mesa-6.5.2-r1.ebuild 9091
+EBUILD mesa-6.5.2.ebuild 9049 RMD160 be93750d9aeb90874c3a546e36a4cb4990e9c342 SHA1 81c657db6d11fa2a25b6b60dee23496afd6bd74f SHA256 e6ae50a751aacacdaf4b444a588645b05ec49f36dca942bb4bfcd355d53e254e
+MD5 de5c1657ea5ae852d9e51eb48c4a55cc mesa-6.5.2.ebuild 9049
+RMD160 be93750d9aeb90874c3a546e36a4cb4990e9c342 mesa-6.5.2.ebuild 9049
+SHA256 e6ae50a751aacacdaf4b444a588645b05ec49f36dca942bb4bfcd355d53e254e mesa-6.5.2.ebuild 9049
+EBUILD mesa-6.5.3.ebuild 9457 RMD160 722a34028e424887dc1919a258598dcb2dead89c SHA1 b9146499b691b2b8a82a5ac59efe2801a7118c7d SHA256 f5f68add069554c04636bdb4ebf2c2e8d3fcd2d6649f8e2834f6106b139b5256
+MD5 f3c3fd7d19052bca6e3bf9f1e46a0548 mesa-6.5.3.ebuild 9457
+RMD160 722a34028e424887dc1919a258598dcb2dead89c mesa-6.5.3.ebuild 9457
+SHA256 f5f68add069554c04636bdb4ebf2c2e8d3fcd2d6649f8e2834f6106b139b5256 mesa-6.5.3.ebuild 9457
+EBUILD mesa-7.0.1.ebuild 9264 RMD160 6cd43b5282f0e9ec911ad8d8e7fbed8449003cca SHA1 d2d0155ff2311dd14faced01811728ccba8c9b41 SHA256 568aeca1fb5d00d8ba14f1882f261ea035fd8cf63f2a4dfa91964a396531b697
+MD5 4ce395f9e3e126ed530ea4219af59470 mesa-7.0.1.ebuild 9264
+RMD160 6cd43b5282f0e9ec911ad8d8e7fbed8449003cca mesa-7.0.1.ebuild 9264
+SHA256 568aeca1fb5d00d8ba14f1882f261ea035fd8cf63f2a4dfa91964a396531b697 mesa-7.0.1.ebuild 9264
+MISC ChangeLog 28873 RMD160 71e6747bcb6672a921e5c9e7ba44615c72a153e1 SHA1 33ef6c4d4000e0132a20e408af21e17f16fe8a23 SHA256 2ef60e865db35310ff952281ff0dab287178328e56c4d8da65d01ced29e566a5
+MD5 ec7b691c1af6fd099bb4727fccf55f86 ChangeLog 28873
+RMD160 71e6747bcb6672a921e5c9e7ba44615c72a153e1 ChangeLog 28873
+SHA256 2ef60e865db35310ff952281ff0dab287178328e56c4d8da65d01ced29e566a5 ChangeLog 28873
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -112,3 +115,10 @@ SHA256 fa883ad916bf826b1e721083eeffcd8e67d692192038abf1e0bb16a0d6d6b1a6 files/di
 MD5 cce733a880751a9bfc49476307c38749 files/digest-mesa-7.0.1 247
 RMD160 d0a4dcc36fd9cbfb0dca31ceaf2c089e4305f709 files/digest-mesa-7.0.1 247
 SHA256 2983c69e2955a968552699bbd818a6b11551253fc6bf46a49e7c9bf4144177c4 files/digest-mesa-7.0.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHCzqnXVaO67S1rtsRAsl9AKDp4W1rbeyTVc6MXQEQMg12iu1UkgCg4bV6
+ROiZQ0lyTlHoBfRXnufL2fc=
+=r13O
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-6.5-r3.ebuild b/media-libs/mesa/mesa-6.5-r3.ebuild
index 5d36a5ec7352..5d81dd4058b9 100644
--- a/media-libs/mesa/mesa-6.5-r3.ebuild
+++ b/media-libs/mesa/mesa-6.5-r3.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/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.17 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.18 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -91,12 +91,12 @@ src_unpack() {
 	HOSTCONF="${S}/configs/${CONFIG}"
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
-	epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch
-	epatch ${FILESDIR}/6.4-multilib-fix.patch
-	epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
+	epatch "${FILESDIR}"/6.4-dont-install-gles-headers.patch
+	epatch "${FILESDIR}"/change-default-dri-driver-dir-X7.1.patch
+	epatch "${FILESDIR}"/6.4-multilib-fix.patch
+	epatch "${FILESDIR}"/6.5-re-order-context-destruction.patch
 
 	# Don't compile debug code with USE=-debug - bug #125004
 	if ! use debug; then
@@ -105,11 +105,11 @@ src_unpack() {
 	fi
 
 	# Set default dri drivers directory
-	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> ${HOSTCONF}
+	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
 	# Configurable DRI drivers
@@ -179,51 +179,51 @@ src_unpack() {
 	fi
 
 	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
 	# build.
-	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH =" >> "${HOSTCONF}"
 
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
+	rm -f "${S}"/include/GL/glut*h
 
 	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
+	echo "USING_EGL = 0" >> "${HOSTCONF}"
 
 	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
 	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+	echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
 
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 }
 
@@ -250,11 +250,11 @@ src_install() {
 	eend $?
 
 	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
 	fi
 
 	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
+	rm "${D}"/usr/include/GL/GLw*P.h
 
 	fix_opengl_symlinks
 	dynamic_libgl_install
@@ -262,17 +262,17 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in
 	# libc.so and does not require linking to libdl. portability eclass takes
 	# care of finding the needed library (if needed) witht the dlopen_lib
 	# function.
 	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# Create the two-number versioned libs (.so.#.#), since only .so.# and
 	# .so.#.#.# were made
@@ -293,7 +293,7 @@ pkg_postinst() {
 fix_opengl_symlinks() {
 	# Remove invalid symlinks
 	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
+	for LINK in $(find "${D}"/usr/$(get_libdir) \
 		-name libGL\.* -type l); do
 		rm -f ${LINK}
 	done
@@ -314,18 +314,18 @@ dynamic_libgl_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
+		for x in "${D}"/usr/$(get_libdir)/libGL.so* \
+			"${D}"/usr/$(get_libdir)/libGL.la \
+			"${D}"/usr/$(get_libdir)/libGL.a; do
+			if [[ -f ${x} || -L ${x} ]]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
 			fi
 		done
 		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
 			fi
 		done
 	eend 0
diff --git a/media-libs/mesa/mesa-6.5.1-r1.ebuild b/media-libs/mesa/mesa-6.5.1-r1.ebuild
index 82e971f9f37c..b3fd82bae8a2 100644
--- a/media-libs/mesa/mesa-6.5.1-r1.ebuild
+++ b/media-libs/mesa/mesa-6.5.1-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/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.16 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.17 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -99,7 +99,7 @@ src_unpack() {
 	unpack ${A}
 	# Fixes for bug #146892
 	epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch
-	cd ${S}
+	cd "${S}"
 	# FreeBSD 6.* doesn't have posix_memalign().
 	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
 
@@ -110,17 +110,17 @@ src_unpack() {
 	fi
 
 	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
 
 	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
 
 	# Configurable DRI drivers
 	if use video_cards_i810; then
@@ -161,51 +161,51 @@ src_unpack() {
 	fi
 
 	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
 
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
+	rm -f "${S}"/include/GL/glut*h
 
 	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
+	echo "USING_EGL = 0" >> "${HOSTCONF}"
 
 	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
 	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+	echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
 
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 }
 
@@ -222,11 +222,11 @@ src_install() {
 		install || die "Installation failed"
 
 	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
 	fi
 
 	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
+	rm "${D}"/usr/include/GL/GLw*P.h
 
 	fix_opengl_symlinks
 	dynamic_libgl_install
@@ -234,17 +234,17 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in
 	# libc.so and does not require linking to libdl. portability eclass takes
 	# care of finding the needed library (if needed) witht the dlopen_lib
 	# function.
 	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# Create the two-number versioned libs (.so.#.#), since only .so.# and
 	# .so.#.#.# were made
@@ -265,7 +265,7 @@ pkg_postinst() {
 fix_opengl_symlinks() {
 	# Remove invalid symlinks
 	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
+	for LINK in $(find "${D}"/usr/$(get_libdir) \
 		-name libGL\.* -type l); do
 		rm -f ${LINK}
 	done
@@ -286,18 +286,18 @@ dynamic_libgl_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
+		for x in "${D}"/usr/$(get_libdir)/libGL.so* \
+			"${D}"/usr/$(get_libdir)/libGL.la \
+			"${D}"/usr/$(get_libdir)/libGL.a; do
+			if [[ -f ${x} || -L ${x} ]]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
 			fi
 		done
 		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
 			fi
 		done
 	eend 0
diff --git a/media-libs/mesa/mesa-6.5.1-r4.ebuild b/media-libs/mesa/mesa-6.5.1-r4.ebuild
index ab252ff91d26..ead8e31887ca 100644
--- a/media-libs/mesa/mesa-6.5.1-r4.ebuild
+++ b/media-libs/mesa/mesa-6.5.1-r4.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/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.6 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.7 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -108,7 +108,7 @@ src_unpack() {
 	unpack ${A}
 	# Fixes for bug #146892
 	epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch
-	cd ${S}
+	cd "${S}"
 	# FreeBSD 6.* doesn't have posix_memalign().
 	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
 
@@ -131,21 +131,21 @@ src_unpack() {
 	fi
 
 	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
 
 	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
 	if use xcb; then
-		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
-		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+		echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
 	fi
 
 	# Configurable DRI drivers
@@ -187,51 +187,51 @@ src_unpack() {
 	fi
 
 	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
 
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
+	rm -f "${S}"/include/GL/glut*h
 
 	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
+	echo "USING_EGL = 0" >> "${HOSTCONF}"
 
 	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
 	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+	echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
 
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 }
 
@@ -248,11 +248,11 @@ src_install() {
 		install || die "Installation failed"
 
 	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
 	fi
 
 	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
+	rm "${D}"/usr/include/GL/GLw*P.h
 
 	fix_opengl_symlinks
 	dynamic_libgl_install
@@ -260,17 +260,17 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in
 	# libc.so and does not require linking to libdl. portability eclass takes
 	# care of finding the needed library (if needed) witht the dlopen_lib
 	# function.
 	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# Create the two-number versioned libs (.so.#.#), since only .so.# and
 	# .so.#.#.# were made
@@ -291,7 +291,7 @@ pkg_postinst() {
 fix_opengl_symlinks() {
 	# Remove invalid symlinks
 	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
+	for LINK in $(find "${D}"/usr/$(get_libdir) \
 		-name libGL\.* -type l); do
 		rm -f ${LINK}
 	done
@@ -312,18 +312,18 @@ dynamic_libgl_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
+		for x in "${D}"/usr/$(get_libdir)/libGL.so* \
+			"${D}"/usr/$(get_libdir)/libGL.la \
+			"${D}"/usr/$(get_libdir)/libGL.a; do
+			if [[ -f ${x} || -L ${x} ]]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
 			fi
 		done
 		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
 			fi
 		done
 	eend 0
diff --git a/media-libs/mesa/mesa-6.5.2-r1.ebuild b/media-libs/mesa/mesa-6.5.2-r1.ebuild
index c676d20e764d..f2c1cb6995bb 100644
--- a/media-libs/mesa/mesa-6.5.2-r1.ebuild
+++ b/media-libs/mesa/mesa-6.5.2-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/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.14 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.15 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -107,7 +107,7 @@ src_unpack() {
 	HOSTCONF="${S}/configs/${CONFIG}"
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${PV}-i965-wine-fix.patch"
 
@@ -121,21 +121,21 @@ src_unpack() {
 	fi
 
 	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
 
 	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
 	if use xcb; then
-		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
-		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+		echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
 	fi
 
 	# Configurable DRI drivers
@@ -177,51 +177,51 @@ src_unpack() {
 	fi
 
 	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
 
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
+	rm -f "${S}"/include/GL/glut*h
 
 	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
+	echo "USING_EGL = 0" >> "${HOSTCONF}"
 
 	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
 	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+	echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
 
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 }
 
@@ -238,11 +238,11 @@ src_install() {
 		install || die "Installation failed"
 
 	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
 	fi
 
 	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
+	rm "${D}"/usr/include/GL/GLw*P.h
 
 	fix_opengl_symlinks
 	dynamic_libgl_install
@@ -250,17 +250,17 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in
 	# libc.so and does not require linking to libdl. portability eclass takes
 	# care of finding the needed library (if needed) witht the dlopen_lib
 	# function.
 	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# Create the two-number versioned libs (.so.#.#), since only .so.# and
 	# .so.#.#.# were made
@@ -281,7 +281,7 @@ pkg_postinst() {
 fix_opengl_symlinks() {
 	# Remove invalid symlinks
 	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
+	for LINK in $(find "${D}"/usr/$(get_libdir) \
 		-name libGL\.* -type l); do
 		rm -f ${LINK}
 	done
@@ -302,18 +302,18 @@ dynamic_libgl_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
+		for x in "${D}"/usr/$(get_libdir)/libGL.so* \
+			"${D}"/usr/$(get_libdir)/libGL.la \
+			"${D}"/usr/$(get_libdir)/libGL.a; do
+			if [[ -f ${x} || -L ${x} ]]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
 			fi
 		done
 		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
 			fi
 		done
 	eend 0
diff --git a/media-libs/mesa/mesa-6.5.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild
index eebc5141d852..9200946b2a12 100644
--- a/media-libs/mesa/mesa-6.5.2.ebuild
+++ b/media-libs/mesa/mesa-6.5.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/media-libs/mesa/mesa-6.5.2.ebuild,v 1.8 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.9 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -107,7 +107,7 @@ src_unpack() {
 	HOSTCONF="${S}/configs/${CONFIG}"
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# FreeBSD 6.* doesn't have posix_memalign().
 	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
@@ -119,21 +119,21 @@ src_unpack() {
 	fi
 
 	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
 
 	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
 	if use xcb; then
-		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
-		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+		echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
 	fi
 
 	# Configurable DRI drivers
@@ -175,51 +175,51 @@ src_unpack() {
 	fi
 
 	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
 
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
+	rm -f "${S}"/include/GL/glut*h
 
 	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
+	echo "USING_EGL = 0" >> "${HOSTCONF}"
 
 	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
 	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+	echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
 
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 }
 
@@ -236,11 +236,11 @@ src_install() {
 		install || die "Installation failed"
 
 	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
 	fi
 
 	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
+	rm "${D}"/usr/include/GL/GLw*P.h
 
 	fix_opengl_symlinks
 	dynamic_libgl_install
@@ -248,17 +248,17 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in
 	# libc.so and does not require linking to libdl. portability eclass takes
 	# care of finding the needed library (if needed) witht the dlopen_lib
 	# function.
 	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# Create the two-number versioned libs (.so.#.#), since only .so.# and
 	# .so.#.#.# were made
@@ -279,7 +279,7 @@ pkg_postinst() {
 fix_opengl_symlinks() {
 	# Remove invalid symlinks
 	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
+	for LINK in $(find "${D}"/usr/$(get_libdir) \
 		-name libGL\.* -type l); do
 		rm -f ${LINK}
 	done
@@ -300,18 +300,18 @@ dynamic_libgl_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
+		for x in "${D}"/usr/$(get_libdir)/libGL.so* \
+			"${D}"/usr/$(get_libdir)/libGL.la \
+			"${D}"/usr/$(get_libdir)/libGL.a; do
+			if [[ -f ${x} || -L ${x} ]]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
 			fi
 		done
 		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
 			fi
 		done
 	eend 0
diff --git a/media-libs/mesa/mesa-6.5.3.ebuild b/media-libs/mesa/mesa-6.5.3.ebuild
index 7a12411f9477..cf9570c4d81a 100644
--- a/media-libs/mesa/mesa-6.5.3.ebuild
+++ b/media-libs/mesa/mesa-6.5.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/media-libs/mesa/mesa-6.5.3.ebuild,v 1.6 2007/08/12 05:12:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.7 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -112,7 +112,7 @@ src_unpack() {
 	HOSTCONF="${S}/configs/${CONFIG}"
 
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Bug #177329
 	epatch "${FILESDIR}/${P}-pthread.patch"
@@ -127,21 +127,21 @@ src_unpack() {
 	fi
 
 	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
 
 	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
 	if use xcb; then
-		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
-		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+		echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
 	fi
 
 	# Configurable DRI drivers
@@ -183,51 +183,51 @@ src_unpack() {
 	fi
 
 	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
 
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
+	rm -f "${S}"/include/GL/glut*h
 
 	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
+	echo "USING_EGL = 0" >> "${HOSTCONF}"
 
 	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
 	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+	echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
 
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 }
 
@@ -244,11 +244,11 @@ src_install() {
 		install || die "Installation failed"
 
 	if ! use motif; then
-		rm ${D}/usr/include/GL/GLwMDrawA.h
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
 	fi
 
 	# Don't install private headers
-	rm ${D}/usr/include/GL/GLw*P.h
+	rm "${D}"/usr/include/GL/GLw*P.h
 
 	fix_opengl_symlinks
 	dynamic_libgl_install
@@ -256,17 +256,17 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
-		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in
 	# libc.so and does not require linking to libdl. portability eclass takes
 	# care of finding the needed library (if needed) witht the dlopen_lib
 	# function.
 	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		${D}/usr/$(get_libdir)/libGLU.la \
-		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# Create the two-number versioned libs (.so.#.#), since only .so.# and
 	# .so.#.#.# were made
@@ -290,7 +290,7 @@ pkg_postinst() {
 fix_opengl_symlinks() {
 	# Remove invalid symlinks
 	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
+	for LINK in $(find "${D}"/usr/$(get_libdir) \
 		-name libGL\.* -type l); do
 		rm -f ${LINK}
 	done
@@ -311,18 +311,18 @@ dynamic_libgl_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
+		for x in "${D}"/usr/$(get_libdir)/libGL.so* \
+			"${D}"/usr/$(get_libdir)/libGL.la \
+			"${D}"/usr/$(get_libdir)/libGL.a; do
+			if [[ -f ${x} || -L ${x} ]]; then
 				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
 			fi
 		done
 		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
 			fi
 		done
 	eend 0
diff --git a/media-libs/mesa/mesa-7.0.1.ebuild b/media-libs/mesa/mesa-7.0.1.ebuild
index 5d35341dea54..7859b6162593 100644
--- a/media-libs/mesa/mesa-7.0.1.ebuild
+++ b/media-libs/mesa/mesa-7.0.1.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/media-libs/mesa/mesa-7.0.1.ebuild,v 1.1 2007/08/11 08:47:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.2 2007/10/09 08:23:57 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -124,21 +124,21 @@ src_unpack() {
 	fi
 
 	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
 
 	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
 
 	# Do we want thread-local storage (TLS)?
 	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
 	fi
 
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
 	if use xcb; then
-		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
-		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+		echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
 	fi
 
 	# Configurable DRI drivers
@@ -156,34 +156,34 @@ src_unpack() {
 	driver_enable video_cards_via unichrome
 
 	# Set drivers to everything on which we ran driver_enable()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
 
 	if use hardened; then
 		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
+		echo "ASM_API =" >> "${HOSTCONF}"
 	fi
 
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_FLAGS =" >> "${HOSTCONF}"
+		echo "ASM_SOURCES =" >> "${HOSTCONF}"
 	fi
 
 	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
 
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
+	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
+	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
+	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
 	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+	echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
 
 	# Removed glut, since we have separate freeglut/glut ebuilds
 	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
 
 	# Get rid of glut includes
 	rm -f "${S}"/include/GL/glut*h
@@ -191,15 +191,15 @@ src_unpack() {
 	# Documented in configs/default
 	if use motif; then
 		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
 		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
 	fi
 
 	# Shut up pointless warnings
-#	echo "MKDEP = gcc -M" >> ${HOSTCONF}
-#	echo "MKDEP_OPTIONS = -MF depend" >> ${HOSTCONF}
-	echo "MKDEP_OPTIONS = -fdepend -I$(gcc-config -L)/include" >> ${HOSTCONF}
+#	echo "MKDEP = gcc -M" >> "${HOSTCONF}"
+#	echo "MKDEP_OPTIONS = -MF depend" >> "${HOSTCONF}"
+	echo "MKDEP_OPTIONS = -fdepend -I$(gcc-config -L)/include" >> "${HOSTCONF}"
 }
 
 src_compile() {
@@ -227,8 +227,8 @@ src_install() {
 	# Install libtool archives
 	insinto /usr/$(get_libdir)
 	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
+	doins "${FILESDIR}"/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
 		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
 
 	# On *BSD libcs dlopen() and similar functions are present directly in