diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.59.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.59.0.ebuild
index 2fbda85808b4..208486156211 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.59.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.59.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.59.0.ebuild,v 1.8 2012/06/16 17:30:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.59.0.ebuild,v 1.9 2012/11/19 08:52:25 robbat2 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
-LICENSE="Artistic"
+LICENSE="|| ( Artistic Artistic-2 )"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.62.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.62.0.ebuild
index 077d018842e1..110f0cfa27f6 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.62.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.62.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.62.0.ebuild,v 1.1 2012/06/09 08:26:31 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.62.0.ebuild,v 1.2 2012/11/19 08:52:25 robbat2 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
-LICENSE="Artistic"
+LICENSE="|| ( Artistic Artistic-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.64.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.64.0.ebuild
index 1b387f530861..8145cb86fb87 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.64.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.64.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.64.0.ebuild,v 1.1 2012/09/30 07:15:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.64.0.ebuild,v 1.2 2012/11/19 08:52:25 robbat2 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
-LICENSE="Artistic"
+LICENSE="|| ( Artistic Artistic-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.65.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.65.0.ebuild
index 575bba6f38ba..0dff0f2798fe 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.65.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.65.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.65.0.ebuild,v 1.1 2012/10/07 14:31:10 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.65.0.ebuild,v 1.2 2012/11/19 08:52:25 robbat2 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
-LICENSE="Artistic"
+LICENSE="|| ( Artistic Artistic-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.66.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.66.0.ebuild
index f8cc9118d730..56691f1afae6 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.66.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.66.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.66.0.ebuild,v 1.1 2012/11/04 12:55:56 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetAddr-IP/NetAddr-IP-4.66.0.ebuild,v 1.2 2012/11/19 08:52:25 robbat2 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
-LICENSE="Artistic"
+LICENSE="|| ( Artistic Artistic-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index f4f97fb004a7..bf3a3d997ddb 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,2 +1,3 @@
 DIST sqlparse-0.1.3.tar.gz 43369 SHA256 5f870d293ecdaba8baace52536dd9a34884ed3775990c058ecfd1d23499d7e63 SHA512 71b52ef6f9f461bc9a55915c8f6bf342f79f84d393964b0d5b3aee9979f43c122c480cf299a75b3a04c5b86c6551eaf309b92bbe3a8e9784f72aa9db7d49cb0b WHIRLPOOL e37bef2d9dc973f88d01539b06e080850f8ae518b01a54cd6b1b1eed3da84b86d3197a615dd3a90b1d5902616b6fd9dcec1592bd71c487ac97dc52d269a0003d
 DIST sqlparse-0.1.4.tar.gz 47932 SHA256 6a8b1d9e616e296bf93faeb546c0e6d2410467094951e2f4b98b0531ac9305fb SHA512 2ef31eb3d03eaf8b2647d435831ee24271dec6598bdcb25d0e472ae0e3cf0d6187978c65daa01b09de190d50fdf6dc89505d72af97b140b5d3689582e1bb8b2a WHIRLPOOL e2c070de2168dd203f9baa8fe23c8de2cbe4037ff611b6657363dd6a8d05f45c1dd29af9a96ecab49f531872bdcb8d2d7560f263ea8489e7c5a9e014f3d049e1
