Repoman talks too much.

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

14 files changed, 217 insertions, 201 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 98f72a2a295e..4a83f427a12d 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.817 2011/07/20 06:40:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.818 2011/07/20 08:58:35 dirtyepic Exp $
+
+  20 Jul 2011; Ryan Hill <dirtyepic@gentoo.org> gcc-2.95.3-r9.ebuild,
+  gcc-2.95.3-r10.ebuild, gcc-3.1.1-r2.ebuild, gcc-3.2.2.ebuild,
+  gcc-3.2.3-r4.ebuild, gcc-3.3.6-r1.ebuild, gcc-3.4.6-r2.ebuild,
+  gcc-4.0.4.ebuild, gcc-4.1.2.ebuild, gcc-4.2.4-r1.ebuild, gcc-4.3.3-r2.ebuild,
+  gcc-4.4.2.ebuild, gcc-4.4.3-r3.ebuild:
+  Repoman talks too much.
 
 *gcc-4.4.6 (20 Jul 2011)
 
diff --git a/sys-devel/gcc/gcc-2.95.3-r10.ebuild b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
index e54d0c287506..93a7972c0879 100644
--- a/sys-devel/gcc/gcc-2.95.3-r10.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.4 2008/03/20 20:39:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.5 2011/07/20 08:58:35 dirtyepic Exp $
 
 PATCH_VER="1.3"
 SPLIT_SPECS="no"
@@ -11,6 +11,7 @@ inherit toolchain eutils flag-o-matic
 DESCRIPTION="The GNU Compiler Collection"
 
 KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
diff --git a/sys-devel/gcc/gcc-2.95.3-r9.ebuild b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
index 71414f8e96ad..4f0bb69c72cc 100644
--- a/sys-devel/gcc/gcc-2.95.3-r9.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.7 2008/03/20 20:39:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.8 2011/07/20 08:58:35 dirtyepic Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator fixheadtails gnuconfig
 
@@ -53,7 +53,7 @@ DATAPATH="${LOC}/share/gcc-data/${CTARGET}/${GCC_BRANCH_VER}"
 STDCXX_INCDIR="${LIBPATH}/include/g++"
 
 PATCH_VER=1.2
