Patch to compile with gcc-4.3.3, thanks to Magnus Granberg, closes bug #232102. Fixed repoman warnings galore.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

6 files changed, 89 insertions, 68 deletions

diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index e905a61951bb..9e1cc4d1154c 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libstdc++-v3
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.55 2009/02/01 22:51:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.56 2009/02/05 04:12:56 je_fro Exp $
+
+  05 Feb 2009; Jeff Gardner <je_fro@gentoo.org>
+  +files/libstdc++-v3-open_missing_mode.patch, libstdc++-v3-3.3.6.ebuild:
+  Patch to compile with gcc-4.3.3, thanks to Magnus Granberg, closes bug
+  #232102. Fixed repoman warnings galore.
 
   01 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
   libstdc++-v3-3.3.3-r1.ebuild, libstdc++-v3-3.3.4.ebuild,
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 98fc6d088e08..b1198027aa09 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,9 +1,10 @@
+AUX libstdc++-v3-open_missing_mode.patch 580 RMD160 eb4c35abea58a911efd859ba6514fb1697bcb3f4 SHA1 787b6e40d34e5cffe0df70fa4b2e86928da5357a SHA256 92aeb209304af3f5506aad3ddc0c89d9e231fc68f24ec5d20850af38a40317bf
 AUX libstdc++_amd64_multilib_hack.patch 350 RMD160 c2c906288b4e8076e807b4ac4d26c8ff8e6ad504 SHA1 64a2d8fcfbc3f97ae689d1c3ecfe93eb7bb0a56b SHA256 00429f6904da7dfdf9bd1d94f5a0baec03026a057b72ad3ae808f5040f0b02dd
 DIST gcc-3.3.3.tar.bz2 23279245 RMD160 3b5ba141491781626170ca530963b25976b42a99 SHA1 a9efbc34c5dd7fc48f7d700461de4fc014968cab SHA256 9ac6618495b7dd2ff0cd50abd76fe3c51287efcc724340687407f9fc250bdc6a
 DIST gcc-3.3.4.tar.bz2 23331664 RMD160 c6ba864feb97f0e00b2d9034f491188ca32abbf5 SHA1 f1690df8d2f0c60ada0c8d0c9c350063aa00f705 SHA256 3f409186acee739641341e5486e30ea9acecc039452e97a9eb850afbc6c3a691
 DIST gcc-3.3.6.tar.bz2 23972413 RMD160 b32c7a08c690857f0ac52dda3deb47cf5775d967 SHA1 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f