+DIST sqlparse-0.1.5.tar.gz 46138 SHA256 dfbbbf50e86147ea2a2f32c2c4bc0743faec1edd02d3201b4e9a32ffa41e00a7 SHA512 9bccf67e53c8c40bc315d8998db00cb70dd145698313196287c31be321a6fc96f8ac44fb74ee581e87e8b9af484354019fb6296d750ac9efd080ddc55c6cb4f5 WHIRLPOOL 89c595569bec70c7cc561d193acb38048ed8c22abeb42cbc8bacbb832a3aef6b20845d2c499afd04c75574fa4016e10242a966481b1c55a455d32997098ed819
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.5.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.5.ebuild
new file mode 100644
index 000000000000..e6d72705ff84
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-sqlparse/python-sqlparse-0.1.5.ebuild,v 1.1 2012/11/19 08:08:18 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_MODNAME="${PN#python-}"
+
+inherit distutils
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="http://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse"
+SRC_URI="http://python-sqlparse.googlecode.com/files/${P#python-}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE=""
+
+S="${WORKDIR}"/${P#python-}
+
+RESTRICT="test"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 89e5d13f1720..c735b6ca4cc8 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.554 2012/11/19 02:59:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.555 2012/11/19 06:55:44 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -180,7 +180,7 @@ if in_iuse gcj ; then
 	DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
 fi
 
-PDEPEND=">=sys-devel/gcc-config-1.5"
+PDEPEND=">=sys-devel/gcc-config-1.7"
 
 #----<< DEPEND >>----
 
@@ -463,48 +463,47 @@ create_gcc_env_entry() {
 	dodir /etc/env.d/gcc
 	local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
 
+	local gcc_specs_file
+	local gcc_envd_file="${D}${gcc_envd_base}"
 	if [[ -z $1 ]] ; then
-		gcc_envd_file="${D}${gcc_envd_base}"
 		# I'm leaving the following commented out to remind me that it
 		# was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
 		# on chroot or in non-toolchain.eclass gcc ebuilds!
 		#gcc_specs_file="${LIBPATH}/specs"
 		gcc_specs_file=""
 	else
-		gcc_envd_file="${D}${gcc_envd_base}-$1"
+		gcc_envd_file+="-$1"
 		gcc_specs_file="${LIBPATH}/$1.specs"
 	fi
 
-	# phase PATH/ROOTPATH out ...
-	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
-	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
-	echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
-
 	# We want to list the default ABI's LIBPATH first so libtool
 	# searches that directory first.  This is a temporary
 	# workaround for libtool being stupid and using .la's from
 	# conflicting ABIs by using the first one in the search path
-	local abi=${TARGET_DEFAULT_ABI}
-	local MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
-	local LDPATH=${LIBPATH}
-	[[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
+	local mdir mosdir mosdirs abi
+	local ldpath ldpaths
 	for abi in $(get_all_abis TARGET) ; do
-		[[ ${abi} == ${TARGET_DEFAULT_ABI} ]] && continue
+		mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+		ldpath=${LIBPATH}
+		[[ ${mdir} != "." ]] && ldpath+="/${mdir}"
+		ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
 
-		MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
-		LDPATH+=:${LIBPATH}
-		[[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
+		mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
+		mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
 	done
 
-	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
-	echo "MANPATH=\"${DATAPATH}/man\"" >> ${gcc_envd_file}
-	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${gcc_envd_file}
-	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${gcc_envd_file}
-
-	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
-
-	# Set which specs file to use
-	[[ -n ${gcc_specs_file} ]] && echo "GCC_SPECS=\"${gcc_specs_file}\"" >> ${gcc_envd_file}
+	cat <<-EOF > ${gcc_envd_file}
+	PATH="${BINPATH}"
+	ROOTPATH="${BINPATH}"
+	GCC_PATH="${BINPATH}"
+	LDPATH="${ldpath}"
+	MANPATH="${DATAPATH}/man"
+	INFOPATH="${DATAPATH}/info"
+	STDCXX_INCDIR="${STDCXX_INCDIR##*/}"
+	CTARGET="${CTARGET}"
+	GCC_SPECS="${gcc_specs_file}"
+	MULTIOSDIRS="${mosdirs}"
+	EOF
 }
 setup_minispecs_gcc_build_specs() {
 	# Setup the "build.specs" file for gcc 4.3 to use when building.
@@ -717,6 +716,12 @@ toolchain_src_unpack() {
 			"${S}"/libstdc++-v3/python/Makefile.in || die
 	fi
 
+	# make sure the pkg config files install into multilib dirs.
+	# since we configure with just one --libdir, we can't use that
+	# (as gcc itself takes care of building multilibs).  #435728
+	find "${S}" -name Makefile.in \
+		-exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} +
+
 	# No idea when this first started being fixed, but let's go with 4.3.x for now
 	if ! tc_version_is_at_least 4.3 ; then
 		fix_files=""
@@ -793,8 +798,6 @@ toolchain_src_unpack() {
 				einfo "  ${f%%...}"
 			done
 	fi
-
-	disable_multilib_libjava || die "failed to disable multilib java"
 }
 
 gcc-abi-map() {
@@ -1622,13 +1625,6 @@ gcc_slot_java() {
 		[[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/
 	done
 
-	# SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
-	for x in "${D}"${PREFIX}/lib*/pkgconfig/libgcj*.pc ; do
-		[[ -f ${x} ]] || continue
-		sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${x}"
-		mv "${x}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
-	done
-
 	# 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}"${BINPATH}
@@ -1642,7 +1638,7 @@ gcc_movelibs() {
 	# older versions of gcc did not support --print-multi-os-directory
 	tc_version_is_at_least 3.0 || return 0
 
-	local multiarg removedirs=""
+	local x multiarg removedirs=""
 	for multiarg in $($(XGCC) -print-multi-lib) ; do
 		multiarg=${multiarg#*;}
 		multiarg=${multiarg//@/ -}
@@ -1670,6 +1666,14 @@ gcc_movelibs() {
 			fi
 		done
 		fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
+
+		# SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
+		FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}"
+		for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do
+			[[ -f ${x} ]] || continue
+			sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}"
+			mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die
+		done
 	done
 
 	# We remove directories separately to avoid this case:
@@ -1938,18 +1942,6 @@ setup_multilib_osdirnames() {
 	sed -i "$@" "${S}"/gcc/config/${config} || die
 }
 
-disable_multilib_libjava() {
-	# We dont want a multilib libjava, so lets use this hack taken from fedora
-	sed -i -r \
-		-e 's/^((all:) all-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
-		-e 's/^((install:) install-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
-		-e 's/^((check:) check-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
-		-e 's/^((all:) all-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
-		-e 's/^((install:) install-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
-		-e 's/^((check:) check-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
-		"${S}"/libjava/Makefile.in || die
-}
-
 # make sure the libtool archives have libdir set to where they actually
 # -are-, and not where they -used- to be.  also, any dependencies we have
 # on our own .la files need to be updated.
diff --git a/media-sound/clementine/clementine-1.1.1.ebuild b/media-sound/clementine/clementine-1.1.1.ebuild
index 261c981cf964..68afbf9314de 100644
--- a/media-sound/clementine/clementine-1.1.1.ebuild
+++ b/media-sound/clementine/clementine-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.1.1.ebuild,v 1.1 2012/11/18 17:30:00 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/clementine/clementine-1.1.1.ebuild,v 1.2 2012/11/19 10:29:23 ssuominen Exp $
 
 EAPI=4
 
@@ -38,6 +38,8 @@ COMMON_DEPEND="
 	>=media-libs/chromaprint-0.6
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
+	virtual/glu
+	virtual/opengl
 	ayatana? ( dev-libs/libindicate-qt )
 	cdda? ( dev-libs/libcdio )
 	googledrive? ( >=media-libs/taglib-1.8[mp4] )
diff --git a/media-video/vcdimager/metadata.xml b/media-video/vcdimager/metadata.xml
index edccfe5754d2..0d9b0dcb7f33 100644
--- a/media-video/vcdimager/metadata.xml
+++ b/media-video/vcdimager/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-<email>media-video@gentoo.org</email>
-</maintainer>
+	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/vcdimager/vcdimager-0.7.23-r1.ebuild b/media-video/vcdimager/vcdimager-0.7.23-r1.ebuild
index 9e25913e1573..58734a101fd3 100644
--- a/media-video/vcdimager/vcdimager-0.7.23-r1.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.23-r1.ebuild,v 1.5 2012/11/17 13:00:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.23-r1.ebuild,v 1.6 2012/11/19 09:27:33 ssuominen Exp $
 
 EAPI=5
 inherit eutils
@@ -12,11 +12,11 @@ SRC_URI="http://www.vcdimager.org/pub/${PN}/${PN}-${PV%.*}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="xml minimal static-libs"
+IUSE="+xml static-libs"
 
 RDEPEND=">=dev-libs/libcdio-0.71[-minimal]
-	!minimal? ( dev-libs/popt )
-	xml? ( >=dev-libs/libxml2-2.5.11 )"
+	dev-libs/popt
+	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -25,17 +25,12 @@ RESTRICT="test" #226249
 DOCS="AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO"
 
 src_configure() {
-	local myconf
-
 	# We disable the xmltest because the configure script includes differently
 	# than the actual XML-frontend C files.
+	local myconf
 	use xml && myconf="--with-xml-prefix=/usr --disable-xmltest"
 	use xml || myconf="--without-xml-frontend"
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with !minimal cli-frontends) \
-		${myconf}
+	econf $(use_enable static-libs static) ${myconf}
 }
 
 src_install() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7fd4b6ab5f1f..6649ec05ef4e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Nov 2012 06:06:51 +0000
+Mon, 19 Nov 2012 10:36:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7fd4b6ab5f1f..6649ec05ef4e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Nov 2012 06:06:51 +0000
+Mon, 19 Nov 2012 10:36:52 +0000
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224
index 26e2b998a534..c34269e7188b 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.1_p20120224
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.1_p20120224/gcc-4.6.1.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.1_p20120224.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a481e1253d945d762905cf5dc2cf724
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311
index 6be78ce6a0c6..35dd31aaa18e 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120311
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2_p20120311/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.2_p20120311.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b5b5255318d19cc7fefc63e83af6142
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330
index 3791a32180ec..372d66ac4fcc 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.2_p20120330
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2_p20120330/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.2_p20120330.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ae0bdaf85ce67d73900beb1dc75f58b
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
index ff7698bed414..2f0bd11d75d1 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3_p20120406/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.3_p20120406.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=812f676b33d442d98af9c0ffa440d85c
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
index 5146d626f1ba..5ee2c7802bfe 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
@@ -5,10 +5,10 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120514/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.7.0_p20120514.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b3381b08a55c0014dc850c43bd92432a
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120716 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120716
index e0983b0b6d0a..345d73a2537b 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120716
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120716
@@ -5,10 +5,10 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120716/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/dist/msp430-gcc-4.7.0_p20120716.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1715c9c3460dc7344ef158d7fb785080
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
index 6b1f3bf76c75..204a065541b5 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
@@ -5,10 +5,10 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120911/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/dist/msp430-gcc-4.7.0_p20120911.patch.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df1eeaed61e12996abc6fcb46df20146
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.59.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.59.0
index 231357c04a04..1ebfd5cd3eb0 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.59.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.59.0
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/NetAddr-IP/
 IUSE=ipv6
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=Artistic
+LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.059.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=60f66bcd8cfecfec8ee9237857234acb
+_md5_=8f4ab2a48c8e98b3bf3cfc7deaa53883
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.62.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.62.0
index e060b655a6c8..9e95097a1652 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.62.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.62.0
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/NetAddr-IP/
 IUSE=ipv6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=Artistic
+LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.062.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3cff8b885c31a534d23d8d95b08992bc
+_md5_=db8858e4f262ee6b5e8efde18740259b
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.64.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.64.0
index 900185fb0876..4675d5925208 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.64.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.64.0
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/NetAddr-IP/
 IUSE=ipv6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=Artistic
+LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.064.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=789331d53a79d0aee6f811452bac2aca
+_md5_=f77fd6dc77d9e4e147d26fb535b0b926
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.65.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.65.0
index fe7fc826ef91..470def74aaed 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.65.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.65.0
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/NetAddr-IP/
 IUSE=ipv6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=Artistic
+LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.065.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cbf0e693a3b3bf75e4b05340e98978ea
+_md5_=1c577dc78a80814964062012324784b2
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.66.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.66.0
index 3a523ce4d0e5..c0f2bcc640a7 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.66.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.66.0
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/NetAddr-IP/
 IUSE=ipv6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=Artistic
+LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.066.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0928460b732057e8cb9eb6b7aefde31b
+_md5_=2ac2a4d95cbfdfacead6b8f30b8c6da4
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.1.5 b/metadata/md5-cache/dev-python/python-sqlparse-0.1.5
new file mode 100644
index 000000000000..5d658cfec0d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND==dev-lang/python-2*
+DESCRIPTION=A non-validating SQL parser module for Python
+EAPI=4
+HOMEPAGE=http://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND==dev-lang/python-2*
+RESTRICT=test
+SLOT=0
+SRC_URI=http://python-sqlparse.googlecode.com/files/sqlparse-0.1.5.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=0514ce2f54dbadea8d59e93065de3438
diff --git a/metadata/md5-cache/media-sound/clementine-1.1.1 b/metadata/md5-cache/media-sound/clementine-1.1.1
index ff88c1afbbd6..44a047820a7b 100644
--- a/metadata/md5-cache/media-sound/clementine-1.1.1
+++ b/metadata/md5-cache/media-sound/clementine-1.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=x11-libs/qt-gui-4.5:4[dbus?] >=x11-libs/qt-opengl-4.5:4 >=x11-libs/qt-sql-4.5:4[sqlite] dev-db/sqlite[fts3] >=media-libs/taglib-1.7[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf dev-libs/qjson media-libs/libechonest >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) googledrive? ( >=media-libs/taglib-1.8[mp4] ) ipod? ( >=media-libs/libgpod-0.8.0[ios?] ios? ( app-pda/libplist >=app-pda/libimobiledevice-1.0 app-pda/usbmuxd ) ) lastfm? ( >=media-libs/liblastfm-1 ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext x11-libs/qt-test:4 dev-cpp/gmock googledrive? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=x11-libs/qt-gui-4.5:4[dbus?] >=x11-libs/qt-opengl-4.5:4 >=x11-libs/qt-sql-4.5:4[sqlite] dev-db/sqlite[fts3] >=media-libs/taglib-1.7[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf dev-libs/qjson media-libs/libechonest >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 virtual/glu virtual/opengl ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) googledrive? ( >=media-libs/taglib-1.8[mp4] ) ipod? ( >=media-libs/libgpod-0.8.0[ios?] ios? ( app-pda/libplist >=app-pda/libimobiledevice-1.0 app-pda/usbmuxd ) ) lastfm? ( >=media-libs/liblastfm-1 ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext x11-libs/qt-test:4 dev-cpp/gmock googledrive? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
 EAPI=4
 HOMEPAGE=http://www.clementine-player.org/ http://code.google.com/p/clementine-player/
 IUSE=ayatana cdda +dbus debug googledrive ios ipod lastfm mms moodbar mtp projectm test +udev wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=x11-libs/qt-gui-4.5:4[dbus?] >=x11-libs/qt-opengl-4.5:4 >=x11-libs/qt-sql-4.5:4[sqlite] dev-db/sqlite[fts3] >=media-libs/taglib-1.7[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf dev-libs/qjson media-libs/libechonest >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) googledrive? ( >=media-libs/taglib-1.8[mp4] ) ipod? ( >=media-libs/libgpod-0.8.0[ios?] ios? ( app-pda/libplist >=app-pda/libimobiledevice-1.0 app-pda/usbmuxd ) ) lastfm? ( >=media-libs/liblastfm-1 ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew ) dbus? ( udev? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
+RDEPEND=>=x11-libs/qt-gui-4.5:4[dbus?] >=x11-libs/qt-opengl-4.5:4 >=x11-libs/qt-sql-4.5:4[sqlite] dev-db/sqlite[fts3] >=media-libs/taglib-1.7[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf dev-libs/qjson media-libs/libechonest >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 virtual/glu virtual/opengl ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) googledrive? ( >=media-libs/taglib-1.8[mp4] ) ipod? ( >=media-libs/libgpod-0.8.0[ios?] ios? ( app-pda/libplist >=app-pda/libimobiledevice-1.0 app-pda/usbmuxd ) ) lastfm? ( >=media-libs/liblastfm-1 ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew ) dbus? ( udev? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
 REQUIRED_USE=ios? ( ipod ) udev? ( dbus ) wiimote? ( dbus )
 SLOT=0
 SRC_URI=http://clementine-player.googlecode.com/files/clementine-1.1.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	d9d351169c1d554e8f47f1a19f17becd	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b56b1f276460a3148d4294ee375d5cc7
+_md5_=892bd8985a253f7a5b3260cbaa1aff38
diff --git a/metadata/md5-cache/media-video/vcdimager-0.7.23-r1 b/metadata/md5-cache/media-video/vcdimager-0.7.23-r1
index 5f500cf31fd7..63a9b0004ad0 100644
--- a/metadata/md5-cache/media-video/vcdimager-0.7.23-r1
+++ b/metadata/md5-cache/media-video/vcdimager-0.7.23-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libcdio-0.71[-minimal] !minimal? ( dev-libs/popt ) xml? ( >=dev-libs/libxml2-2.5.11 ) virtual/pkgconfig
+DEPEND=>=dev-libs/libcdio-0.71[-minimal] dev-libs/popt xml? ( dev-libs/libxml2 ) virtual/pkgconfig
 DESCRIPTION=GNU VCDimager
 EAPI=5
 HOMEPAGE=http://www.vcdimager.org/
-IUSE=xml minimal static-libs
+IUSE=+xml static-libs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libcdio-0.71[-minimal] !minimal? ( dev-libs/popt ) xml? ( >=dev-libs/libxml2-2.5.11 )
+RDEPEND=>=dev-libs/libcdio-0.71[-minimal] dev-libs/popt xml? ( dev-libs/libxml2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7/vcdimager-0.7.23.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=938f9fec249dcebd2fc776361bce071b
+_md5_=a277680570e14d9df3b843d57b7e3a43
diff --git a/metadata/md5-cache/net-analyzer/snips-1.2-r3 b/metadata/md5-cache/net-analyzer/snips-1.2-r3
new file mode 100644
index 000000000000..d8ab2eb9c190
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/snips-1.2-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare unpack
+DESCRIPTION=System & Network Integrated Polling Software
+EAPI=4
+HOMEPAGE=http://www.netplex-tech.com/snips/
+KEYWORDS=~amd64
+LICENSE=as-is
+RDEPEND=dev-lang/perl virtual/mailx net-analyzer/rrdtool >=net-misc/iputils-20071127-r2 sys-libs/gdbm sys-libs/ncurses
+SLOT=0
+SRC_URI=http://www.netplex-tech.com/software/downloads/snips/snips-1.2.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7d9228da1fad459230dc87ba83efb8f2
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.6.0.1 b/metadata/md5-cache/net-ftp/filezilla-3.6.0.1
new file mode 100644
index 000000000000..b60d901a4a1a
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=5
+HOMEPAGE=http://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-3.1 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.6.0.1_src.tar.bz2
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_md5_=66642431e4be23966d6928b98bc66c7d
diff --git a/metadata/md5-cache/net-libs/libssh2-1.4.2 b/metadata/md5-cache/net-libs/libssh2-1.4.2
index 5089928c5082..2f81b4c94035 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.4.2
+++ b/metadata/md5-cache/net-libs/libssh2-1.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=4
 HOMEPAGE=http://www.libssh2.org/
 IUSE=gcrypt static-libs test zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!gcrypt? ( dev-libs/openssl ) gcrypt? ( dev-libs/libgcrypt ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.4.2.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b08f88f8f136bb2d0ebee66be0c35593
+_md5_=4038ab80f2c0787970dce91f20d91b5d
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
index 60462070812c..9409e7da7df7 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=doc? ( dev-python/sphinx ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=doc? ( dev-python/sphinx ) test? ( || ( dev-lang/python:2.7 dev-python/unittest2 ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=Astronomical routines for the python programming language
 EAPI=4
 HOMEPAGE=http://rhodesmill.org/pyephem/
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.5.1.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a9a9efc7b694c8b4b412799705e4dc0
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=3efa846b95a275e49ccfdcb6fc607412
diff --git a/metadata/md5-cache/sci-biology/allpaths-2.0 b/metadata/md5-cache/sci-biology/allpaths-2.0
index f256de40dbfb..2285a1c8bda9 100644
--- a/metadata/md5-cache/sci-biology/allpaths-2.0
+++ b/metadata/md5-cache/sci-biology/allpaths-2.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=sys-devel/gcc-4.3.2
+DEPEND=!sci-biology/allpathslg
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=2
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
 KEYWORDS=amd64 x86
 LICENSE=Whitehead-MIT
+RDEPEND=!sci-biology/allpathslg
 SLOT=0
 SRC_URI=ftp://ftp.broad.mit.edu/pub/crd/ALLPATHS/Release-2-0/allpaths-2.0.tar.gz ftp://ftp.broad.mit.edu/pub/crd/ALLPATHS/Release-2-0/allpaths-2.0.manual.docx
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8281a357e4b11d0091fa040c13c885af
+_md5_=9ef8e554c5560b04e4e8b74ca7e482e4
diff --git a/metadata/md5-cache/sci-biology/allpaths-3.1 b/metadata/md5-cache/sci-biology/allpaths-3.1
index 2768b6b8b02c..83614a2668d2 100644
--- a/metadata/md5-cache/sci-biology/allpaths-3.1
+++ b/metadata/md5-cache/sci-biology/allpaths-3.1
@@ -1,10 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=!sci-biology/allpathslg
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
 KEYWORDS=~amd64 ~x86
 LICENSE=Whitehead-MIT
+RDEPEND=!sci-biology/allpathslg
 SLOT=3
 SRC_URI=ftp://ftp.broad.mit.edu/pub/crd/ALLPATHS/Release-3-0/allpaths-3.1.tgz ftp://ftp.broad.mit.edu/pub/crd/ALLPATHS/Release-3-0/AllPathsV3_Manual_r1.0.docx
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5329b4e7f288679ac14cb91dd0300699
+_md5_=41353be23965d399ee49d0458be25b9a
diff --git a/metadata/md5-cache/sci-biology/allpaths-3.1-r1 b/metadata/md5-cache/sci-biology/allpaths-3.1-r1
index 2e541f9c5ee4..147449a36aa9 100644
--- a/metadata/md5-cache/sci-biology/allpaths-3.1-r1
+++ b/metadata/md5-cache/sci-biology/allpaths-3.1-r1
@@ -1,11 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=!sci-biology/allpathslg
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
 IUSE=openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=Whitehead-MIT
+RDEPEND=!sci-biology/allpathslg
 SLOT=3
 SRC_URI=ftp://ftp.broad.mit.edu/pub/crd/ALLPATHS/Release-3-0/allpaths-3.1.tgz ftp://ftp.broad.mit.edu/pub/crd/ALLPATHS/Release-3-0/AllPathsV3_Manual_r1.0.docx
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a0bce5f7a10e2489a903cf38d313128b
+_md5_=bd95fd2bdc1d6c668ee3f43d77a898ca
diff --git a/metadata/md5-cache/sci-biology/allpathslg-37578 b/metadata/md5-cache/sci-biology/allpathslg-37578
index 360c3a748a29..115231667695 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-37578
+++ b/metadata/md5-cache/sci-biology/allpathslg-37578
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost !sci-biology/allpaths sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=2
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
@@ -8,4 +8,4 @@ LICENSE=as-is
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-37578.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8d20e27305c45fff456bdb43822fd39d
+_md5_=7e3585d4acae529188970bb3e4b4c0b1
diff --git a/metadata/md5-cache/sci-biology/allpathslg-41839 b/metadata/md5-cache/sci-biology/allpathslg-41839
index 342c4d2c28c9..6e388b265a6b 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-41839
+++ b/metadata/md5-cache/sci-biology/allpathslg-41839
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost !sci-biology/allpaths sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
@@ -8,4 +8,4 @@ LICENSE=as-is
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-41839.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5514a6b29b3472043a7e79d36e8acf1a
+_md5_=794cede07c559b1105b57363bcb0c7a5
diff --git a/metadata/md5-cache/sci-biology/allpathslg-42337 b/metadata/md5-cache/sci-biology/allpathslg-42337
index afaae5a8b90b..8e384543fc1c 100644
--- a/metadata/md5-cache/sci-biology/allpathslg-42337
+++ b/metadata/md5-cache/sci-biology/allpathslg-42337
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=dev-libs/boost !sci-biology/allpaths sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=De novo assembly of whole-genome shotgun microreads
 EAPI=4
 HOMEPAGE=http://www.broadinstitute.org/science/programs/genome-biology/crd
@@ -8,4 +8,4 @@ LICENSE=as-is
 SLOT=0
 SRC_URI=ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-42337.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a911e8c585997cad43999b199e88c6b
+_md5_=e3eb91d5b01c725b5875889972cd0feb
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p121119 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p121119
new file mode 100644
index 000000000000..fb30d2ce3a39
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p121119
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=dev-lang/tk[threads] dev-python/numpy dev-tcltk/tix =sci-libs/ccpn-data-2.2.2* sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+DESCRIPTION=The Collaborative Computing Project for NMR
+EAPI=4
+HOMEPAGE=http://www.ccpn.ac.uk/ccpn
+IUSE=extendnmr +opengl
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( CCPN LGPL-2.1 )
+PDEPEND=extendnmr? ( >=sci-chemistry/aria-2.3.2-r1 sci-chemistry/prodecomp )
+RDEPEND=dev-lang/tk[threads] dev-python/numpy dev-tcltk/tix =sci-libs/ccpn-data-2.2.2* sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-121119.patch.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=dad85d17c26e7afee55503a8743209f4
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2
index 5a0aae2f4166..d1030871ec45 100644
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2
+++ b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-libs/cvector >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 app-text/rman x11-misc/imake x11-proto/inputproto x11-proto/xextproto virtual/fortran
+DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 app-text/rman x11-misc/imake x11-proto/inputproto x11-proto/xextproto virtual/fortran
 DESCRIPTION=Molecular Graphics Visualisation Tool
 EAPI=4
 HOMEPAGE=http://www.openrasmol.org/
 KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 RASLIC )
-RDEPEND=dev-libs/cvector >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
+RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fortran-2	09dce3a4663874693a88d3ddb85cf4aa	multilib	9aa8a023e062fca0ba79362d9d0cc488	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1ef69a09e4b2673a11debdcd6fe11797
+_md5_=8ef99725459a4c26da9d0edc160aac7b
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3 b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r1
similarity index 87%
rename from metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3
rename to metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r1
index 13fbf3056f8b..fbea2a07a3fe 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=install
 DEPEND=dev-libs/gmp
 DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=4
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/gmp
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/30965/gmp-ecm-6.4.3.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=66508634c012556347646922a5f838c9
+_md5_=3ca7a90ba8bf121d559ea387bf85e8d1
diff --git a/metadata/md5-cache/sci-mathematics/msieve-1.50-r1 b/metadata/md5-cache/sci-mathematics/msieve-1.50-r1
new file mode 100644
index 000000000000..9168f4fa3550
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/msieve-1.50-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A C library implementing a suite of algorithms to factor large integers
+EAPI=4
+HOMEPAGE=http://sourceforge.net/projects/msieve/
+IUSE=zlib +ecm mpi
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/msieve/msieve/Msieve%20v1.50/msieve150src.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=596f540736ef26afda5c4f047b439499
diff --git a/metadata/md5-cache/sci-mathematics/yafu-1.33 b/metadata/md5-cache/sci-mathematics/yafu-1.33
new file mode 100644
index 000000000000..4c45177a1d8c
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/yafu-1.33
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/gmp sci-mathematics/gmp-ecm
+DESCRIPTION=Yet another factoring utility
+EAPI=4
+HOMEPAGE=http://sourceforge.net/projects/yafu/
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-libs/gmp sci-mathematics/gmp-ecm
+SLOT=0
+SRC_URI=mirror://sourceforge/yafu/1.33/yafu-1.33-src.zip
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=460dccc1ec4fe2d4e4e061937018da1a
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6
new file mode 100644
index 000000000000..4e8e25100f0b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=sys-apps/pciutils sys-fs/sysfsutils dev-libs/glib !sys-power/pmtools !net-misc/usbip || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Misc tools bundled with kernel sources
+EAPI=4
+HOMEPAGE=http://kernel.org/
+KEYWORDS=~amd64 ~x86 ~ppc
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils sys-fs/sysfsutils dev-libs/glib !sys-power/pmtools !net-misc/usbip
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.6/linux-3.6.tar.bz2
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=eac2f7b206d9682c7a5e3732c7c0f8f9
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1
new file mode 100644
index 000000000000..5b7ae59adebc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=sys-apps/pciutils sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Misc tools bundled with kernel sources
+EAPI=4
+HOMEPAGE=http://kernel.org/
+IUSE=static-libs tcpd
+KEYWORDS=~amd64 ~x86 ~ppc
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.6/linux-3.6.tar.bz2
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e762c4ab583fe405bf37f5f5459d996e
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
index f91d69827dd1..788bf0ee3778 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx
 KEYWORDS=~alpha ~ppc ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) )
 RESTRICT=strip
 SLOT=2.95
 SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.3.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7c27da3fa87b32476e91c2d381a3812
diff --git a/metadata/md5-cache/sys-devel/gcc-3.2.2 b/metadata/md5-cache/sys-devel/gcc-3.2.2
index 36d308a99e9e..4772463a1aac 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.2.2
+++ b/metadata/md5-cache/sys-devel/gcc-3.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Compiler Collection
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.2
 SRC_URI=mirror://gnu/gcc/gcc-3.2.2/gcc-3.2.2.tar.bz2 mirror://gentoo/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.2.2-patches-1.1.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b647f8b54d8ce42330452798fcad0c59
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index b38173deec82..10826242e27e 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx boundschecking bootstrap doc gcj gtk hardened multilib objc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.3
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b1a12147240ddd3486c24bca45737a8
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index e3191c5e8621..56eb86b00949 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=ip28 ip32r10k n32 n64 build multislot nls nptl test vanilla altivec cxx fortran nocxx boundschecking d bootstrap doc gcj gtk hardened multilib objc
 KEYWORDS=-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.6.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7242f21650702aa2e286a687f3c84be
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index a3cb7b602c87..28e5d8725f99 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap
 KEYWORDS=-* ~ia64 ~m68k
 LICENSE=GPL-2 LGPL-2.1 FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 )
 RESTRICT=strip
 SLOT=4.0
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.1.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ed6706cfbff401c98f4bfdcb1ed3fb87
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index f802ffc6422c..5306ded965ae 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx d bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++
 KEYWORDS=-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1 FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 )
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.3.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d8e877a318f9d5e841427da7e8dc0751
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index f21ddf7be743..1b98f57efa0a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp
 KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-2.1 || ( GPL-3 libgcc libstdc++ ) FDL-1.2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 )
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.1.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7e9066441dcf28e2575f1ba1e81bf389
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
index 8a1cdb43f0e3..8f5f4cf46c62 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point
 KEYWORDS=~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2 mirror://gentoo/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=edbf428b89d60aca0847da65e329d34c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.4 b/metadata/md5-cache/sys-devel/gcc-4.3.4
index 71af38c6f5db..a662ccd217c2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.4
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point
 KEYWORDS=alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.4/gcc-4.3.4.tar.bz2 mirror://gentoo/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9267e2d1fdef3b560c84997a4b5d3848
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.5 b/metadata/md5-cache/sys-devel/gcc-4.3.5
index f79dee8b2ed4..bbacd791b3cb 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.5
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point
 KEYWORDS=~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3e4b9bd1796ce696486e7ebbaa869f1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index 65532ad90ee9..626c57a776de 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point
 KEYWORDS=alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b7f9e5bc3bbfc7d25cef5d5953ba5cb5
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.2 b/metadata/md5-cache/sys-devel/gcc-4.4.2
index c395691f2cfd..f46dd69e8f68 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
 KEYWORDS=~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.2/gcc-4.4.2.tar.bz2 mirror://gentoo/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c6781fb8890474fcfb2b2a0fb0de742
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.3-r3 b/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
index 2f10da5d8b72..4a0c72a6897e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
 KEYWORDS=~alpha ~amd64 arm -hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.3/gcc-4.4.3.tar.bz2 mirror://gentoo/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2c99790035f1ad3a25c8c57b959b0dc3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
index 68c7ff9003be..959166687191 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.4/gcc-4.4.4.tar.bz2 mirror://gentoo/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cf799d7e0e0d2588b81fdd4cf20dc988
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.5 b/metadata/md5-cache/sys-devel/gcc-4.4.5
index d774b18c61ea..97516c6da13b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.5
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=63df08c346a3ae313b9c16beb3b72f4c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
index c29a9cec9734..dc9727755bee 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dcb2d3c66fe1fc0dd5b0c13ad5b1bc11
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 9e885717e6c9..76ce7d678413 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite
 KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=25e7826fbfcd9d4dcd6df2689d8a46a3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
index 6f28a1d9c4e0..d314cc926fbc 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite lto
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.bz2 mirror://gentoo/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=67b8c6e8dea6d3454ba9dd41e19567d0
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.2 b/metadata/md5-cache/sys-devel/gcc-4.5.2
index f5acb28dd4bb..9fb53221a283 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite lto
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=163e8342af7cb8b97202cbc002a76d42
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
index 095206f210c9..627a5931696a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite lto
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9449f38a784af91123abdbbc6e7ef481
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index bd60d19376c5..82a155a59668 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite lto
 KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1eb2ba169d80018a635780d930b3bee1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.0 b/metadata/md5-cache/sys-devel/gcc-4.6.0
index 86743405eed8..d996802b071b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.0
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.0/gcc-4.6.0.tar.bz2 mirror://gentoo/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e95fbd54313a4565fc99bb22b94ade3d
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
index 5e119539fb5f..0bafecff2000 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.1/gcc-4.6.1.tar.bz2 mirror://gentoo/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4758f624530b88614331ec9e8eaab702
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.2 b/metadata/md5-cache/sys-devel/gcc-4.6.2
index 7e72521adb57..7a40dc2fb4be 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4d7cbfa90f3c6ff7cf22d24d2527bd35
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.3 b/metadata/md5-cache/sys-devel/gcc-4.6.3
index db32d87143c3..419640b92281 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.3
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.3
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.7.tar.bz2 mirror://gentoo/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e50c784d7a25edba67985e34758c796c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.0 b/metadata/md5-cache/sys-devel/gcc-4.7.0
index 36edb11edda3..ead25c7b6d01 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.0
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a467acb75fb453843077e2a04c7cf11
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.1 b/metadata/md5-cache/sys-devel/gcc-4.7.1
index 81d0a3c8347c..d292115e0071 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.1
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2 mirror://gentoo/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a775f7c376d892985b14fb3aa2cf5dd
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.2 b/metadata/md5-cache/sys-devel/gcc-4.7.2
index c65230752958..fe2f813d594e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx nopie nossp bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.5
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2 mirror://gentoo/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3de70dd0dcdab911fdd8e11ded746083
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493 b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
index c23032de3e62..e88ddd5f0a9e 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org
 IUSE=nls objc objc++ +cxx build multislot nls nptl test vanilla
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2 GPL-2
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=40
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5493.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=695373bab736b1a123a59a4884511fad
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
index b8c102fe47e4..4318ac4fb48f 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org
 IUSE=fortran nls +openmp objc objc++ +cxx build multislot nls nptl test vanilla
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 GPL-3
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5664.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5e5182e1ebf95a532a8ea011fcf95fc
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
index b4c3e47bc6ba..c8a20c8b6e43 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
@@ -6,10 +6,10 @@ HOMEPAGE=http://gcc.gnu.org
 IUSE=fortran nls +openmp objc objc++ +cxx build multislot nls nptl test vanilla
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 GPL-3
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bf52ae2cbf24b2891f95c393aac5e41
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.8 b/metadata/md5-cache/sys-devel/gcc-config-1.8
new file mode 100644
index 000000000000..8361f417b646
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.8
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=utility to manage compilers
+HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/gcc-config-1.8.tar.xz http://dev.gentoo.org/~vapier/dist/gcc-config-1.8.tar.xz
+_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328
+_md5_=589d2d2ec35e64a64e4cd06ce23f9544
diff --git a/metadata/md5-cache/sys-devel/kgcc64-3.4.6 b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
index 6e1015af8af1..77cb639b3ac1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-3.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=-* ~hppa ~mips ~ppc ~s390 sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.2.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ba8b008080ade055be3ab2b62c3031f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index ed38a2c36fbc..f1a1cca5b899 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=-* hppa ~mips ppc ~s390 sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c0249b3b056954c2b256a9cf62cbff17
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 47577e680e9e..d0ab19c801d1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=-* hppa ~mips ppc ~s390 ~sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e8acb877830174bfe478e20fe5dd82b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.3 b/metadata/md5-cache/sys-devel/kgcc64-4.3.3
index 63d2053d9fa7..e22db9ab17e7 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.3
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=-hppa ~mips sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2 mirror://gentoo/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-patches-1.0.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2de426fa59648fd54334a636b3cfcc5
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index c9317196fd59..06935ca1fe37 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=-hppa ~mips ~sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bedba76cd6aa7bf4da8d96d31f2fc79
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.4 b/metadata/md5-cache/sys-devel/kgcc64-4.4.4
index 10828d306237..4fbed9e3e281 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.4
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=hppa sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.4/gcc-4.4.4.tar.bz2 mirror://gentoo/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-patches-1.0.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3f83bf8c79814f4aedf08148803fd93
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index 69227fc4cfe6..4e5310f3cdb4 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=hppa sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5d3c437cc15acf27ec2f09bafbf4644
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index 18969cf473bb..6c830a341d94 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=~hppa ~sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2342a48f750adc57110f6e655159b21
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.2 b/metadata/md5-cache/sys-devel/kgcc64-4.5.2
index bf23482fc2be..4cdde61a0fc6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.2
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=hppa sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.1.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b349d6b224eb5757004e94bed6e61f0
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index 544836a214b3..c462c3476700 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=hppa sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=50081d6db4e2f5cd2d55859c7da432fa
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.3 b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
index ca2fe8ff4597..4f75ec95246b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
@@ -5,10 +5,10 @@ HOMEPAGE=http://gcc.gnu.org/
 IUSE=build multislot nls nptl test vanilla
 KEYWORDS=~hppa ~sparc
 LICENSE=GPL-2 LGPL-2.1
-PDEPEND=>=sys-devel/gcc-config-1.5
+PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.3.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	a1fb37e7afba9d46a079d0f434038357	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain	abbd7f5afd3458362cc8b3c42fa645d9	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7324b5ac559199dda89a5f5e4e9d0914
diff --git a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8 b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
index 9898627dd5c1..8f99f4f4ff9e 100644
--- a/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
+++ b/metadata/md5-cache/sys-fs/progsreiserfs-0.3.1_rc8
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=sys-fs/e2fsprogs nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-apps/util-linux nls? ( sys-devel/gettext )
 DESCRIPTION=Library for accessing and manipulating reiserfs partitions
+EAPI=5
 HOMEPAGE=http://reiserfs.linux.kiev.ua/
-IUSE=nls debug
+IUSE=debug examples nls static-libs
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://reiserfs.linux.kiev.ua/snapshots/progsreiserfs-0.3.1-rc8.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9196bc0c051b9dfafb853f82f9f0603c
+_md5_=a5ff2b88bf5f157faf6e19f72bffb850
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.16-r1 b/metadata/md5-cache/sys-power/acpid-2.0.16-r1
index 5a363b3f2a8c..5bd92b9c49b1 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.16-r1
+++ b/metadata/md5-cache/sys-power/acpid-2.0.16-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tedfelix.com/linux/acpid-2.0.16.tar.xz
 _eclasses_=systemd	fc2fa698095b76894d4516729da4337b
-_md5_=830d5533a790ea71a12b2ccfdad0fc47
+_md5_=a9f1f7dc76059ec0b98ea07378ec1f60
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.17 b/metadata/md5-cache/sys-power/acpid-2.0.17
index cf8a811b8ae0..6eada5d60f01 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.17
+++ b/metadata/md5-cache/sys-power/acpid-2.0.17
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://tedfelix.com/linux/acpid-2.0.17.tar.xz
 _eclasses_=systemd	fc2fa698095b76894d4516729da4337b
-_md5_=d6fe9d7badeb2e726a9f564f96558d6e
+_md5_=9a7ff09d7ff05750de492aefa2dfb553
diff --git a/metadata/md5-cache/virtual/notification-daemon-0 b/metadata/md5-cache/virtual/notification-daemon-0
index 2ccca1d7a18a..602aa64f24f2 100644
--- a/metadata/md5-cache/virtual/notification-daemon-0
+++ b/metadata/md5-cache/virtual/notification-daemon-0
@@ -3,6 +3,6 @@ DESCRIPTION=Virtual for notification daemon dbus service
 EAPI=2
 IUSE=gnome
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-RDEPEND=gnome? ( || ( x11-misc/notification-daemon gnome-base/gnome-shell ) ) !gnome? ( || ( x11-misc/notification-daemon xfce-extra/xfce4-notifyd x11-misc/qtnotifydaemon x11-misc/notify-osd >=x11-wm/awesome-3.4.4 x11-wm/enlightenment[e_modules_notification] kde-base/knotify ) )
+RDEPEND=gnome? ( || ( x11-misc/notification-daemon gnome-base/gnome-shell ) ) !gnome? ( || ( x11-misc/notification-daemon xfce-extra/xfce4-notifyd x11-misc/qtnotifydaemon x11-misc/notify-osd >=x11-wm/awesome-3.4.4 x11-wm/enlightenment[enlightenment_modules_notification] x11-wm/enlightenment[e_modules_notification] kde-base/knotify ) )
 SLOT=0
-_md5_=abe0eff749643d43b55bcd3c9c2cec02
+_md5_=eb097d30d18de839bb47ce8b6591d390
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0494fb900bc1..373b4d97b7f7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Nov 2012 06:06:53 +0000
+Mon, 19 Nov 2012 10:36:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ee4a9352ce53..83977d8bddcf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Nov 19 06:06:51 UTC 2012
+Mon Nov 19 10:36:52 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 38105932759b..fe0b3a746479 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Nov 2012 06:30:01 +0000
+Mon, 19 Nov 2012 11:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0e3e17a3e4cd..720211e9c4d9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1353305101 Mon Nov 19 06:05:01 2012 UTC
+1353321301 Mon Nov 19 10:35:01 2012 UTC
diff --git a/net-analyzer/snips/Manifest b/net-analyzer/snips/Manifest
index b2ef17b96e88..21b2c5c15174 100644
--- a/net-analyzer/snips/Manifest
+++ b/net-analyzer/snips/Manifest
@@ -1 +1 @@
-DIST snips-1.2.tar.gz 1382731 RMD160 4ee9906558387545a0a02f8a6df7d3e119b1fc2e SHA1 3534c77a4b33aab3c9b49a8ad229d9263bb719a4 SHA256 2ca44a51251b569e9429ae404caccb3721a9697532e95c9ff0e6db9ef8e3cd28
+DIST snips-1.2.tar.gz 1382731 SHA256 2ca44a51251b569e9429ae404caccb3721a9697532e95c9ff0e6db9ef8e3cd28 SHA512 24c53e1af390062ff6f4406e1cb47b2d13812f2723420df79921dfbb620aac626de628d755b05b615b188df1ef8203776e6a64f326901408235c62205ee16f8a WHIRLPOOL 64264505ff8b1d93c79ecf92b6d6aa133a92e4904a672e46e3d68a9c7749d2193aaa4341878309e7b1856a05579cd643a3ff2b60049518c26eb7100325317098
diff --git a/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch b/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch
new file mode 100644
index 000000000000..037f4a4b8a65
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch
@@ -0,0 +1,12 @@
+diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid
+--- snips-1.2.ORIG/etherload/Makefile.mid	2012-06-26 15:35:46.329759711 +0100
++++ snips-1.2/etherload/Makefile.mid	2012-06-26 15:37:13.194765114 +0100
+@@ -19,7 +19,7 @@
+ INITFILES = etherload
+ 
+ $(TARG):  $(OBJS)
+-	$(CC) -o etherload $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+ 
+ standalone:  clean
+ 	make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG)
diff --git a/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch b/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch
new file mode 100644
index 000000000000..d298ed3a7436
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch
@@ -0,0 +1,184 @@
+diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid
+--- snips-1.2.ORIG/etherload/Makefile.mid	2012-06-26 14:43:15.818552541 +0100
++++ snips-1.2/etherload/Makefile.mid	2012-06-26 14:48:11.983571994 +0100
+@@ -19,7 +19,7 @@
+ INITFILES = etherload
+ 
+ $(TARG):  $(OBJS)
+-	$(CC) -o etherload $(CFLAGS) $(OBJS) $(LIBS)
++	$(CC) -o etherload $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS)
+ 
+ standalone:  clean
+ 	make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG)
+diff -uNr snips-1.2.ORIG/lib/Makefile.mid snips-1.2/lib/Makefile.mid
+--- snips-1.2.ORIG/lib/Makefile.mid	2012-06-26 14:43:15.791552541 +0100
++++ snips-1.2/lib/Makefile.mid	2012-06-26 14:44:51.073558777 +0100
+@@ -49,7 +49,7 @@
+ 	   echo "Generating  ../perl-module/Makefile"; \
+ 	   (cd ../perl-module; \
+ 	    perl Makefile.PL \
+-		CC="$(CC)" LD="$(CC)" OPTIMIZE="$(CFLAGS)" LIBS="$(LIBS)" \
++		CC="$(CC)" LD="$(CC)" OPTIMIZE="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+ 		INSTALLSITELIB=$(ROOTDIR)/lib/perl INSTALLSITEARCH=$(ROOTDIR)/lib/perl INSTALLARCHLIB=$(ROOTDIR)/lib/perl INSTALLMAN3DIR=$(MANDIR) ; \
+ 	   ) >/dev/null ;\
+ 	 fi
+diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid
+--- snips-1.2.ORIG/nsmon/Makefile.mid	2012-06-26 14:43:15.817552541 +0100
++++ snips-1.2/nsmon/Makefile.mid	2012-06-26 14:47:26.847568340 +0100
+@@ -14,7 +14,7 @@
+ 
+ 
+ $(TARG): $(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install: installdir $(TARG)
+ 	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
+diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid
+--- snips-1.2.ORIG/ntpmon/Makefile.mid	2012-06-26 14:43:15.807552541 +0100
++++ snips-1.2/ntpmon/Makefile.mid	2012-06-26 14:46:28.392565438 +0100
+@@ -13,7 +13,7 @@
+ INITFILES = ntpmon
+ 
+ $(TARG): $(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ 
+ install: installdir $(TARG)
+diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid
+--- snips-1.2.ORIG/pingmon/Makefile.mid	2012-06-26 14:43:15.819552541 +0100
++++ snips-1.2/pingmon/Makefile.mid	2012-06-26 14:48:57.503574984 +0100
+@@ -23,7 +23,7 @@
+ INITFILES = ippingmon rpcpingmon
+ 
+ $(TARG): $(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install: installdir $(TARG)
+ 	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ;
+diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid
+--- snips-1.2.ORIG/pingmon/multiping/Makefile.mid	2012-06-26 14:43:15.819552541 +0100
++++ snips-1.2/pingmon/multiping/Makefile.mid	2012-06-26 14:48:25.751573031 +0100
+@@ -11,7 +11,7 @@
+ OBJS = 	multiping.o
+ 
+ $(TARG):	$(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG)
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) -o $(TARG)
+ 
+ install:  installdir  $(TARG)
+ 	$(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/
+diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid
+--- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid	2012-06-26 14:43:15.819552541 +0100
++++ snips-1.2/pingmon/rpcping/Makefile.mid	2012-06-26 14:48:46.799574327 +0100
+@@ -13,7 +13,7 @@
+ OBJS = 	rpcping.o
+ 
+ $(TARG):	$(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG)
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) -o $(TARG)
+ 
+ install:  installdir  $(TARG)
+ 	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)/
+diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid
+--- snips-1.2.ORIG/portmon/Makefile.mid	2012-06-26 14:43:15.796552541 +0100
++++ snips-1.2/portmon/Makefile.mid	2012-06-26 14:45:28.936561270 +0100
+@@ -11,7 +11,7 @@
+ PROGLIBS  =
+ 
+ $(TARG):	$(OBJS)  Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(TARG)
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARG)
+ 
+ #
+ install:  installdir $(TARG)
+diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid
+--- snips-1.2.ORIG/radiusmon/Makefile.mid	2012-06-26 14:43:15.815552541 +0100
++++ snips-1.2/radiusmon/Makefile.mid	2012-06-26 14:46:41.096566075 +0100
+@@ -13,7 +13,7 @@
+ INITFILES = radiusmon
+ 
+ $(TARG): $(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ 
+ install: installdir $(TARG)
+diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid
+--- snips-1.2.ORIG/snipslog/Makefile.mid	2012-06-26 14:43:15.817552541 +0100
++++ snips-1.2/snipslog/Makefile.mid	2012-06-26 14:47:47.263570500 +0100
+@@ -15,7 +15,7 @@
+ INITFILES = snipslogd
+ 
+ $(TARG):	$(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $(TARG)
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $(TARG)
+ 
+ snipslogtest:  snipslogtest.o
+ 	$(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c  $(LIBS)
+diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid
+--- snips-1.2.ORIG/snipstv/Makefile.mid	2012-06-26 14:43:15.818552541 +0100
++++ snips-1.2/snipstv/Makefile.mid	2012-06-26 14:47:56.599570885 +0100
+@@ -17,7 +17,7 @@
+ 	update_msgwin.o  update_promptwin.o update_title.o
+ 
+ $(TARG):	$(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install:   installdir  $(TARG)
+ 	$(INSTALL) -c -m 751 $(TARG) $(BINDIR)
+diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid
+--- snips-1.2.ORIG/tksnips/Makefile.mid	2012-06-26 14:43:15.792552541 +0100
++++ snips-1.2/tksnips/Makefile.mid	2012-06-26 14:45:03.849559610 +0100
+@@ -15,7 +15,7 @@
+ all:	$(TARG)
+ 
+ ndaemon: $(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ tkSnips:  tkSnips.tix
+ 	@echo "Doing substitutions on tkSnips" ;\
+diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid
+--- snips-1.2.ORIG/tpmon/Makefile.mid	2012-06-26 14:43:15.788552541 +0100
++++ snips-1.2/tpmon/Makefile.mid	2012-06-26 14:44:04.585555459 +0100
+@@ -11,7 +11,7 @@
+ PROGLIBS  =
+ 
+ $(TARG): $(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+ 
+ ######
+ # small testing program to demonstrate the throughput() function
+diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid
+--- snips-1.2.ORIG/trapmon/Makefile.mid	2012-06-26 14:43:15.816552541 +0100
++++ snips-1.2/trapmon/Makefile.mid	2012-06-26 14:47:17.560568478 +0100
+@@ -17,7 +17,7 @@
+ INITFILES = trapmon
+ 
+ $(TARG):	$(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ install: $(TARG)
+ 	$(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/
+diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid
+--- snips-1.2.ORIG/utility/Makefile.mid	2012-06-26 14:43:15.801552541 +0100
++++ snips-1.2/utility/Makefile.mid	2012-06-26 14:45:49.512562573 +0100
+@@ -25,10 +25,10 @@
+ all:	$(CPROGS) sed
+ 
+ display_snips_datafile:	display_snips_datafile.o
+-	$(CC) $(CFLAGS)  $@.o $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS)  $@.o $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ eventselect:	eventselect.o
+-	$(CC) $(CFLAGS)  $@.o $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS)  $@.o $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
+ 
+ 
+ sed:
diff --git a/net-analyzer/snips/files/snips-1.2-linux3.patch b/net-analyzer/snips/files/snips-1.2-linux3.patch
new file mode 100644
index 000000000000..fd2d096189bb
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-linux3.patch
@@ -0,0 +1,26 @@
+Index: snips-1.2/Configure
+===================================================================
+--- snips-1.2.orig/Configure
++++ snips-1.2/Configure
+@@ -274,7 +274,7 @@ case "$OS" in
+ 		CURSESLIB='-lncurses -ltermcap'
+ 		PING="/bin/ping"
+ 		;; 
+-  LINUX20|Linux\ 2*)
++  LINUX20|Linux\ [23]*)
+ 		OS_CFLAGS="-DLINUX2";
+ 		OS_LIBS="${LIBRESOLV}"
+ 		if [ -f /usr/lib/libgdbm.so ]; then
+Index: snips-1.2/utility/snipsprog.init
+===================================================================
+--- snips-1.2.orig/utility/snipsprog.init
++++ snips-1.2/utility/snipsprog.init
+@@ -45,7 +45,7 @@ getpid() {
+ 
+     # Finally try to extract it from ps depending on the OS
+     case "`uname -s -r`" in
+-	LINUX20|Linux\ 2*)
++	LINUX20|Linux\ [23]*)
+ 	    ps auxw | awk 'BEGIN { prog=ARGV[1]; dir=ARGV[2]; ARGC=1 } 
+ 		       { if ((prog == $11) || (("(" prog ")") == $11) ||
+ 			    ((prog ":") == $11) || ((dir "/" prog) == $11))
diff --git a/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch b/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch
new file mode 100644
index 000000000000..22e2e53d5eca
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch
@@ -0,0 +1,15 @@
+diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid
+--- snips-1.2.ORIG/nsmon/Makefile.mid	2012-06-26 14:58:39.418613245 +0100
++++ snips-1.2/nsmon/Makefile.mid	2012-06-26 14:59:08.018615168 +0100
+@@ -3,10 +3,8 @@
+ # Makefile for 'nsmon'
+ #
+ 
+-# Might need to link with 'libresolv' on some systems
+-
+ PROGCDEFS =
+-PROGLIBS  =	# -lresolv
++PROGLIBS  = -lresolv
+ 
+ TARG =	nsmon
+ OBJS =	main.o nsmon.o
diff --git a/net-analyzer/snips/files/snips-1.2-parallel-make.patch b/net-analyzer/snips/files/snips-1.2-parallel-make.patch
new file mode 100644
index 000000000000..effa673baefc
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-parallel-make.patch
@@ -0,0 +1,23 @@
+diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid
+--- snips-1.2.ORIG/Makefile.mid	2012-06-26 15:53:26.724829432 +0100
++++ snips-1.2/Makefile.mid	2012-06-26 15:55:18.298836689 +0100
+@@ -46,7 +46,7 @@
+ 	  CHECK DONE TODO
+ 
+ all:	Init
+-	 @echo "BUILDING SNIPS revision $(REV) for $(OS) $$OS" ;\
++	 @+echo "BUILDING SNIPS revision $(REV) for $(OS) $$OS" ;\
+ 	 for i in $(SRCS); do \
+ 	  if [ -d $$i ]; then \
+ 	    (echo "" ; echo "MAKING IN $$i" ; echo "----------" ; \
+@@ -74,8 +74,8 @@
+ 	  echo "Else prefix your shell PATH with BSD style install" ;\
+ 	  rm -f  SniPpet /tmp/SniPpet ; exit 1 ; fi)
+ 
+-	@echo make $(MFLAGS) install ;
+-	@-for i in $(SRCS); do \
++	@+echo make $(MFLAGS) install ;
++	@+-for i in $(SRCS); do \
+ 	  ( echo "" ; echo "MAKING IN $$i" ; echo "----------" ; cd $$i ; \
+ 		make $(MFLAGS) install ; make $(MFLAGS) init ) ;\
+ 	done
diff --git a/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch b/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch
new file mode 100644
index 000000000000..fc95c5155ed9
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch
@@ -0,0 +1,12 @@
+diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid
+--- snips-1.2.ORIG/trapmon/Makefile.mid	2012-06-26 14:50:38.787581669 +0100
++++ snips-1.2/trapmon/Makefile.mid	2012-06-26 14:52:11.381587122 +0100
+@@ -17,7 +17,7 @@
+ INITFILES = trapmon
+ 
+ $(TARG):	$(OBJS) Makefile
+-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) $(LIBS) -o $@
+ 
+ install: $(TARG)
+ 	$(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/
diff --git a/net-analyzer/snips/snips-1.2-r3.ebuild b/net-analyzer/snips/snips-1.2-r3.ebuild
new file mode 100644
index 000000000000..51f679766b12
--- /dev/null
+++ b/net-analyzer/snips/snips-1.2-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2-r3.ebuild,v 1.1 2012/11/19 10:28:36 chainsaw Exp $
+
+EAPI=4
+
+inherit base toolchain-funcs user
+
+DESCRIPTION="System & Network Integrated Polling Software"
+HOMEPAGE="http://www.netplex-tech.com/snips/"
+SRC_URI="http://www.netplex-tech.com/software/downloads/${PN}/${P}.tar.gz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	 virtual/mailx
+	 net-analyzer/rrdtool
+	 >=net-misc/iputils-20071127-r2
+	 sys-libs/gdbm
+	 sys-libs/ncurses"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags-respect.patch"
+	"${FILESDIR}/${P}-parallel-make.patch"
+	"${FILESDIR}/${P}-non-interactive.patch"
+	"${FILESDIR}/${P}-install-missing.patch"
+	"${FILESDIR}/${P}-implicit-declarations.patch"
+	"${FILESDIR}/${P}-conflicting-types.patch"
+	"${FILESDIR}/${P}-code-ordering.patch"
+	"${FILESDIR}/${P}-destdir-awareness.patch"
+	"${FILESDIR}/${P}-trapmon-link-order.patch"
+	"${FILESDIR}/${P}-nsmon-libresolv.patch"
+	"${FILESDIR}/${P}-etherload-makefile-ordering.patch"
+	"${FILESDIR}/${P}-linux3.patch"
+)
+
+src_prepare() {
+	# Gentoo-specific non-interactive configure override
+	cp "${FILESDIR}/${P}-r2-precache-config" "${S}/Config.cache" \
+		|| die "Unable to precache configure script answers"
+	echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache"
+	echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache"
+	echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache"
+	base_src_prepare
+}
+
+src_compile() {
+	# Looks horrid due to missing linebreaks, suppress output
+	ebegin "Running configure script (with precached settings)"
+		./Configure &> /dev/null || die "Unable to configure"
+	eend $?
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_preinst() {
+	enewgroup snips
+	enewuser snips -1 -1 /usr/snips snips
+}
+
+pkg_postinst() {
+	ebegin "Fixing permissions"
+	chown -R snips:snips "${ROOT}"usr/snips
+	for x in data logs msgs rrddata run web device-help etc; do
+		chmod -R g+w "${ROOT}usr/snips/${x}" \
+			|| die "Unable to chmod ${x}"
+	done
+	chown root:snips "${ROOT}usr/snips/bin/multiping" || die "chown root failed"
+	chown root:snips "${ROOT}usr/snips/bin/etherload" || die "chown root failed"
+	chown root:snips "${ROOT}usr/snips/bin/trapmon" || die "chown root failed"
+	chmod u+s "${ROOT}usr/snips/bin/multiping" || die "SetUID root failed"
+	chmod u+s "${ROOT}usr/snips/bin/etherload" || die "SetUID root failed"
+	chmod u+s "${ROOT}usr/snips/bin/trapmon" || die "SetUID root failed"
+	eend $?
+}
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index aa30bd19aa7c..3c509465adfa 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,2 +1,3 @@
 DIST FileZilla_3.5.3_src.tar.bz2 3366662 SHA256 0bba27baa2041fd926f9775e360e70af391cdec10f3f3b1a8dff20b3e100ff6b SHA512 e233d1ee3083541bd443bfbd97c7cade9248cc015c99fc89e5ac0d656554a6e00cd764d22b848ec937ac1483de92034a5e3b84c798cec08c03ce6a8d806d14b2 WHIRLPOOL ccbc1e2e50c10b1410c108791647612d00bce3a090315259dec03d793651b9be8bc1ca51d4c483f5186acfe297f85ef1beb4ce979d8cf0e8d2da748f67d9c5f4
+DIST FileZilla_3.6.0.1_src.tar.bz2 3534874 SHA256 ca15eded526bc3e2412cc7f74e89b98a59bf1ea92a432de420d391046a2822f0 SHA512 961df785099a9d55789e9733f2e1495d69b9305fa8531e524c90e613ef558435b7174c176e77248d70d3c5850518c5f87c405bd2a327e8344b86e59e1c34e2a6 WHIRLPOOL 528fdde4494c14b4aeba0a6bf7ef57752b7871da2688d72744bb3d37b3dd8c981305cf7c5c133d9e2910a06910448740e7d622e54f76b860822dfb2eb24bbcca
 DIST FileZilla_3.6.0_src.tar.bz2 3525207 SHA256 78855028a830f9839ee0e0bb678ce7c3e56aef1f7b7435ac121a02234caeaeae SHA512 93110b5505fec03593691ca5f2c1a52784dae2c5b949e7812199a98859d694ce89f684f5d62b2ed855f63d2b0163b10b650b2a706af17cb24d663d42cccc4547 WHIRLPOOL c1f0e3ae46e2f62bd7ecb4708d3d322d4d0ff92c749c1a79beb45d6750caad36ea4f955a87222985073fd945e89c222bfc1a1a9001df722e901d798d559dc8b4
diff --git a/net-ftp/filezilla/filezilla-3.6.0.1.ebuild b/net-ftp/filezilla/filezilla-3.6.0.1.ebuild
new file mode 100644
index 000000000000..b4703f96a636
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.6.0.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.6.0.1.ebuild,v 1.1 2012/11/19 09:48:18 voyageur Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+inherit autotools eutils flag-o-matic multilib wxwidgets
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="http://filezilla-project.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="dbus nls test"
+
+RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
+	>=dev-db/sqlite-3.7
+	>=dev-libs/tinyxml-2.6.1-r1[stl]
+	net-dns/libidn
+	>=net-libs/gnutls-3.1
+	>=x11-libs/wxGTK-2.8.12:2.8[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
+	append-cppflags -DTIXML_USE_STL
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=system \
+		--disable-autoupdatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doicon src/interface/resources/48x48/${PN}.png
+
+	dodoc AUTHORS ChangeLog NEWS
+}
diff --git a/net-libs/libssh2/libssh2-1.4.2.ebuild b/net-libs/libssh2/libssh2-1.4.2.ebuild
index c5b8fe2e0fd8..24019ce2f036 100644
--- a/net-libs/libssh2/libssh2-1.4.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.4.2.ebuild,v 1.8 2012/08/26 17:09:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.4.2.ebuild,v 1.9 2012/11/19 09:50:05 jlec Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt static-libs test zlib"
 
 DEPEND="!gcrypt? ( dev-libs/openssl )
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index a6539ed2cf08..7bfcc3b0e669 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>netmon</herd>
-  <use>
-    <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for crypto</flag>
-  </use>
+	<herd>netmon</herd>
+	<use>
+		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for crypto</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
index ab874da60ef9..09c1da6e07de 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
@@ -1,24 +1,29 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild,v 1.3 2012/08/05 19:18:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild,v 1.4 2012/11/19 07:38:41 xarthisius Exp $
 
 EAPI=4
+
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Astronomical routines for the python programming language"
-LICENSE="LGPL-3"
 HOMEPAGE="http://rhodesmill.org/pyephem/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
+LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
+
+DEPEND="doc? ( dev-python/sphinx )
+	test? ( || ( dev-lang/python:2.7 dev-python/unittest2 ) )"
 RDEPEND=""
-DEPEND="doc? ( dev-python/sphinx )"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
 src_prepare() {
 	# don't install rst files
@@ -29,12 +34,29 @@ src_prepare() {
 src_compile() {
 	distutils_src_compile
 	if use doc; then
-		cd src/ephem/doc
-		PYTHONPATH=../../.. emake html
+		PYTHONPATH=. emake -C src/ephem/doc html
 	fi
 }
 
+src_test() {
+	testing() {
+		if [[ ${PYTHON_ABI} == "2.7" ]]; then
+			PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" \
+   			"$(PYTHON)" -m unittest discover -s src/ephem
+		else
+			PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" \
+				unit2-${PYTHON_ABI} discover -s src/ephem
+		fi
+	}
+	python_execute_function testing
+}
+
 src_install() {
 	distutils_src_install
-	use doc && dohtml -r src/ephem/doc/.build/html/*
+	use doc && dohtml -r src/ephem/doc/_build/html/*
+
+	delete_tests() {
+		rm -rf "${ED}$(python_get_sitedir)/ephem/tests"
+	}
+	python_execute_function -q delete_tests
 }
diff --git a/sci-biology/allpaths/allpaths-2.0.ebuild b/sci-biology/allpaths/allpaths-2.0.ebuild
index 25a946abfbbb..62a85a9c56d4 100644
--- a/sci-biology/allpaths/allpaths-2.0.ebuild
+++ b/sci-biology/allpaths/allpaths-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-2.0.ebuild,v 1.5 2010/01/03 14:08:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-2.0.ebuild,v 1.6 2012/11/19 10:27:46 jlec Exp $
 
 EAPI="2"
 
@@ -16,9 +16,8 @@ SLOT="0"
 IUSE=""
 KEYWORDS="amd64 x86"
 
-# TODO: info message on failure instructing to run gcc-config
-DEPEND=">=sys-devel/gcc-4.3.2"
-RDEPEND=""
+DEPEND="!sci-biology/allpathslg"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-x86-no-autocast.patch
diff --git a/sci-biology/allpaths/allpaths-3.1-r1.ebuild b/sci-biology/allpaths/allpaths-3.1-r1.ebuild
index 0f4c36c25bfc..1793b2eaeb71 100644
--- a/sci-biology/allpaths/allpaths-3.1-r1.ebuild
+++ b/sci-biology/allpaths/allpaths-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1-r1.ebuild,v 1.1 2012/11/08 20:54:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1-r1.ebuild,v 1.2 2012/11/19 10:27:46 jlec Exp $
 
 EAPI=4
 
@@ -17,6 +17,9 @@ SLOT="3"
 KEYWORDS="~amd64 ~x86"
 IUSE="openmp"
 
+DEPEND="!sci-biology/allpathslg"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/AllPaths"
 
 PATCHES=(
diff --git a/sci-biology/allpaths/allpaths-3.1.ebuild b/sci-biology/allpaths/allpaths-3.1.ebuild
index e913ccc7a2df..aea383b85949 100644
--- a/sci-biology/allpaths/allpaths-3.1.ebuild
+++ b/sci-biology/allpaths/allpaths-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1.ebuild,v 1.3 2012/08/30 07:46:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1.ebuild,v 1.4 2012/11/19 10:27:46 jlec Exp $
 
 EAPI=4
 
@@ -19,6 +19,9 @@ KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/AllPaths"
 
+DEPEND="!sci-biology/allpathslg"
+RDEPEND="${DEPEND}"
+
 PATCHES=( "${FILESDIR}"/${P}-gcc4.7.patch )
 
 src_prepare() {
diff --git a/sci-biology/allpathslg/allpathslg-37578.ebuild b/sci-biology/allpathslg/allpathslg-37578.ebuild
index 02eff40c6821..616b16173efb 100644
--- a/sci-biology/allpathslg/allpathslg-37578.ebuild
+++ b/sci-biology/allpathslg/allpathslg-37578.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-37578.ebuild,v 1.4 2011/10/15 20:04:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-37578.ebuild,v 1.5 2012/11/19 10:26:16 jlec Exp $
 
 EAPI="2"
 
@@ -15,8 +15,9 @@ SLOT="0"
 IUSE=""
 KEYWORDS="amd64"
 
-DEPEND="dev-libs/boost
-	>=sys-devel/gcc-4.3.3
+DEPEND="
+	dev-libs/boost
+	!sci-biology/allpaths
 	sci-biology/vaal"
 RDEPEND=""
 
diff --git a/sci-biology/allpathslg/allpathslg-41839.ebuild b/sci-biology/allpathslg/allpathslg-41839.ebuild
index 9fb76e4cae4d..a96d6e87c242 100644
--- a/sci-biology/allpathslg/allpathslg-41839.ebuild
+++ b/sci-biology/allpathslg/allpathslg-41839.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-41839.ebuild,v 1.1 2012/05/29 02:51:11 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-41839.ebuild,v 1.2 2012/11/19 10:26:16 jlec Exp $
 
 EAPI=4
 
@@ -15,8 +15,9 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64"
 
-DEPEND="dev-libs/boost
-	>=sys-devel/gcc-4.3.3
+DEPEND="
+	dev-libs/boost
+	!sci-biology/allpaths
 	sci-biology/vaal"
 RDEPEND=""
 
diff --git a/sci-biology/allpathslg/allpathslg-42337.ebuild b/sci-biology/allpathslg/allpathslg-42337.ebuild
index c86c7de6d62d..76c108334460 100644
--- a/sci-biology/allpathslg/allpathslg-42337.ebuild
+++ b/sci-biology/allpathslg/allpathslg-42337.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-42337.ebuild,v 1.1 2012/07/09 17:55:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-42337.ebuild,v 1.2 2012/11/19 10:26:16 jlec Exp $
 
 EAPI=4
 
@@ -15,8 +15,9 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64"
 
-DEPEND="dev-libs/boost
-	>=sys-devel/gcc-4.3.3
+DEPEND="
+	dev-libs/boost
+	!sci-biology/allpaths
 	sci-biology/vaal"
 RDEPEND=""
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index b283fde2af38..b34d93e3a738 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -5,3 +5,4 @@ DIST ccpn-update-2.2.2-120829.patch.xz 47500 SHA256 0ec4cd5103f4cd5d6dcddbfd1ee9
 DIST ccpn-update-2.2.2-120912.patch.xz 48644 SHA256 96d0287900a586439b49cc8f763864e0cb9765a0823b343a3345af3a46d35b99 SHA512 ad7f3f943c94352d2618dda1ccf483507690225c66fc41cdebd5185dfadc776e7dbd1978cae4c31e8fd6bfc7023ab8154fa733be47b3a44f414cba2e636577d3 WHIRLPOOL 6e87d9c090b2ea58a6e011bb8dda8d5728ad4b9edd0e7544111cea539c9fba3909b8e244d50312f28989c7ef895c4b816f3d9fb57acd6880a020c601454cccc6
 DIST ccpn-update-2.2.2-121012.patch.xz 155460 SHA256 7a5441049fe0f002ee84cfce853043b350ade73c0c564901964db59ec13bb5fe SHA512 86d8bd03cde0a81542cde451c9ab759971c9ea30a1ada0e2961370640d1c139fa8e050e102969d7dd59c2d4664c87da6ccaae1af803a48c0d2ff6c52fb49d295 WHIRLPOOL 7acaeeee4eda9f6d16b630c898244683d40e1809bb0457ce68f26e1ac8c8b691ef227dc873b9f60e53b6c077d2b602f682a782121aa5c9f004e35d9460181016
 DIST ccpn-update-2.2.2-121112.patch.xz 223036 SHA256 a46fd5927ff2c2e1be88d1a9ecce520a6cd551efaf98fe1c4e2b8c3d51a40a27 SHA512 68bb7b715ec76f0b83c2bcf436b6a88c2e5f554a245b509bd387926df16c5249c1fdf315a987b6e55c4a00d02382afb1c99a350907829811390d0a50e8d672df WHIRLPOOL b7863197439a917b49914a5ea7997963c1d14ca74baf77523676b653300d3d08e5eb5bbfc5abc4d05e71c94f8bb30e8446776623085aa8a7b279f1107277bd05
+DIST ccpn-update-2.2.2-121119.patch.xz 223500 SHA256 9c419940b6c86347ad1d1cbe3f04c03e0331c79b9eca5c79acd972cf5e72d7d3 SHA512 24802c38f18d9ffe88d67212cfcee7b07312b7758d761b90ff1cf50a093926bfbf50b27f4a5b2bf85c9b5650fd9aa0ce29b621fe71b4c92327ba5d0ddd94289a WHIRLPOOL f43b19c2fcc61ae58a56b4e9465743068815da37c5469487364112e53c3ab64ac3319f180f06433cd53b1ebc4040e50a562168a3e5b87e68785fa42f9962efb2
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild
new file mode 100644
index 000000000000..3cff7cc2486f
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p121119.ebuild,v 1.1 2012/11/19 09:47:21 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="ssl tk"
+
+inherit eutils portability python toolchain-funcs versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extendnmr +opengl"
+
+RDEPEND="
+	dev-lang/tk[threads]
+	dev-python/numpy
+	dev-tcltk/tix
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*
+	sci-biology/psipred
+	x11-libs/libXext
+	x11-libs/libX11
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet )"
+# We need to fix this
+#		sci-chemistry/mdd
+DEPEND="${RDEPEND}"
+PDEPEND="
+	extendnmr? (
+		>=sci-chemistry/aria-2.3.2-r1
+		sci-chemistry/prodecomp )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+
+	sed \
+		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+		-e "s:weights_s:weights:g" \
+		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+	local tk_ver
+	local myconf
+
+	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+
+	if use opengl; then
+		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
+		IGNORE_GL_FLAG=""
+		GL_FLAG="-DUSE_GL_TRUE"
+		GL_DIR="${EPREFIX}/usr"
+		GL_LIB="-lglut -lGLU -lGL"
+		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
+		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
+
+	else
+		IGNORE_GL_FLAG="-DIGNORE_GL"
+		GL_FLAG="-DUSE_GL_FALSE"
+	fi
+
+	GLUT_NOT_IN_GL=""
+	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+
+	rm -rf data model doc license || die
+
+	sed \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
+		c/environment_default.txt > c/environment.txt || die
+
+	sed \
+		-e 's:ln -s:cp -f:g' \
+		-i $(find python -name linkSharedObjs) || die
+}
+
+src_compile() {
+	emake -C c all
+	emake -C c links
+}
+
+src_install() {
+	local libdir
+	local tkver
+	local _wrapper
+
+	find . -name "*.pyc" -type f -delete
+
+	libdir=$(get_libdir)
+	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
+	use extendnmr && _wrapper="${_wrapper} extendNmr"
+	for wrapper in ${_wrapper}; do
+		sed \
+			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|$(PYTHON -a)|g" \
+			-e "s|gentoousr|${EPREFIX}/usr|g" \
+			-e "s|//|/|g" \
+			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper}
+	done
+
+	local in_path=$(python_get_sitedir)/${PN}
+	local files
+	local pydocs
+
+	pydocs="$(find python -name doc -type d)"
+	rm -rf ${pydocs} || die
+
+	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+	sed \
+		-e 's|#from __future__|from __future__|g' \
+		-i ${i} || die
+	done
+
+	insinto ${in_path}
+
+	dodir ${in_path}/c
+
+	ebegin "Installing main files"
+		doins -r python
+	eend
+
+	ebegin "Adjusting permissions"
+
+	for _file in $(find "${ED}" -type f -name "*so"); do
+		chmod 755 ${_file}
+	done
+	eend
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild
index 4dc84bdfa494..d7bd1e7a19cb 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild,v 1.6 2012/11/11 15:23:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2.ebuild,v 1.7 2012/11/19 08:38:35 jlec Exp $
 
 EAPI=4
 
@@ -22,6 +22,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/cvector
+	dev-util/gtk-builder-convert
 	>=sci-libs/cbflib-0.9.2
 	>=sci-libs/cqrlib-1.1.2
 	>=sci-libs/neartree-3.1.1
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r1.ebuild
similarity index 65%
rename from sci-mathematics/gmp-ecm/gmp-ecm-6.4.3.ebuild
rename to sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r1.ebuild
index 8a153eff7db9..b725bea3508e 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3.ebuild,v 1.1 2012/11/16 03:58:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r1.ebuild,v 1.1 2012/11/19 07:14:59 patrick Exp $
 
 EAPI=4
 DESCRIPTION="Elliptic Curve Method for Integer Factorization"
@@ -18,3 +18,9 @@ DEPEND="dev-libs/gmp"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/ecm-${PV}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mkdir -p "${D}/usr/include/${PN}/"
+	cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
+}
diff --git a/sci-mathematics/msieve/msieve-1.50-r1.ebuild b/sci-mathematics/msieve/msieve-1.50-r1.ebuild
new file mode 100644
index 000000000000..9e2eb2b634ce
--- /dev/null
+++ b/sci-mathematics/msieve/msieve-1.50-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r1.ebuild,v 1.1 2012/11/19 06:19:46 patrick Exp $
+
+EAPI=4
+DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
+HOMEPAGE="http://sourceforge.net/projects/msieve/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
+
+inherit eutils
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zlib +ecm mpi"
+
+DEPEND="ecm? ( sci-mathematics/gmp-ecm )
+	mpi? ( virtual/mpi )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	if use ecm; then
+		export "ECM=1"
+	fi
+	if use mpi; then
+		export "MPI=1"
+	fi
+	if use zlib; then
+		export "ZLIB=1"
+	fi
+	if use amd64; then
+		emake x86_64 || die "Failed to build"
+	fi
+	if use x86; then
+		emake x86 || die "Failed to build"
+	fi
+}
+
+src_install() {
+	mkdir -p "${D}/usr/include/msieve"
+	mkdir -p "${D}/usr/lib/"
+	mkdir -p "${D}/usr/share/doc/${P}/"
+	cp include/* "${D}/usr/include/msieve" || die "Failed to install"
+	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
+	dobin msieve || die "Failed to install"
+	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
+}
diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest
new file mode 100644
index 000000000000..a8505fa203ec
--- /dev/null
+++ b/sci-mathematics/yafu/Manifest
@@ -0,0 +1 @@
+DIST yafu-1.33-src.zip 537546 SHA256 46f5c0bb17b5a933e463805fb9a87cbef4dc1c3938d0840604cd78fded0c41be SHA512 a39f22aa8b91dfe244fe2b84b89ec8bbe0f2f8d8db99310834da387a6572f08c6bf85d05159c982a02246305ec34e2b7ac7ce2d6962a4fae0b8f8caaeaf30022 WHIRLPOOL 54e280a8f96251de9f59bf4345341c4ee88c88c298404a1aa6f5c3790a25951aa42962490969653e4dcbc3798dac57104a1084b060ce9a946f8ead53e6bc4820
diff --git a/sci-mathematics/yafu/metadata.xml b/sci-mathematics/yafu/metadata.xml
new file mode 100644
index 000000000000..24cbb90cf0c4
--- /dev/null
+++ b/sci-mathematics/yafu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-mathematics/yafu/yafu-1.33.ebuild b/sci-mathematics/yafu/yafu-1.33.ebuild
new file mode 100644
index 000000000000..be1868ef9e3a
--- /dev/null
+++ b/sci-mathematics/yafu/yafu-1.33.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.33.ebuild,v 1.1 2012/11/19 07:41:56 patrick Exp $
+
+EAPI=4
+DESCRIPTION="Yet another factoring utility"
+HOMEPAGE="http://sourceforge.net/projects/yafu/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
+
+inherit eutils
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/gmp
+	sci-mathematics/gmp-ecm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# This is not nice. But then the Makefile is quite special :)
+	sed -i -e 's:../gmp/include:gmp:' Makefile 		|| die "Failed to rectify things"
+	sed -i -e 's:../gmp-ecm/include:gmp-ecm:' Makefile 	|| die "Failed to rectify things"
+	sed -i -e 's:LIBS += -L../:# LIBS += -L../:g' Makefile	|| die "Failed to rectify things"
+	sed -i -e 's:\"config.h\":<gmp-ecm/config.h>:g' top/driver.c	|| die "Failed to rectify things"
+}
+
+src_compile() {
+	if use amd64; then
+		emake x86_64 || die "Failed to build"
+	fi
+	if use x86; then
+		emake x86 || die "Failed to build"
+	fi
+}
+
+src_install() {
+	mkdir -p "${D}/usr/bin/"
+	cp "${S}/yafu" "${D}/usr/bin/" 					|| die "Failed to install"
+	mkdir -p "${D}/usr/share/doc/${PN}"
+	cp "${S}/docfile.txt" "${D}/usr/share/doc/${PN}/yafu.txt" 	|| die "Failed to install"
+	cp "${S}/README" "${D}/usr/share/doc/${PN}/"			|| die "Failed to install"
+	cp "${S}/yafu.ini" "${D}/usr/share/doc/${PN}/yafu.ini.example"	|| die "Failed to install"
+}
diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index 329738622f2e..45226518e8b8 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1 +1,2 @@
-DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359 SHA512 131b814325d888bb11ba552bc5bdd91ee2d8e139b06ac7ba94e716bcbbcc99ba30867eeea4aab580907916203bc526ae0bccda688151b250ba7943e193e50252 WHIRLPOOL d224dd52c7133e9768817319d0ad0d3797d426180b4d3d936d5189b500521ac4abe4abae7cc71f055d7e5194171f549b6fdb0221ae023cb35b16993741ad1e61
+DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
diff --git a/sys-apps/linux-misc-apps/files/hpfall.confd b/sys-apps/linux-misc-apps/files/hpfall.confd
new file mode 100644
index 000000000000..4f3451b0bff6
--- /dev/null
+++ b/sys-apps/linux-misc-apps/files/hpfall.confd
@@ -0,0 +1,6 @@
+# /etc/conf.d/hpfall
+
+# The name of the disk device that hpfall should protect.
+# Usually this is 'sda' or 'hda' the primary master.
+
+DISK="sda"
\ No newline at end of file
diff --git a/sys-apps/linux-misc-apps/files/hpfall.initd b/sys-apps/linux-misc-apps/files/hpfall.initd
new file mode 100644
index 000000000000..e8a4fbd8ace4
--- /dev/null
+++ b/sys-apps/linux-misc-apps/files/hpfall.initd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/files/hpfall.initd,v 1.1 2012/11/19 10:02:22 robbat2 Exp $
+
+checkconfig() {
+    if [ -z "$DISK" ] ; then
+	eerror "You need to setup DISK in /etc/conf.d/hpfall first"
+	return 1
+    fi
+
+    if [ ! -b /dev/${DISK} ]; then
+        eerror "Could not find disk /dev/${DISK}!"
+        eerror "Adjust the DISK setting in /etc/conf.d/hpfall"
+        return 1
+    fi
+
+    if [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then
+        eerror "No protect entry for ${DISK}!"
+        eerror "Kernel 2.6.28 and above is required"
+        return 1
+    fi
+
+    if [ ! -c /dev/freefall ]; then
+        ebegin "Loading hp_accel module"
+        modprobe hp_accel
+        eend $? || return 1
+    fi
+}
+
+start () {
+    checkconfig || return 1
+
+    ebegin "Starting active hard-drive protection daemon"
+    start-stop-daemon --start --quiet \
+        --exec /usr/sbin/hpfall /dev/${DISK}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping active hard-drive protection daemon"
+    start-stop-daemon --stop --quiet \
+        --exec /usr/sbin/hpfall
+    eend $?
+}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild
new file mode 100644
index 000000000000..0eebbe540805
--- /dev/null
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild,v 1.1 2012/11/19 10:23:08 robbat2 Exp $
+
+EAPI=4
+
+inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic
+
+DESCRIPTION="Misc tools bundled with kernel sources"
+HOMEPAGE="http://kernel.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="static-libs tcpd"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+LINUX_V=$(get_version_component_range 1-2)
+
+if [ ${PV/_rc} != ${PV} ]; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [ $(get_version_component_count) == 4 ]; then
+	# stable-release series
+	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
+SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+# pciutils for cpupower
+# pmtools also provides turbostat
+# sysfsutils and glib for usbip - remove sysfsutils in 3.7 or 3.8
+RDEPEND="sys-apps/pciutils
+		sys-apps/hwids
+		>=sys-fs/sysfsutils-2
+		>=dev-libs/glib-2.6
+		tcpd? ( sys-apps/tcp-wrappers )
+		!sys-power/pmtools
+		!net-misc/usbip"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/linux-${LINUX_VER}"
+
+# All of these are integrated with the kernel build system,
+# No make install, and ideally build with with the root Makefile
+TARGETS_SIMPLE=(
+	Documentation/accounting/getdelays.c
+	Documentation/cgroups/cgroup_event_listener.c
+	Documentation/laptops/dslm.c
+	Documentation/laptops/hpfall.c
+	Documentation/networking/timestamping/timestamping.c
+	Documentation/watchdog/src/watchdog-simple.c
+	tools/lguest/lguest.c
+	tools/vm/page-types.c
+	tools/vm/slabinfo.c
+	usr/gen_init_cpio.c
+)
+# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
+# Documentation/networking/ifenslave.c - obsolete
+# Documentation/ptp/testptp.c - pending linux-headers-3.0
+
+# These have a broken make install, no DESTDIR
+TARGET_MAKE_SIMPLE=(
+	tools/firewire:nosy-dump
+	tools/power/x86/turbostat:turbostat
+	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
+	Documentation/misc-devices/mei:mei-amt-version
+	tools/power/cpupower:cpupower
+)
+# tools/perf - covered by dev-utils/perf
+# tools/usb - testcases only
+# tools/virtio - testcaes only
+
+	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
+src_unpack() {
+	unpack ${LINUX_SOURCES}
+
+	MY_A=
+	for _AFILE in ${A}; do
+		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
+		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
+		MY_A="${MY_A} ${_AFILE}"
+	done
+	[[ -n ${MY_A} ]] && unpack ${MY_A}
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]]; then
+		epatch "${DISTDIR}"/${LINUX_PATCH}
+	fi
+
+	pushd drivers/staging/usbip/userspace >/dev/null &&
+	eautoreconf -i -f -v &&
+	popd >/dev/null || die "usbip"
+
+	libs="-lcpupower -lrt -lpci"
+	sed -i \
+		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
+		"${S}"/tools/power/cpupower/Makefile
+
+	sed -i \
+		-e '/^nosy-dump.*LDFLAGS/d' \
+		-e '/^nosy-dump.*CFLAGS/d' \
+		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
+		"${S}"/tools/firewire/Makefile
+}
+
+cpupower_make() {
+	emake ${makeargs} \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		docdir="/usr/share/doc/${PF}/cpupower" \
+		mandir="/usr/share/man" \
+		libdir="/usr/$(get_libdir)" \
+		OPTIMIZATION="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPUFREQ_BENCH=/bin/false \
+		DEBUG=/bin/false \
+		STRIP=/bin/true \
+		"$@" || die
+}
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86|amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+src_configure() {
+	cd drivers/staging/usbip/userspace && \
+	econf \
+		$(use_enable static-libs static) \
+		$(use tcpd || echo --without-tcp-wrappers) \
+		--with-usbids-dir=/usr/share/misc
+}
+
+src_compile() {
+	local karch=$(kernel_asm_arch "${ARCH}")
+	# This is the minimal amount needed to start building host binaries.
+	#emake allmodconfig ARCH=${karch} || die
+	#emake prepare modules_prepare ARCH=${karch} || die
+	#touch Module.symvers
+
+	# Now we can start building
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Building $s => $bin"
+		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c} || die
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target=${t/*:}
+		einfo "Building $dir => $target"
+		emake -C $dir ARCH=${karch} $target || die
+	done
+
+	emake -C drivers/staging/usbip/userspace
+
+	# cpupower is special
+	einfo "Buildling cpupower"
+	cd "${S}"/tools/power/cpupower
+	cpupower_make ARCH=${karch} all || die
+}
+
+src_install() {
+	into /usr
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Installing $s => $bin"
+		dosbin ${dir}/${bin} || die "Failed to install ${bin}"
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target=${t/*:}
+		einfo "Installing $dir => $target"
+		dosbin ${dir}/${target} || die
+	done
+
+	pushd drivers/staging/usbip/userspace >/dev/null \
+		|| die "Missing usbip/userspace"
+	emake DESTDIR="${D}" install
+
+	newdoc README README.usbip
+	newdoc AUTHORS AUTHORS.usbip
+	dodoc ../usbip_protocol.txt
+	popd >/dev/null
+
+	local karch=$(kernel_asm_arch "${ARCH}")
+	pushd "${S}"/tools/power/cpupower >/dev/null \
+		|| die "Missing tools/power/cpupower"
+	cpupower_make ARCH=${karch} DESTDIR="${D}" install || die
+	popd >/dev/null
+
+	# Avoid conflict
+	rm -f "${D}"/usr/include/cpufreq.h
+
+	newconfd "${FILESDIR}"/hpfall.confd hpfall
+	newinitd "${FILESDIR}"/hpfall.initd hpfall
+	prune_libtool_files
+}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.6.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.6.ebuild
new file mode 100644
index 000000000000..3624d0a28474
--- /dev/null
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.6.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/linux-misc-apps-3.6.ebuild,v 1.1 2012/11/19 10:02:22 robbat2 Exp $
+
+EAPI=4
+
+inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic
+
+DESCRIPTION="Misc tools bundled with kernel sources"
+HOMEPAGE="http://kernel.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+LINUX_V=$(get_version_component_range 1-2)
+
+if [ ${PV/_rc} != ${PV} ]; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [ $(get_version_component_count) == 4 ]; then
+	# stable-release series
+	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
+SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+# pciutils for cpupower
+# pmtools also provides turbostat
+# sysfsutils and glib for usbip
+RDEPEND="sys-apps/pciutils
+		sys-fs/sysfsutils
+		dev-libs/glib
+		!sys-power/pmtools
+		!net-misc/usbip"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/linux-${LINUX_VER}"
+
+# All of these are integrated with the kernel build system,
+# No make install, and ideally build with with the root Makefile
+TARGETS_SIMPLE=(
+	Documentation/accounting/getdelays.c
+	Documentation/cgroups/cgroup_event_listener.c
+	Documentation/laptops/dslm.c
+	Documentation/laptops/hpfall.c
+	Documentation/networking/timestamping/timestamping.c
+	Documentation/watchdog/src/watchdog-simple.c
+	tools/lguest/lguest.c
+	tools/vm/page-types.c
+	tools/vm/slabinfo.c
+	usr/gen_init_cpio.c
+)
+# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
+# Documentation/networking/ifenslave.c - obsolete
+# Documentation/ptp/testptp.c - pending linux-headers-3.0
+
+# These have a broken make install, no DESTDIR
+TARGET_MAKE_SIMPLE=(
+	tools/firewire:nosy-dump
+	tools/power/x86/turbostat:turbostat
+	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
+	Documentation/misc-devices/mei:mei-amt-version
+	tools/power/cpupower:cpupower
+)
+# tools/perf - covered by dev-utils/perf
+# tools/usb - testcases only
+# tools/virtio - testcaes only
+
+	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
+src_unpack() {
+	unpack ${LINUX_SOURCES}
+
+	MY_A=
+	for _AFILE in ${A}; do
+		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
+		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
+		MY_A="${MY_A} ${_AFILE}"
+	done
+	[[ -n ${MY_A} ]] && unpack ${MY_A}
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]]; then
+		epatch "${DISTDIR}"/${LINUX_PATCH}
+	fi
+
+	pushd drivers/staging/usbip/userspace >/dev/null &&
+	eautoreconf -i -f -v &&
+	popd >/dev/null || die "usbip"
+
+	libs="-lcpupower -lrt -lpci"
+	sed -i \
+		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
+		"${S}"/tools/power/cpupower/Makefile
+
+	sed -i \
+		-e '/^nosy-dump.*LDFLAGS/d' \
+		-e '/^nosy-dump.*CFLAGS/d' \
+		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
+		"${S}"/tools/firewire/Makefile
+}
+
+cpupower_make() {
+	emake ${makeargs} \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		docdir="/usr/share/doc/${PF}/cpupower" \
+		mandir="/usr/share/man" \
+		libdir="/usr/$(get_libdir)" \
+		OPTIMIZATION="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPUFREQ_BENCH=/bin/false \
+		DEBUG=/bin/false \
+		STRIP=/bin/true \
+		"$@" || die
+}
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86|amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+src_configure() {
+	cd drivers/staging/usbip/userspace && econf
+}
+
+src_compile() {
+	local karch=$(kernel_asm_arch "${ARCH}")
+	# This is the minimal amount needed to start building host binaries.
+	#emake allmodconfig ARCH=${karch} || die
+	#emake prepare modules_prepare ARCH=${karch} || die
+	#touch Module.symvers
+
+	# Now we can start building
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Building $s => $bin"
+		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c} || die
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target=${t/*:}
+		einfo "Building $dir => $target"
+		emake -C $dir ARCH=${karch} $target || die
+	done
+
+	emake -C drivers/staging/usbip/userspace
+
+	# cpupower is special
+	einfo "Buildling cpupower"
+	cd "${S}"/tools/power/cpupower
+	cpupower_make ARCH=${karch} all || die
+}
+
+src_install() {
+	into /usr
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Installing $s => $bin"
+		dosbin ${dir}/${bin} || die "Failed to install ${bin}"
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target=${t/*:}
+		einfo "Installing $dir => $target"
+		dosbin ${dir}/${target} || die
+	done
+
+	emake -C drivers/staging/usbip/userspace DESTDIR="${D}" install
+
+	local karch=$(kernel_asm_arch "${ARCH}")
+	cd "${S}"/tools/power/cpupower
+	cpupower_make ARCH=${karch} DESTDIR="${D}" install || die
+
+	# Avoid conflict
+	rm -f "${D}"/usr/include/cpufreq.h
+
+	newconfd "${FILESDIR}"/hpfall.confd hpfall
+	newinitd "${FILESDIR}"/hpfall.initd hpfall
+}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index d97c2989a293..19618c3e2f30 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -3,3 +3,4 @@ DIST gcc-config-1.7.1.tar.xz 14708 SHA256 5d69148957bc48db2bf107558724d8c40701f8
 DIST gcc-config-1.7.2.tar.xz 15004 SHA256 2d235dfc1ff749b46ae8342dc3d30d5628f22eecd1ea665d16f90e82da88e899 SHA512 3bc2964fa9ede507a778787434e3aa64ef691616063d7d55020878eab9a8bf08ed5a6530dd36e15348927db9ce2b7fe22fa2aeb0039549a6e69ca895c087169b WHIRLPOOL 2692bd8289ae224a3011fbef94e45e7b903138cfa11dad4e27eca7a239f67a682def5563745bdebdfe05359d909d3f49142b23bc13141d4fa8528085c3a19299
 DIST gcc-config-1.7.3.tar.xz 15088 SHA256 2c6cca69a028f157dc54e19ea10efc240e0d26824cd223b22c294c003ce9325e SHA512 88b585787b5ad79017b27e68dbca6b5de96784582ee657d18562b1994bc1c27a6609b3dfcbf30f39a02b0b2886a289a1ddc955281fc60fe974436d13aa685908 WHIRLPOOL a9a45b489e34756da66e4597ba9f4fa061b5431a82310317237293a0c519c72906d14d3c72b76483c1c674bf779ac606cf85f22a5e4a4065dd92b1b91215461a
 DIST gcc-config-1.7.tar.xz 14584 SHA256 b704cb3b98c7a8f478dcc932ae7e4ac4f4f8a847bebe35f97dc45fa7a29268ee SHA512 4ab78c662feab59bc55e40b9dc63b967c1551b6d084638e2a16866488510e7c34e0b30a0bedaeae9dd806c77f79d1e31ccb834c6112794e7fbb557756f59c43d WHIRLPOOL 50415916834dc9d097e78afbc09a32a023e3542dd6ebcf60cd6c12d0e8fc484a6d63f821c9d3acf958fdaf5ce209976521bf22d3adcd5d20fa522f1f2fd38bdb
+DIST gcc-config-1.8.tar.xz 15020 SHA256 2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826 WHIRLPOOL 4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6
diff --git a/sys-devel/gcc-config/gcc-config-1.8.ebuild b/sys-devel/gcc-config/gcc-config-1.8.ebuild
new file mode 100644
index 000000000000..2cb85821ba8f
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.8.ebuild,v 1.1 2012/11/19 06:55:06 vapier Exp $
+
+inherit unpacker toolchain-funcs multilib
+
+DESCRIPTION="utility to manage compilers"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		install || die
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains
+	rm -f "${ROOT}"/etc/env.d/05compiler &
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config &
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	rm -f "${ROOT}"/usr/include/g++{,-v3} &
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	wait
+}
diff --git a/sys-fs/progsreiserfs/Manifest b/sys-fs/progsreiserfs/Manifest
index cdb55798c5a1..661fbbdbc4a4 100644
--- a/sys-fs/progsreiserfs/Manifest
+++ b/sys-fs/progsreiserfs/Manifest
@@ -1 +1 @@
-DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 RMD160 364fc979255c1cde4e35f81dd54391e37e8739db SHA1 fa7f868c71e3c603d3ec0de27a3bc1913ffc9606 SHA256 1473899a21df0679a32ebde5a35c158468a7e51a0cb6fd89d77c42bfde9b6399
+DIST progsreiserfs-0.3.1-rc8.tar.gz 399279 SHA256 1473899a21df0679a32ebde5a35c158468a7e51a0cb6fd89d77c42bfde9b6399 SHA512 65266ab5a598b2073e6893da6554bdfe43796be3bd608eb7c4f687c3ef6ed395ce67def49b62d2b3705dfdeb38bd5f5d1c91fec6ad7323788d490058b015c26d WHIRLPOOL 2afe87ef74d7bbbd012b5dd141663291222e8bf22ae318ac217e38f0af90f7524beb15362ebbc001f3998f14a555b10586e09a5cb412c105dce6b791cd2ee2fa
diff --git a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
new file mode 100644
index 000000000000..4a0753f4f09b
--- /dev/null
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-autotools.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/442226
+
+--- progsreiserfs.m4
++++ progsreiserfs.m4
+@@ -10,7 +10,7 @@
+ dnl Adds the required libraries to $REISERFS_LIBS and does an
+ dnl AC_SUBST(REISERFS_LIBS)
+ 
+-AC_DEFUN(AC_CHECK_LIBREISERFS,
++AC_DEFUN([AC_CHECK_LIBREISERFS],
+ [
+ 
+ dnl save LIBS
diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
index 02835e700052..fd37c74e33e5 100644
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild,v 1.9 2011/02/17 05:24:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild,v 1.10 2012/11/19 10:02:54 ssuominen Exp $
 
-inherit libtool flag-o-matic
+EAPI=5
+
+inherit eutils flag-o-matic libtool
+
+MY_P=${PN}-${PV/_/-}
 
-MY_P="${PN}-${PV/_/-}"
 DESCRIPTION="Library for accessing and manipulating reiserfs partitions"
 HOMEPAGE="http://reiserfs.linux.kiev.ua/"
 SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz"
@@ -12,48 +15,46 @@ SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE="nls debug"
+IUSE="debug examples nls static-libs"
 
 RDEPEND=""
-DEPEND="sys-fs/e2fsprogs
+DEPEND="${RDEPEND}
+	sys-apps/util-linux
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
-progsreiserfs_warning() {
-	ewarn "progsreiserfs has been proven dangerous in the past, generating bad"
-	ewarn "partitions and destroying data on resize/cpfs operations."
-	ewarn "Because of this, we do NOT provide their binaries, but only their"
-	ewarn "libraries instead, as these are needed for other applications."
-}
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
 
-src_compile() {
 	elibtoolize
+}
+
+src_configure() {
 	filter-lfs-flags
+
 	econf \
+		$(use_enable static-libs static) \
 		--disable-Werror \
 		$(use_enable nls) \
-		$(use_enable debug) \
-		|| die "Configure failed"
-	emake || die "Make failed"
-	progsreiserfs_warning
+		$(use_enable debug)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	# Make sure users only use the official namesys binaries
-	rm -r "${D}"/usr/{sbin,share/man} || die "cant punt the cruft"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	docinto demos
-	dodoc demos/*.c
-	progsreiserfs_warning
-}
+	default
 
-pkg_postinst() {
-	progsreiserfs_warning
+	if use examples; then
+		docinto examples
+		dodoc demos/*.c
+	fi
+
+	rm -r "${ED}"/usr/{sbin,share/man} || die
+	prune_libtool_files
 }
 
-pkg_preinst() {
-	progsreiserfs_warning
+pkg_postinst() {
+	ewarn "progsreiserfs has been proven dangerous in the past, generating bad"
+	ewarn "partitions and destroying data on resize/cpfs operations."
+	ewarn "Because of this, we do NOT provide their binaries, but only their"
+	ewarn "libraries instead, as these are needed for other applications."
 }
diff --git a/sys-power/acpid/acpid-2.0.16-r1.ebuild b/sys-power/acpid/acpid-2.0.16-r1.ebuild
index 984ced53270d..9a4fcd5c0e8a 100644
--- a/sys-power/acpid/acpid-2.0.16-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.16-r1.ebuild,v 1.4 2012/07/01 18:37:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.16-r1.ebuild,v 1.5 2012/11/19 09:31:34 pinkbyte Exp $
 
 EAPI=4
 inherit systemd
@@ -37,11 +37,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
-	elog "You may wish to read the Gentoo Linux Power Management Guide,"
-	elog "which can be found online at:"
-	elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
-	elog
+	if ! has_version 'sys-power/acpid'; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
+		elog
+	fi
 
 	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
 	mkdir -p "${ROOT}"/run
diff --git a/sys-power/acpid/acpid-2.0.17.ebuild b/sys-power/acpid/acpid-2.0.17.ebuild
index 0e2b8295ebf4..d1b0a76a93d7 100644
--- a/sys-power/acpid/acpid-2.0.17.ebuild
+++ b/sys-power/acpid/acpid-2.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.17.ebuild,v 1.3 2012/11/18 13:29:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.17.ebuild,v 1.4 2012/11/19 09:31:34 pinkbyte Exp $
 
 EAPI=4
 inherit systemd
@@ -37,11 +37,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
-	elog "You may wish to read the Gentoo Linux Power Management Guide,"
-	elog "which can be found online at:"
-	elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
-	elog
+	if ! has_version 'sys-power/acpid'; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
+		elog
+	fi
 
 	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
 	mkdir -p "${ROOT}"/run
diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild
index 463c363d7b33..a351d3e46d70 100644
--- a/virtual/notification-daemon/notification-daemon-0.ebuild
+++ b/virtual/notification-daemon/notification-daemon-0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/notification-daemon/notification-daemon-0.ebuild,v 1.7 2012/06/02 12:25:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/notification-daemon/notification-daemon-0.ebuild,v 1.8 2012/11/19 09:19:26 ssuominen Exp $
 
 EAPI=2
 
@@ -21,6 +21,7 @@ RDEPEND="
 		x11-misc/qtnotifydaemon
 		x11-misc/notify-osd
 		>=x11-wm/awesome-3.4.4
+		x11-wm/enlightenment[enlightenment_modules_notification]
 		x11-wm/enlightenment[e_modules_notification]
 		kde-base/knotify ) )"
 DEPEND=""