Fix quoting issues caught by latest repoman.

(Portage version: 2.1.3.12)

8 files changed, 287 insertions, 282 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/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