-EBUILD libstdc++-v3-3.3.3-r1.ebuild 7907 RMD160 2b89f9fb5a5aa7eb88acc19677520579f07a47ff SHA1 80e96d69bf512a3b5529531cf34e2b4c9026f6d6 SHA256 84b30bf6e81b7aaf7579c5f37671af849ca8f0946dfe2037150a3d2bf7a7afad
-EBUILD libstdc++-v3-3.3.4.ebuild 8311 RMD160 e4a10916263bc30cdb2e64542cc295433ac6f5d7 SHA1 2eb111f60286803b036c472ae7eca89230a938bd SHA256 32324e0805243649d19d2349e6f4bd88caef52c2e04de3e222798d2b8a32528d
-EBUILD libstdc++-v3-3.3.6.ebuild 8328 RMD160 23cfc7d1aeed5fc56b9fb8db92e055dade582220 SHA1 646b5027cba1a6603d116418daacf3bb81610dd1 SHA256 55e3e13c76d6275bed07fba846b4341f97d161c8848d91b5c0ebc19a56d6ab16
-MISC ChangeLog 8242 RMD160 a4a9008c600fa5e5d867506a27b7f8b1c39305ee SHA1 72bd96fba1094917a0eefcda84bb0d556b239706 SHA256 95de0ac0e77616d28f3233fb46121ab0eb0fba6a6295d27c733d201fdb487fb3
+EBUILD libstdc++-v3-3.3.3-r1.ebuild 7946 RMD160 6c2473450808b18b4301658ec0a1b100d5f87788 SHA1 a5b5d5bfb1871ca2747a7dde4a16dad08299a4d2 SHA256 d2f79334c52f163527ccd342aaefd4650ac148a984c13b8ec7bc6b35b97fd411
+EBUILD libstdc++-v3-3.3.4.ebuild 8352 RMD160 9acd9cb0a96645a294d8d0d4402fe606f50cee59 SHA1 5880218dd4a66ed44762c6dd70a13e9dbfe1713c SHA256 9b35d92a25a7d9babaa31c4292b88a403419afa86a9d28fe7de34c85d9c6f9db
+EBUILD libstdc++-v3-3.3.6.ebuild 8453 RMD160 02bb4f5d52d5ed06a3af0af6c3fc4b5e0cb21b7b SHA1 87e18c3f8332be6032e8a1cf0cb458ea86f91e06 SHA256 e2ef7fd2de4f689a10a9a8b6d776eb62db86e382067849ebf2621dda708f3881
+MISC ChangeLog 8477 RMD160 1b675815e6fed64aee13facbee2d240f298a2fce SHA1 c039712e40f74994aa1d6d2ade7d4006ea97a07e SHA256 60818eb4575f0f87c4f5f68b5992379c4640e3d2fb33f4af22159b0f5cc42f18
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch
new file mode 100644
index 000000000000..610fae2bb39b
--- /dev/null
+++ b/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch
@@ -0,0 +1,12 @@
+diff -Nru /var/tmp/portage/sys-libs/libstdc++-v3-3.3.6/work/gcc-3.3.6/gcc/collect2.c /root/hardened/gcc-3.3.6/gcc/collect2.c
+--- /gcc-3.3.6/gcc/collect2.c	2003-12-08 20:02:39.000000000 +0100
++++ /gcc-3.3.6/gcc/collect2.c	2008-06-19 01:04:21.000000000 +0200
+@@ -1572,7 +1572,7 @@
+   if (redir)
+     {
+       /* Open response file.  */
+-      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT);
++      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR);
+ 
+       /* Duplicate the stdout and stderr file handles
+ 	 so they can be restored later.  */
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
index 4877a1708bdd..341eb96a7b79 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.43 2009/02/01 22:51:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.44 2009/02/05 04:12:56 je_fro Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -151,16 +151,16 @@ PDEPEND="sys-devel/gcc-config"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
-	use amd64 && epatch ${FILESDIR}/libstdc++_amd64_multilib_hack.patch
+	use amd64 && epatch "${FILESDIR}"/libstdc++_amd64_multilib_hack.patch
 
 	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+	cp -a "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
+	cd "${S}"; ./contrib/gcc_update --touch &> /dev/null
 	gnuconfig_update
 }
 