-DESCRIPTION="Modern C/C++ compiler written by the GNU people"
+DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="http://gcc.gnu.org/"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
@@ -150,9 +150,9 @@ src_compile() {
 		${EXTRA_ECONF}"
 	echo ./configure "${myconf}"
 	addwrite "/dev/zero"
-	${S}/configure ${myconf} || die "configure failed"
+	"${S}"/configure ${myconf} || die "configure failed"
 
-	touch ${S}/gcc/c-gperf.h
+	touch "${S}"/gcc/c-gperf.h
 
 	if ! use static ; then
 		# Fix for our libtool-portage.patch
@@ -171,12 +171,12 @@ src_compile() {
 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/* ; do
+	for x in "${WORKDIR}"/build/gcc/include/* ; do
 		[[ -L ${x} ]] && rm -f "${x}"
 	done
 
 	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
+	cd "${WORKDIR}"/build
 	S="${WORKDIR}/build" \
 	make \
 		prefix=${D}${LOC} \
@@ -192,7 +192,7 @@ src_install() {
 
 	dodir /lib /usr/bin
 	dodir /etc/env.d/gcc
-	cat << EOF > ${D}/etc/env.d/gcc/${CTARGET}-${GCC_RELEASE_VER}
+	cat << EOF > "${D}"/etc/env.d/gcc/${CTARGET}-${GCC_RELEASE_VER}
 PATH="${BINPATH}"
 ROOTPATH="${BINPATH}"
 LDPATH="${LIBPATH}"
@@ -207,7 +207,7 @@ EOF
 		cd "${D}"${LIBPATH}
 
 		# Tell libtool files where real libraries are
-		for LA in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la ; do
+		for LA in "${D}"${LOC}/lib/*.la "${D}"${LIBPATH}/../*.la ; do
 			if [[ -f ${LA} ]] ; then
 				sed -i -e "s:/usr/lib:${LIBPATH}:" "${LA}"
 				mv "${LA}" "${D}"${LIBPATH}
@@ -215,7 +215,7 @@ EOF
 		done
 
 		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}* ; do
+		for x in "${D}"${LOC}/lib/*.{so,a}* "${D}"${LIBPATH}/../*.{so,a}* ; do
 			[[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}
 		done
 
@@ -233,28 +233,28 @@ EOF
 	fi
 
 	# This one comes with binutils
-	rm -f ${D}${LOC}/lib/libiberty.a
+	rm -f "${D}"${LOC}/lib/libiberty.a
 
-	cd ${S}
+	cd "${S}"
 	if use build ; then
 		rm -r "${D}"/usr/share/{man,info}
 		rm -r "${D}"/${DATAPATH}/{man,info}
 	elif ! has nodoc ${FEATURES} ; then
-		cd ${S}
+		cd "${S}"
 		docinto /
 		dodoc README* FAQ MAINTAINERS
 		docinto html
 		dodoc faq.html
 		docinto gcc
-		cd ${S}/gcc
+		cd "${S}"/gcc
 		dodoc BUGS ChangeLog* FSFChangeLog* LANGUAGES NEWS PROBLEMS README* SERVICE TESTS.FLUNK
-		cd ${S}/libchill
+		cd "${S}"/libchill
 		docinto libchill
 		dodoc ChangeLog
-		cd ${S}/libf2c
+		cd "${S}"/libf2c
 		docinto libf2c
 		dodoc ChangeLog changes.netlib README TODO
-		cd ${S}/libio
+		cd "${S}"/libio
 		docinto libio
 		dodoc ChangeLog NEWS README
 		cd dbz
@@ -263,10 +263,10 @@ EOF
 		cd ../stdio
 		docinto libio/stdio
 		dodoc ChangeLog*
-		cd ${S}/libobjc
+		cd "${S}"/libobjc
 		docinto libobjc
 		dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++
+		cd "${S}"/libstdc++
 		docinto libstdc++
 		dodoc ChangeLog NEWS
 	fi
diff --git a/sys-devel/gcc/gcc-3.1.1-r2.ebuild b/sys-devel/gcc/gcc-3.1.1-r2.ebuild
index d018bc84a88a..bfd6da86cf55 100644
--- a/sys-devel/gcc/gcc-3.1.1-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r2.ebuild,v 1.11 2009/09/23 21:28:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.1-r2.ebuild,v 1.12 2011/07/20 08:58:35 dirtyepic Exp $
 
 # NOTE TO MAINTAINER:  Info pages get nuked for multiple version installs.
 #                      Ill fix it later if i get a chance.
@@ -26,7 +26,7 @@ LOC="/usr"
 # dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs
 STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}"
 
-DESCRIPTION="Modern GCC C/C++ compiler"
+DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="http://gcc.gnu.org/"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
 	http://www.ibiblio.org/gentoo/distfiles/${P}_final-patches-1.0.tbz2"
@@ -67,14 +67,14 @@ FAKE_ROOT=""
 src_unpack() {
 	unpack ${P}.tar.bz2
 
-	cd ${S}
+	cd "${S}"
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
-	mkdir -p ${WORKDIR}/patch
-	tar -jxf ${DISTDIR}/${P}_final-patches-1.0.tbz2 -C ${WORKDIR}/patch \
+	mkdir -p "${WORKDIR}"/patch
+	tar -jxf "${DISTDIR}"/${P}_final-patches-1.0.tbz2 -C "${WORKDIR}"/patch \
 		|| die "Could not unpack patches"
-	for f in ${WORKDIR}/patch/*.patch ; do
+	for f in "${WORKDIR}"/patch/*.patch ; do
 		epatch ${f}
 	done
 
@@ -82,7 +82,7 @@ src_unpack() {
 	# installing into ${D}.  We should not patch it in src_install() with
 	# absolute paths, as some modules then gets rebuild with the wrong
 	# paths.  Thus we use $FAKE_ROOT.
-	cd ${S}
+	cd "${S}"
 	for x in $(find . -name Makefile.in)
 	do
 #		cp ${x} ${x}.orig
@@ -134,11 +134,11 @@ src_compile() {
 	do_filter_flags
 
 	#build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
 
 	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
+	"${S}"/configure --prefix=${LOC} \
 		--mandir=${LOC}/share/man \
 		--infodir=${LOC}/share/info \
 		--enable-shared \
@@ -157,7 +157,7 @@ src_compile() {
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
-	touch ${S}/gcc/c-gperf.h
+	touch "${S}"/gcc/c-gperf.h
 
 	if ! use static
 	then
@@ -172,12 +172,12 @@ src_compile() {
 
 src_install() {
 	#make install from the build directory
-	cd ${WORKDIR}/build
+	cd "${WORKDIR}"/build
 	S="${WORKDIR}/build" \
-	make prefix=${D}${LOC} \
-		mandir=${D}${LOC}/share/man \
-		infodir=${D}${LOC}/share/info \
-		FAKE_ROOT=${D} \
+	make prefix="${D}"${LOC} \
+		mandir="${D}"${LOC}/share/man \
+		infodir="${D}"${LOC}/share/info \
+		FAKE_ROOT="${D}" \
 		install || die
 
 	if ! build_multiple
@@ -185,16 +185,16 @@ src_install() {
 		GCC_SUFFIX=""
 	fi
 
-	[ -e ${D}${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}"
+	[ -e "${D}"${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}"
 
 	FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}
 	FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
-	cd ${FULLPATH_D}
+	cd "${FULLPATH_D}"
 	dodir /lib
 	dodir /etc/env.d
-	echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX}
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/05gcc${GCC_SUFFIX}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/05gcc${GCC_SUFFIX}
+	echo "LDPATH=${FULLPATH}" > "${D}"/etc/env.d/05gcc${GCC_SUFFIX}
+	echo "CC=\"gcc\"" >> "${D}"/etc/env.d/05gcc${GCC_SUFFIX}
+	echo "CXX=\"g++\"" >> "${D}"/etc/env.d/05gcc${GCC_SUFFIX}
 	if ! build_multiple
 	then
 		dosym /usr/bin/cpp /lib/cpp
@@ -211,135 +211,135 @@ src_install() {
 	#
 	# Azarah - 3 Jul 2002
 	#
-	cd ${FULLPATH_D}
+	cd "${FULLPATH_D}"
 	dosed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" \
-		${FULLPATH}/specs
+		"${FULLPATH}"/specs
 
 	#make sure we dont have stuff lying around that
 	#can nuke multiple versions of gcc
 	if ! use build
 	then
-		cd ${FULLPATH_D}
+		cd "${FULLPATH_D}"
 
 		#Tell libtool files where real libraries are
-		for LA in ${D}${LOC}/lib/*.la ${FULLPATH_D}/../*.la
+		for LA in "${D}"${LOC}/lib/*.la "${FULLPATH_D}"/../*.la
 		do
 			if [ -f ${LA} ]
 			then
 				sed -e "s:/usr/lib:${FULLPATH}:" ${LA} > ${LA}.hacked
 				mv ${LA}.hacked ${LA}
-				mv ${LA} ${FULLPATH_D}
+				mv ${LA} "${FULLPATH_D}"
 			fi
 		done
 
 		#move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}*
+		for x in "${D}"${LOC}/lib/*.{so,a}* "${FULLPATH_D}"/../*.{so,a}*
 		do
-			[ -f ${x} ] && mv -f ${x} ${FULLPATH_D}
+			[ -f ${x} ] && mv -f ${x} "${FULLPATH_D}"
 		done
 
 		#move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
+		for x in "${D}"${LOC}/include/gc*.h "${D}"${LOC}/include/j*.h
 		do
-			[ -f ${x} ] && mv -f ${x} ${FULLPATH_D}/include/
+			[ -f ${x} ] && mv -f ${x} "${FULLPATH_D}"/include/
 		done
 		for x in gcj gnu java javax org
 		do
-			if [ -d ${D}${LOC}/include/${x} ]
+			if [ -d "${D}"${LOC}/include/${x} ]
 			then
-				mkdir -p ${FULLPATH_D}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
+				mkdir -p "${FULLPATH_D}"/include/${x}
+				mv -f "${D}"${LOC}/include/${x}/* "${FULLPATH_D}"/include/${x}/
+				rm -rf "${D}"${LOC}/include/${x}
 			fi
 		done
 
 		#move libgcj.spec to compiler-specific directories
-		[ -f ${D}${LOC}/lib/libgcj.spec ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec
+		[ -f "${D}"${LOC}/lib/libgcj.spec ] && \
+			mv -f "${D}"${LOC}/lib/libgcj.spec "${FULLPATH_D}"/libgcj.spec
 
 		#rename jar because it could clash with Kaffe's jar if this gcc is
 		#primary compiler (aka don't have the -<version> extension)
-		cd ${D}${LOC}/bin
+		cd "${D}"${LOC}/bin
 		[ -f jar${GCC_SUFFIX} ] && mv -f jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
 
 		#move <cxxabi.h> to compiler-specific directories
-		[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/
+		[ -f "${D}"${STDCXX_INCDIR}/cxxabi.h ] && \
+			mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${FULLPATH_D}"/include/
 
 		if build_multiple
 		then
 			#now fix the manpages
-			cd ${D}${LOC}/share/man/man1
+			cd "${D}"${LOC}/share/man/man1
 			mv cpp.1 cpp${GCC_SUFFIX}.1
 			mv gcov.1 gcov${GCC_SUFFIX}.1
 		fi
 	fi
 
 	#this one comes with binutils
-	if [ -f ${D}${LOC}/lib/libiberty.a ]
+	if [ -f "${D}"${LOC}/lib/libiberty.a ]
 	then
-		rm -f ${D}${LOC}/lib/libiberty.a
+		rm -f "${D}"${LOC}/lib/libiberty.a
 	fi
 
-	cd ${S}
+	cd "${S}"
 	if ! use build
 	then
-		cd ${S}
+		cd "${S}"
 		docinto /
 		dodoc ChangeLog LAST_UPDATED README MAINTAINERS
-		cd ${S}/boehm-gc
+		cd "${S}"/boehm-gc
 		docinto boehm-gc
 		dodoc ChangeLog doc/{README*,barrett_diagram}
 		docinto boehm-gc/html
 		dohtml doc/*.html
-		cd ${S}/gcc
+		cd "${S}"/gcc
 		docinto gcc
 		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS \
 			README* SERVICE
-		cd ${S}/libf2c
+		cd "${S}"/libf2c
 		docinto libf2c
 		dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \
 			permission.netlib readme.netlib
-		cd ${S}/libffi
+		cd "${S}"/libffi
 		docinto libffi
 		dodoc ChangeLog* README
-		cd ${S}/libiberty
+		cd "${S}"/libiberty
 		docinto libiberty
 		dodoc ChangeLog README
-		cd ${S}/libobjc
+		cd "${S}"/libobjc
 		docinto libobjc
 		dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++-v3
+		cd "${S}"/libstdc++-v3
 		docinto libstdc++-v3
 		dodoc ChangeLog* README
 
 		if use java
 		then
-			cd ${S}/fastjar
+			cd "${S}"/fastjar
 			docinto fastjar
 			dodoc AUTHORS CHANGES ChangeLog NEWS README
-			cd ${S}/libjava
+			cd "${S}"/libjava
 			docinto libjava
 			dodoc ChangeLog* HACKING NEWS README THANKS
 		fi
 	else
-		rm -rf ${D}/usr/share/{man,info}
+		rm -rf "${D}"/usr/share/{man,info}
 	fi
 
 	# Fix ncurses b0rking
-	find ${D}/ -name '*curses.h' -exec rm -f {} \;
+	find "${D}"/ -name '*curses.h' -exec rm -f {} \;
 }
 
 pkg_postrm() {
-	if [ ! -L ${ROOT}/lib/cpp ]
+	if [ ! -L "${ROOT}"/lib/cpp ]
 	then
-		ln -sf /usr/bin/cpp ${ROOT}/lib/cpp
+		ln -sf /usr/bin/cpp "${ROOT}"/lib/cpp
 	fi
-	if [ ! -L ${ROOT}/usr/bin/cc ]
+	if [ ! -L "${ROOT}"/usr/bin/cc ]
 	then
-		ln -sf gcc ${ROOT}/usr/bin/cc
+		ln -sf gcc "${ROOT}"/usr/bin/cc
 	fi
 
 	# Fix ncurses b0rking (if r5 isn't unmerged)
-	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
+	find "${ROOT}"/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
 }
diff --git a/sys-devel/gcc/gcc-3.2.2.ebuild b/sys-devel/gcc/gcc-3.2.2.ebuild
index 6ffd3092d69c..3e2462639ce7 100644
--- a/sys-devel/gcc/gcc-3.2.2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.30 2008/06/22 11:03:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.31 2011/07/20 08:58:35 dirtyepic Exp $
 
 # This version is really meant JUST for the ps2
 
@@ -17,6 +17,7 @@ SPLIT_SPECS=${SPLIT_SPECS-true}
 
 inherit toolchain eutils
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
+DESCRIPTION="The GNU Compiler Collection"
 
 KEYWORDS=""
+IUSE=""
diff --git a/sys-devel/gcc/gcc-3.2.3-r4.ebuild b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
index 0e7efed7d6ae..c1b409772e4d 100644
--- a/sys-devel/gcc/gcc-3.2.3-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.29 2011/02/06 11:33:20 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.30 2011/07/20 08:58:35 dirtyepic Exp $
 
 inherit eutils flag-o-matic libtool versionator
 
@@ -92,7 +92,7 @@ SRC_URI="${SRC_URI}
 	mirror://gentoo/${P}-manpages.tar.bz2
 	mirror://gentoo/${P}-tls-update.patch.bz2"
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
+DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="http://gcc.gnu.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
@@ -154,8 +154,8 @@ chk_gcc_version() {
 version_patch() {
 	[ ! -f "$1" ] && return 1
 
-	sed -e "s:@PV@:${PVR}:g" ${1} > ${T}/${1##*/}
-	epatch ${T}/${1##*/}
+	sed -e "s:@PV@:${PVR}:g" ${1} > "${T}"/${1##*/}
+	epatch "${T}"/${1##*/}
 }
 
 src_unpack() {
@@ -173,7 +173,7 @@ src_unpack() {
 
 	unpack protector-${PP_VER2}.tar.gz
 
-	cd ${S}
+	cd "${S}"
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow
 
@@ -182,75 +182,75 @@ src_unpack() {
 	# Branch update ...
 	if [ -n "${BRANCH_UPDATE}" ]
 	then
-		epatch ${DISTDIR}/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+		epatch "${DISTDIR}"/${PN}-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	fi
 
 	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
 	if [ -n "${PATCH_VER}" ]
 	then
-		epatch ${WORKDIR}/patch
+		epatch "${WORKDIR}"/patch
 	fi
 
 	# Update to support TLS and __thread
-	epatch ${DISTDIR}/${P}-tls-update.patch.bz2
+	epatch "${DISTDIR}"/${P}-tls-update.patch.bz2
 
 	# Make gcc's version info specific to Gentoo
-	version_patch ${FILESDIR}/3.2.3/gcc323-gentoo-branding.patch
+	version_patch "${FILESDIR}"/3.2.3/gcc323-gentoo-branding.patch
 
 	# ProPolice Stack Smashing protection
 	# ProPolice does not work on archs where the stack grows upward (HPPA)
 	if [ ${ARCH} != "hppa" ]
 	then
-		epatch ${WORKDIR}/protector.dif
-		cp ${WORKDIR}/protector.c ${WORKDIR}/${P}/gcc/ || die "protector.c not found"
-		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
-		version_patch ${FILESDIR}/3.2.3/gcc-323-propolice-version.patch
+		epatch "${WORKDIR}"/protector.dif
+		cp "${WORKDIR}"/protector.c "${WORKDIR}"/${P}/gcc/ || die "protector.c not found"
+		cp "${WORKDIR}"/protector.h "${WORKDIR}"/${P}/gcc/ || die "protector.h not found"
+		version_patch "${FILESDIR}"/3.2.3/gcc-323-propolice-version.patch
 
-		epatch ${FILESDIR}/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch
+		epatch "${FILESDIR}"/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch
 	fi
 
 	# Patches from Mandrake/Suse ...
-	epatch ${FILESDIR}/3.2.1/gcc31-loop-load-final-value.patch
-	epatch ${FILESDIR}/3.2.1/gcc32-strip-dotdot.patch
-	epatch ${FILESDIR}/3.2.1/gcc32-athlon-alignment.patch
-	epatch ${FILESDIR}/3.2.3/gcc32-c++-classfn-member-template.patch
-	epatch ${FILESDIR}/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch
+	epatch "${FILESDIR}"/3.2.1/gcc31-loop-load-final-value.patch
+	epatch "${FILESDIR}"/3.2.1/gcc32-strip-dotdot.patch
+	epatch "${FILESDIR}"/3.2.1/gcc32-athlon-alignment.patch
+	epatch "${FILESDIR}"/3.2.3/gcc32-c++-classfn-member-template.patch
+	epatch "${FILESDIR}"/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch
 
 	# GCC bugfixes ...
-	epatch ${FILESDIR}/3.2.2/gcc32-pr7768.patch
-	epatch ${FILESDIR}/3.2.2/gcc32-pr8213.patch
-	epatch ${FILESDIR}/3.2.3/gcc-3.2.3-poisoned-malloc.patch #225743
+	epatch "${FILESDIR}"/3.2.2/gcc32-pr7768.patch
+	epatch "${FILESDIR}"/3.2.2/gcc32-pr8213.patch
+	epatch "${FILESDIR}"/3.2.3/gcc-3.2.3-poisoned-malloc.patch #225743
 
 	# Get gcc to decreases the number of times the collector has to be run
 	# by increasing its memory workspace, bug #16548.
-	epatch ${FILESDIR}/3.2.2/gcc322-ggc_page-speedup.patch
+	epatch "${FILESDIR}"/3.2.2/gcc322-ggc_page-speedup.patch
 
 	# sparc patches from Redhat ...
-	use sparc && epatch ${FILESDIR}/3.2.1/gcc32-sparc32-hack.patch
+	use sparc && epatch "${FILESDIR}"/3.2.1/gcc32-sparc32-hack.patch
 
 	# Patches from debian-arm
 	if use arm
 	then
-		epatch ${FILESDIR}/3.2.1/gcc32-arm-disable-mathf.patch
-		epatch ${FILESDIR}/3.2.1/gcc32-arm-reload1-fix.patch
+		epatch "${FILESDIR}"/3.2.1/gcc32-arm-disable-mathf.patch
+		epatch "${FILESDIR}"/3.2.1/gcc32-arm-reload1-fix.patch
 	fi
 	#ppc mergel miscompilation workaround
 	if use ppc
 	then
-		epatch ${FILESDIR}/3.2.3/gcc-3.2.3-mergel-fix.patch
+		epatch "${FILESDIR}"/3.2.3/gcc-3.2.3-mergel-fix.patch
 	fi
 	if use hppa
 	then
 		# There exists a bug in the ebuild patched gcc that prevents hppa from
 		# getting build because of default_assemble_visibility is not compiled.
 		# Alexander Gabert <pappy@nikita.ath.cx> (14 Jul 2003).
-		epatch ${FILESDIR}/3.2.3/gcc323-hppa-default_assemble_visibility.patch
+		epatch "${FILESDIR}"/3.2.3/gcc323-hppa-default_assemble_visibility.patch
 	fi
 
 	# Install our pre generated manpages if we do not have perl ...
 	if [ ! -x /usr/bin/perl ]
 	then
-		cd ${S}; unpack ${P}-manpages.tar.bz2
+		cd "${S}"; unpack ${P}-manpages.tar.bz2
 	fi
 
 	# Currently if any path is changed via the configure script, it breaks
@@ -258,7 +258,7 @@ src_unpack() {
 	# absolute paths, as some modules then gets rebuild with the wrong
 	# paths.  Thus we use $FAKE_ROOT.
 	einfo "Fixing Makefiles..."
-	cd ${S}
+	cd "${S}"
 	for x in $(find . -name Makefile.in)
 	do
 		# Fix --datadir=
@@ -316,12 +316,12 @@ src_compile() {
 	do_filter_flags
 
 	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
+	mkdir -p "${WORKDIR}"/build
+	cd "${WORKDIR}"/build
 
 	einfo "Configuring GCC..."
 	addwrite "/dev/zero"
-	${S}/configure --prefix=${LOC} \
+	"${S}"/configure --prefix=${LOC} \
 		--bindir=${BINPATH} \
 		--includedir=${LIBPATH}/include \
 		--datadir=${DATAPATH} \
@@ -343,12 +343,12 @@ src_compile() {
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
 
-	touch ${S}/gcc/c-gperf.h
+	touch "${S}"/gcc/c-gperf.h
 
 	# Do not make manpages if we do not have perl ...
 	if [ ! -x /usr/bin/perl ]
 	then
-		find ${S} -name '*.[17]' -exec touch {} \; || :
+		find "${S}" -name '*.[17]' -exec touch {} \; || :
 	fi
 
 	einfo "Building GCC..."
@@ -375,7 +375,7 @@ src_compile() {
 src_install() {
 	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
 	# this can break the build.
-	for x in cd ${WORKDIR}/build/gcc/include/*
+	for x in cd "${WORKDIR}"/build/gcc/include/*
 	do
 		if [ -L ${x} ]
 		then
@@ -384,7 +384,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
@@ -394,31 +394,31 @@ src_install() {
 
 	einfo "Installing GCC..."
 	# Do the 'make install' from the build directory
-	cd ${WORKDIR}/build
+	cd "${WORKDIR}"/build
 	S="${WORKDIR}/build" \
-	make prefix=${D}${LOC} \
-		bindir=${D}${BINPATH} \
-		includedir=${D}${LIBPATH}/include \
-		datadir=${D}${DATAPATH} \
-		mandir=${D}${DATAPATH}/man \
-		infodir=${D}${DATAPATH}/info \
+	make prefix="${D}"${LOC} \
+		bindir="${D}"${BINPATH} \
+		includedir="${D}"${LIBPATH}/include \
+		datadir="${D}"${DATAPATH} \
+		mandir="${D}"${DATAPATH}/man \
+		infodir="${D}"${DATAPATH}/info \
 		LIBPATH="${LIBPATH}" \
 		FAKE_ROOT="${D}" \
 		install || die
 
-	[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
+	[ -r "${D}"${BINPATH}/gcc ] || die "gcc not found in ${D}"
 
 	dodir /lib /usr/bin
 	dodir /etc/env.d/gcc
-	echo "PATH=\"${BINPATH}\"" > ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "PATH=\"${BINPATH}\"" > "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "ROOTPATH=\"${BINPATH}\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "LDPATH=\"${LIBPATH}\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "MANPATH=\"${DATAPATH}/man\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
 	# Also set CC and CXX
-	echo "CC=\"gcc\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
-	echo "CXX=\"g++\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "CC=\"gcc\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
+	echo "CXX=\"g++\"" >> "${D}"/etc/env.d/gcc/${CCHOST}-${GCC_RELEASE_VER}
 
 	# Install wrappers
 # Handled by gcc-config now ...
@@ -431,55 +431,55 @@ src_install() {
 	# can nuke multiple versions of gcc
 	if ! use build
 	then
-		cd ${D}${LIBPATH}
+		cd "${D}"${LIBPATH}
 
 		# Tell libtool files where real libraries are
-		for LA in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la
+		for LA in "${D}"${LOC}/lib/*.la "${D}"${LIBPATH}/../*.la
 		do
 			if [ -f ${LA} ]
 			then
 				sed -e "s:/usr/lib:${LIBPATH}:" ${LA} > ${LA}.hacked
 				mv ${LA}.hacked ${LA}
-				mv ${LA} ${D}${LIBPATH}
+				mv ${LA} "${D}"${LIBPATH}
 			fi
 		done
 
 		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
+		for x in "${D}"${LOC}/lib/*.{so,a}* "${D}"${LIBPATH}/../*.{so,a}*
 		do
-			[ -f ${x} ] && mv -f ${x} ${D}${LIBPATH}
+			[ -f ${x} ] && mv -f ${x} "${D}"${LIBPATH}
 		done
 
 		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
+		for x in "${D}"${LOC}/include/gc*.h "${D}"${LOC}/include/j*.h
 		do
-			[ -f ${x} ] && mv -f ${x} ${D}${LIBPATH}/include/
+			[ -f ${x} ] && mv -f ${x} "${D}"${LIBPATH}/include/
 		done
 		for x in gcj gnu java javax org
 		do
-			if [ -d ${D}${LOC}/include/${x} ]
+			if [ -d "${D}"${LOC}/include/${x} ]
 			then
 				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
+				mv -f "${D}"${LOC}/include/${x}/* "${D}"${LIBPATH}/include/${x}/
+				rm -rf "${D}"${LOC}/include/${x}
 			fi
 		done
 
 		# Move libgcj.spec to compiler-specific directories
-		[ -f ${D}${LOC}/lib/libgcj.spec ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
+		[ -f "${D}"${LOC}/lib/libgcj.spec ] && \
+			mv -f "${D}"${LOC}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
 
 		# Rename jar because it could clash with Kaffe's jar if this gcc is
 		# primary compiler (aka don't have the -<version> extension)
-		cd ${D}${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
+		cd "${D}"${LOC}/${CCHOST}/gcc-bin/${GCC_BRANCH_VER}
 		[ -f jar ] && mv -f jar gcj-jar
 
 		# Move <cxxabi.h> to compiler-specific directories
-		[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ] && \
-			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
+		[ -f "${D}"${STDCXX_INCDIR}/cxxabi.h ] && \
+			mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${D}"${LIBPATH}/include/
 
 		# These should be symlinks
-		cd ${D}${BINPATH}
+		cd "${D}"${BINPATH}
 		rm -f ${CCHOST}-{gcc,g++,c++,g77}
 		[ -f gcc ] && ln -sf gcc ${CCHOST}-gcc
 		[ -f g++ ] && ln -sf g++ ${CCHOST}-g++
@@ -488,40 +488,40 @@ src_install() {
 	fi
 
 	# This one comes with binutils
-	if [ -f ${D}${LOC}/lib/libiberty.a ]
+	if [ -f "${D}"${LOC}/lib/libiberty.a ]
 	then
-		rm -f ${D}${LOC}/lib/libiberty.a
+		rm -f "${D}"${LOC}/lib/libiberty.a
 	fi
 
-	cd ${S}
+	cd "${S}"
 	if ! use build
 	then
-		cd ${S}
+		cd "${S}"
 		docinto /${CCHOST}
 		dodoc ChangeLog FAQ GNATS MAINTAINERS README
 		docinto ${CCHOST}/html
 		dohtml *.html
-		cd ${S}/boehm-gc
+		cd "${S}"/boehm-gc
 		docinto ${CCHOST}/boehm-gc
 		dodoc ChangeLog doc/{README*,barrett_diagram}
 		docinto ${CCHOST}/boehm-gc/html
 		dohtml doc/*.html
-		cd ${S}/gcc
+		cd "${S}"/gcc
 		docinto ${CCHOST}/gcc
 		dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE
-		cd ${S}/libf2c
+		cd "${S}"/libf2c
 		docinto ${CCHOST}/libf2c
 		dodoc ChangeLog README TODO *.netlib
-		cd ${S}/libffi
+		cd "${S}"/libffi
 		docinto ${CCHOST}/libffi
 		dodoc ChangeLog* README
-		cd ${S}/libiberty
+		cd "${S}"/libiberty
 		docinto ${CCHOST}/libiberty
 		dodoc ChangeLog README
-		cd ${S}/libobjc
+		cd "${S}"/libobjc
 		docinto ${CCHOST}/libobjc
 		dodoc ChangeLog README* THREADS*
-		cd ${S}/libstdc++-v3
+		cd "${S}"/libstdc++-v3
 		docinto ${CCHOST}/libstdc++-v3
 		dodoc ChangeLog* README
 		docinto ${CCHOST}/libstdc++-v3/html
@@ -529,10 +529,10 @@ src_install() {
 
 		if use java
 		then
-			cd ${S}/fastjar
+			cd "${S}"/fastjar
 			docinto ${CCHOST}/fastjar
 			dodoc AUTHORS CHANGES ChangeLog NEWS README
-			cd ${S}/libjava
+			cd "${S}"/libjava
 			docinto ${CCHOST}/libjava
 			dodoc ChangeLog* HACKING LIBGCJ_LICENSE NEWS README THANKS
 		fi
@@ -540,19 +540,19 @@ src_install() {
 		prepman ${DATAPATH}
 		prepinfo ${DATAPATH}
 	else
-		rm -rf ${D}/usr/share/{man,info}
-		rm -rf ${D}${DATAPATH}/{man,info}
+		rm -rf "${D}"/usr/share/{man,info}
+		rm -rf "${D}"${DATAPATH}/{man,info}
 	fi
 
 	# Rather install the script, else portage with changing $FILESDIR
 	# between binary and source package borks things ....
 	insinto /lib/rcscripts/awk
-	doins ${FILESDIR}/awk/fixlafiles.awk
+	doins "${FILESDIR}"/awk/fixlafiles.awk
 	exeinto /sbin
-	doexe ${FILESDIR}/fix_libtool_files.sh
+	doexe "${FILESDIR}"/fix_libtool_files.sh
 
 	# Fix ncurses b0rking
-	find ${D}/ -name '*curses.h' -exec rm -f {} \;
+	find "${D}"/ -name '*curses.h' -exec rm -f {} \;
 }
 
 pkg_preinst() {
@@ -564,7 +564,7 @@ pkg_preinst() {
 	# Make again sure that the linker "should" be able to locate
 	# libstdc++.so ...
 	export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}"
-	${ROOT}/sbin/ldconfig
+	"${ROOT}"/sbin/ldconfig
 }
 
 pkg_postinst() {
@@ -600,5 +600,5 @@ pkg_postinst() {
 	fi
 
 	# Fix ncurses b0rking (if r5 isn't unmerged)
-	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
+	find "${ROOT}"/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
 }
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index e4957b8bc870..953dc933c1ea 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.17 2011/06/09 16:47:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.18 2011/07/20 08:58:35 dirtyepic Exp $
 
 MAN_VER=""
 PATCH_VER="1.7"
@@ -32,10 +32,11 @@ SPLIT_SPECS=no
 
 inherit toolchain eutils
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 # ia64 - broken static handling; USE=static emerge busybox
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
@@ -44,7 +45,6 @@ RDEPEND=">=sys-devel/gcc-config-1.4
 	>=sys-libs/zlib-1.1.4
 	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	>=sys-devel/bison-1.875
 	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
 	!build? (
 		gcj? (
@@ -68,6 +68,7 @@ fi
 
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
 PDEPEND=">=sys-devel/gcc-config-1.4"
 
@@ -75,8 +76,8 @@ src_unpack() {
 	gcc_src_unpack
 
 	if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
-		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc "${S}"/libstdc++-v3/config/os/ || die
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc "${S}"/libstdc++-v3/config/locale/ || die
 	fi
 
 	# misc patches that havent made it into a patch tarball yet
@@ -86,7 +87,7 @@ src_unpack() {
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
 	if ! use build && use objc && ! use gcj ; then
-		epatch ${FILESDIR}/3.3.4/libffi-without-libgcj.patch
-		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
+		epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
+		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
 }
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index 5f17b758eade..7a76fa3225ec 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.25 2011/03/08 03:05:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.26 2011/07/20 08:58:35 dirtyepic Exp $
 
 MAN_VER=""
 PATCH_VER="1.6"
@@ -39,10 +39,10 @@ SPLIT_SPECS=${SPLIT_SPECS-true}
 
 inherit toolchain eutils
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~x86-fbsd"
-IUSE="ip28 ip32r10k"
+IUSE="ip28 ip32r10k n32 n64"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
@@ -112,8 +112,8 @@ src_unpack() {
 		mips)
 			# If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64
 			if ! is_multilib; then
-				use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
-				use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
+				use n32 && epatch "${FILESDIR}"/3.4.1/gcc-3.4.1-mips-n32only.patch
+				use n64 && epatch "${FILESDIR}"/3.4.1/gcc-3.4.1-mips-n64only.patch
 			fi
 
 			# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
@@ -121,7 +121,7 @@ src_unpack() {
 			# take advantage of R10k's second ALU, perform shifts, etc..
 			#
 			# Needs re-porting to DFA in gcc-4.0 - Any Volunteers? :)
-			epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
+			epatch "${FILESDIR}"/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
 
 			# This is a very special patch -- it allows us to build semi-usable kernels
 			# on SGI IP28 (Indigo2 Impact R10000) systems.  The patch is henceforth
@@ -134,7 +134,7 @@ src_unpack() {
 			# to be enabled by passing -mip28-cache-barrier.  Only used to build kernels,
 			# There is the possibility it may be used for very specific userland apps too.
 			if use ip28 || use ip32r10k; then
-				epatch ${FILESDIR}/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v4.patch
+				epatch "${FILESDIR}"/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v4.patch
 			fi
 			;;
 		amd64)
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index 06e9aad8bb4b..7f55998290c8 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.8 2011/03/11 07:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.9 2011/07/20 08:58:35 dirtyepic Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -19,10 +19,11 @@ SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="-* ~ia64 ~m68k"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-devel/gcc-config-1.4
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index fb1d5180d031..cb783e94d398 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.27 2011/03/11 07:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.28 2011/07/20 08:58:35 dirtyepic Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -14,10 +14,11 @@ SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-devel/gcc-config-1.4
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index 69df5f5c56bf..08aedafe83ee 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.7 2011/03/11 07:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.8 2011/07/20 08:58:35 dirtyepic Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -13,10 +13,11 @@ SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-2.1 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-devel/gcc-config-1.4
diff --git a/sys-devel/gcc/gcc-4.3.3-r2.ebuild b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
index a64539cda798..6b9c173cee71 100644
--- a/sys-devel/gcc/gcc-4.3.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.3-r2.ebuild,v 1.10 2011/03/11 07:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.3-r2.ebuild,v 1.11 2011/07/20 08:58:35 dirtyepic Exp $
 
 GENTOO_PATCH_EXCLUDE="69_all_gcc43-pr39013.patch" #262567
 
@@ -25,10 +25,11 @@ SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-devel/gcc-config-1.4
diff --git a/sys-devel/gcc/gcc-4.4.2.ebuild b/sys-devel/gcc/gcc-4.4.2.ebuild
index b0eca1f7984b..71dec80d72fd 100644
--- a/sys-devel/gcc/gcc-4.4.2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.2.ebuild,v 1.7 2011/03/11 07:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.2.ebuild,v 1.8 2011/07/20 08:58:35 dirtyepic Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -23,10 +23,11 @@ SPLIT_SPECS=no #${SPLIT_SPECS-true} hard disable until #106690 is fixed
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-devel/gcc-config-1.4
diff --git a/sys-devel/gcc/gcc-4.4.3-r3.ebuild b/sys-devel/gcc/gcc-4.4.3-r3.ebuild
index 6b87d9585369..6956aacf5f28 100644
--- a/sys-devel/gcc/gcc-4.4.3-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.3-r3.ebuild,v 1.9 2011/03/11 07:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.3-r3.ebuild,v 1.10 2011/07/20 08:58:35 dirtyepic Exp $
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
@@ -20,10 +20,11 @@ SSP_UCLIBC_STABLE=""
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 arm -hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-devel/gcc-config-1.4