@@ -182,12 +182,12 @@ src_compile() {
 	einfo "CXXFLAGS=\"${CXXFLAGS}\""
 
 	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
 
 	einfo "Configuring libstdc++..."
 	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
+	"${S}"/configure --prefix=${LOC} \
 		--bindir=${BINPATH} \
 		--includedir=${LIBPATH}/include \
 		--datadir=${DATAPATH} \
@@ -208,7 +208,7 @@ src_compile() {
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
-	touch ${S}/gcc/c-gperf.h
+	touch "${S}"/gcc/c-gperf.h
 
 	einfo "Compiling libstdc++..."
 	S="${WORKDIR}/build" \
@@ -222,7 +222,7 @@ src_install() {
 
 	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
 	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
+	for x in "${WORKDIR}"/build/gcc/include/*
 	do
 		if [ -L ${x} ]
 		then
@@ -232,7 +232,7 @@ src_install() {
 	done
 	# Remove generated headers, as they can cause things to break
 	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
+	for x in `find "${WORKDIR}"/build/gcc/include/ -name '*.h'`
 	do
 		if grep -q 'It has been auto-edited by fixincludes from' ${x}
 		then
@@ -242,8 +242,8 @@ src_install() {
 
 	einfo "Installing libstdc++..."
 	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
-	S="${WORKDIR}/build" \
+	cd "${WORKDIR}"/build
+	S="${WORKDIR}"/build \
 	make prefix=${LOC} \
 		bindir=${BINPATH} \
 		includedir=${LIBPATH}/include \
@@ -257,24 +257,24 @@ src_install() {
 	# we'll move this into a directory we can put at the end of ld.so.conf
 	# other than the normal versioned directory, so that it doesnt conflict
 	# with gcc 3.3.3
-	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
-	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
+	mkdir -p "${D}"/${LOC}/lib/libstdc++-v3/
+	mv "${D}"/${LIBPATH}/lib* "${D}"/${LOC}/lib/libstdc++-v3/
 	# we dont want the headers...
-	rm -rf ${D}/${LOC}/lib/gcc*
+	rm -rf "${D}"/${LOC}/lib/gcc*
 	# or locales...
-	rm -rf ${D}/${LOC}/share
+	rm -rf "${D}"/${LOC}/share
 	# or anything other than the .so files, really.
-	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
+	find "${D}" | grep -e c++.la$ -e c++.a$ | xargs rm -f
 	# we dont even want the un-versioned .so symlink, as it confuses some
 	# apps and also causes others to link against the old libstdc++...
-	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
+	rm "${D}"/${LOC}/lib/libstdc++-v3/libstdc++.so
 
 	# and it's much easier to just move around the result than it is to
 	# configure libstdc++-v3 to use CONF_LIDIR
 	if [ "$(get_libdir)" != "lib" ] ; then
-		mv ${D}/${LOC}/lib ${D}/${LOC}/$(get_libdir)
+		mv "${D}"/${LOC}/lib "${D}"/${LOC}/$(get_libdir)
 	fi
 
-	mkdir -p ${D}/etc/env.d/
+	mkdir -p "${D}"/etc/env.d/
 	echo "LDPATH=\"${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
 }
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
index 7f33032bf6c8..87869f72ddea 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.26 2009/02/01 22:51:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.27 2009/02/05 04:12:56 je_fro Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -157,21 +157,21 @@ PDEPEND="sys-devel/gcc-config"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
 	if (has_multilib_profile || use multilib) ; then
 		sed -i \
 			-e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \
-			${S}/gcc/config/i386/t-linux64 \
+			"${S}"/gcc/config/i386/t-linux64 \
 			|| die "sed failed!"
 	fi
 
 	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+	cp -a "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
+	cd "${S}"; ./contrib/gcc_update --touch &> /dev/null
 	gnuconfig_update
 }
 
@@ -193,12 +193,12 @@ src_compile() {
 	einfo "CXXFLAGS=\"${CXXFLAGS}\""
 
 	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
 
 	einfo "Configuring libstdc++..."
 	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
+	"${S}"/configure --prefix=${LOC} \
 		--bindir=${BINPATH} \
 		--includedir=${LIBPATH}/include \
 		--datadir=${DATAPATH} \
@@ -219,7 +219,7 @@ src_compile() {
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
-	touch ${S}/gcc/c-gperf.h
+	touch "${S}"/gcc/c-gperf.h
 
 	einfo "Compiling libstdc++..."
 	S="${WORKDIR}/build" \
@@ -233,7 +233,7 @@ src_install() {
 
 	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
 	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
+	for x in "${WORKDIR}"/build/gcc/include/*
 	do
 		if [ -L ${x} ]
 		then
@@ -243,7 +243,7 @@ src_install() {
 	done
 	# Remove generated headers, as they can cause things to break
 	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
+	for x in `find "${WORKDIR}"/build/gcc/include/ -name '*.h'`
 	do
 		if grep -q 'It has been auto-edited by fixincludes from' ${x}
 		then
@@ -253,7 +253,7 @@ src_install() {
 
 	einfo "Installing libstdc++..."
 	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
+	cd "${WORKDIR}"/build
 	S="${WORKDIR}/build" \
 	make prefix=${LOC} \
 		bindir=${BINPATH} \
@@ -268,24 +268,24 @@ src_install() {
 	# we'll move this into a directory we can put at the end of ld.so.conf
 	# other than the normal versioned directory, so that it doesnt conflict
 	# with gcc 3.3.3
-	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
-	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
+	mkdir -p "${D}"/${LOC}/lib/libstdc++-v3/
+	mv "${D}"/${LIBPATH}/lib* "${D}"/${LOC}/lib/libstdc++-v3/
 	# we dont want the headers...
-	rm -rf ${D}/${LOC}/lib/gcc*
+	rm -rf "${D}"/${LOC}/lib/gcc*
 	# or locales...
-	rm -rf ${D}/${LOC}/share
+	rm -rf "${D}"/${LOC}/share
 	# or anything other than the .so files, really.
-	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
+	find "${D}" | grep -e c++.la$ -e c++.a$ | xargs rm -f
 	# we dont even want the un-versioned .so symlink, as it confuses some
 	# apps and also causes others to link against the old libstdc++...
-	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
+	rm "${D}"/${LOC}/lib/libstdc++-v3/libstdc++.so
 
 	# and it's much easier to just move around the result than it is to
 	# configure libstdc++-v3 to use CONF_LIDIR
 	if [ "$(get_libdir)" != "lib" ] ; then
-		mv ${D}/${LOC}/lib ${D}/${LOC}/$(get_libdir)
+		mv "${D}"/${LOC}/lib "${D}"/${LOC}/$(get_libdir)
 	fi
 
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LOC}/$(get_libdir)/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
+	mkdir -p "${D}"/etc/env.d/
+	echo "LDPATH=\"${LOC}/$(get_libdir)/libstdc++-v3/\"" >> "${D}"/etc/env.d/99libstdc++
 }
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
index 20ae4c40ae02..4087f68bb076 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.19 2009/02/01 22:51:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.20 2009/02/05 04:12:56 je_fro Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -157,21 +157,24 @@ PDEPEND="sys-devel/gcc-config"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/libstdc++-v3-open_missing_mode.patch || die "epatch failed"
+
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
 	if (has_multilib_profile || use multilib) ; then
 		sed -i \
 			-e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \
-			${S}/gcc/config/i386/t-linux64 \
+			"${S}"/gcc/config/i386/t-linux64 \
 			|| die "sed failed!"
 	fi
 
 	# Misdesign in libstdc++ (Redhat)
-	cp -pPR ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+	cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
+	cd "${S}"; ./contrib/gcc_update --touch &> /dev/null
 	gnuconfig_update
 }
 
@@ -193,12 +196,12 @@ src_compile() {
 	einfo "CXXFLAGS=\"${CXXFLAGS}\""
 
 	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
 
 	einfo "Configuring libstdc++..."
 	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
+	"${S}"/configure --prefix=${LOC} \
 		--bindir=${BINPATH} \
 		--includedir=${LIBPATH}/include \
 		--datadir=${DATAPATH} \
@@ -219,7 +222,7 @@ src_compile() {
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
-	touch ${S}/gcc/c-gperf.h
+	touch "${S}"/gcc/c-gperf.h
 
 	einfo "Compiling libstdc++..."
 	S="${WORKDIR}/build" \
@@ -233,7 +236,7 @@ src_install() {
 
 	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
 	# this can break the build.
-	for x in ${WORKDIR}/build/gcc/include/*
+	for x in "${WORKDIR}"/build/gcc/include/*
 	do
 		if [ -L ${x} ]
 		then
@@ -243,7 +246,7 @@ src_install() {
 	done
 	# Remove generated headers, as they can cause things to break
 	# (ncurses, openssl, etc).
-	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
+	for x in `find "${WORKDIR}"/build/gcc/include/ -name '*.h'`
 	do
 		if grep -q 'It has been auto-edited by fixincludes from' ${x}
 		then
@@ -253,7 +256,7 @@ src_install() {
 
 	einfo "Installing libstdc++..."
 	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
+	cd "${WORKDIR}"/build
 	S="${WORKDIR}/build" \
 	make prefix=${LOC} \
 		bindir=${BINPATH} \
@@ -268,24 +271,24 @@ src_install() {
 	# we'll move this into a directory we can put at the end of ld.so.conf
 	# other than the normal versioned directory, so that it doesnt conflict
 	# with gcc 3.3.3
-	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
-	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
+	mkdir -p "${D}"/${LOC}/lib/libstdc++-v3/
+	mv "${D}"/${LIBPATH}/lib* "${D}"/${LOC}/lib/libstdc++-v3/
 	# we dont want the headers...
-	rm -rf ${D}/${LOC}/lib/gcc*
+	rm -rf "${D}"/${LOC}/lib/gcc*
 	# or locales...
-	rm -rf ${D}/${LOC}/share
+	rm -rf "${D}"/${LOC}/share
 	# or anything other than the .so files, really.
-	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
+	find "${D}" | grep -e c++.la$ -e c++.a$ | xargs rm -f
 	# we dont even want the un-versioned .so symlink, as it confuses some
 	# apps and also causes others to link against the old libstdc++...
-	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
+	rm "${D}"/${LOC}/lib/libstdc++-v3/libstdc++.so
 
 	# and it's much easier to just move around the result than it is to
 	# configure libstdc++-v3 to use CONF_LIDIR
 	if [ "$(get_libdir)" != "lib" ] ; then
-		mv ${D}/${LOC}/lib ${D}/${LOC}/$(get_libdir)
+		mv "${D}"/${LOC}/lib "${D}"/${LOC}/$(get_libdir)
 	fi
 
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LOC}/$(get_libdir)/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
+	mkdir -p "${D}"/etc/env.d/
+	echo "LDPATH=\"${LOC}/$(get_libdir)/libstdc++-v3/\"" >> "${D}"/etc/env.d/99libstdc++
 }