diff --git a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
index 850370381e84..8d03f849601a 100644
--- a/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild,v 1.5 2011/10/24 16:22:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.1.ebuild,v 1.6 2011/11/09 17:36:10 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools fixheadtails eutils multilib
@@ -108,6 +108,9 @@ src_install() {
 }
 
 pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
+
 	# bug #355257
 	if ! has_version app-admin/logrotate ; then
 		echo
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 228a81a5487a..bd3989be23f3 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -2,3 +2,4 @@ DIST libvirt-0.9.3-backports-2.tar.bz2 2165 RMD160 445a2391fa10b76160ecb1d1d80ea
 DIST libvirt-0.9.3.tar.gz 15958983 RMD160 a01dbe29e23225706afcff74146aa3b224ba04bb SHA1 e25850d270a24441305dd92935209efa993b479d SHA256 4d673be9aa7b5618c0fef3cfdbbbeff02df1c83e26680fe40defad2b32a56ae3
 DIST libvirt-0.9.4.tar.gz 16643543 RMD160 a9edfdac715caac650520e5e12dd499f46e9957b SHA1 29e81c972ca7c3e73f4cecf84e77f68739ef00a2 SHA256 e76c026646ae4885b162bf711b854f36195f93538d6fcbee48479c2354a342af
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
+DIST libvirt-0.9.7.tar.gz 17853636 RMD160 d5a9e7461fc2c487aadf7e8955a213252edd1e2e SHA1 2f08609267154ad5377b3dc3952eb1e77469b570 SHA256 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23
diff --git a/app-emulation/libvirt/libvirt-0.9.7.ebuild b/app-emulation/libvirt/libvirt-0.9.7.ebuild
new file mode 100644
index 000000000000..3649f568068e
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-0.9.7.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.7.ebuild,v 1.1 2011/11/09 15:58:15 cardoe Exp $
+
+#BACKPORTS=2
+#AUTOTOOLIZE=yes
+
+EAPI="3"
+
+MY_P="${P/_rc/-rc}"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	GIT_ECLASS="git-2"
+	AUTOTOOLIZE=yes
+fi
+
+PYTHON_DEPEND="python? 2:2.4"
+#RESTRICT_PYTHON_ABIS="3.*"
+#SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python ${AUTOTOOLIZE+autotools} ${GIT_ECLASS}
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.bz2
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
+	uml virtualbox virt-network xen elibc_glibc"
+# IUSE=one : bug #293416 & bug #299011
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	>=dev-libs/libxml2-2.7.6
+	>=dev-libs/libnl-1.1:1.1
+	>=net-libs/gnutls-1.0.25
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	iscsi? ( sys-block/open-iscsi )
+	json? ( dev-libs/yajl )
+	libvirtd? ( net-misc/bridge-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? ( >sys-process/numactl-2.0.2 )
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	phyp? ( net-libs/libssh2 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-firewall/ebtables
+		sys-apps/iproute2 )
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	myconf="${myconf} $(use_enable debug)"
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	 # leave it automagic as it depends on the version of xen used.
+	use xen || myconf+=" --without-libxl"
+
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	# doesn't belong with hypervisors but links to libvirtd for some reason
+	#myconf="${myconf} $(use_with one)"
+
+	## hypervisor protocols
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+
+	## additional host drivers
+	myconf="${myconf} $(use_with virt-network network)"
+	myconf="${myconf} --with-storage-fs"
+	myconf="${myconf} $(use_with lvm storage-lvm)"
+	myconf="${myconf} $(use_with iscsi storage-iscsi)"
+	myconf="${myconf} $(use_with parted storage-disk)"
+	myconf="${myconf} $(use_with lvm storage-mpath)"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} $(use_with selinux)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	# network bits
+	myconf="${myconf} $(use_with macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+	myconf="${myconf} $(use_with json yajl)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf --without-audit"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF}/python \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${FILESDIR}/libvirtd.init-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r2" libvirtd || die
+
+	keepdir /var/lib/libvirt/images
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize libvirt.py
+
+	elog
+	if use policykit && has_version sys-auth/policykit; then
+		elog "You must have run the following at least once:"
+		elog
+		elog "$ polkit-auth --grant org.libvirt.unix.manage --user \"USERNAME\""
+		elog
+		elog "to grant USERNAME access to libvirt when using USE=policykit"
+	else
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog " unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	elog
+	elog "For the basic networking support (bridged and routed networks)"
+	elog "you don't need any extra software. For more complex network modes"
+	elog "including but not limited to NATed network, you can enable the"
+	elog "'virt-network' USE flag."
+	elog
+	if has_version net-dns/dnsmasq; then
+		ewarn "If you have a DNS server setup on your machine, you will have"
+		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
+		ewarn " bind-interfaces"
+		ewarn " interface or except-interface"
+		ewarn
+		ewarn "Otherwise you might have issues with your existing DNS server."
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup libvirt.py
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 0fb7bddb1ba1..308672754072 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.11 2011/10/27 18:57:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.12 2011/11/09 16:01:24 cardoe Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -207,7 +207,7 @@ src_install() {
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 
-	newinitd "${FILESDIR}/libvirtd.init-r4" libvirtd || die
+	newinitd "${FILESDIR}/libvirtd.init-r5" libvirtd || die
 	newconfd "${FILESDIR}/libvirtd.confd-r2" libvirtd || die
 
 	keepdir /var/lib/libvirt/images
diff --git a/app-i18n/ibus-tutcode/Manifest b/app-i18n/ibus-tutcode/Manifest
index b2fe91b422bb..d3ec1fd69203 100644
--- a/app-i18n/ibus-tutcode/Manifest
+++ b/app-i18n/ibus-tutcode/Manifest
@@ -1 +1,2 @@
 DIST ibus-tutcode-1.0.0.tar.bz2 216599 RMD160 9cd0b530073915db3729e22d7859387a82625229 SHA1 f81ff24dad926e156334dddfb81281bb21d30d88 SHA256 d0d15f43960ffa0af22ddc7461add7e08f65d3006ed75de35090e5e42419d098
+DIST ibus-tutcode-1.0.1.tar.bz2 217017 RMD160 1244267ea5458a33b748c61bc1b116deb47c312d SHA1 f9d8d56a6f6a7f8061a22b1593f577904dff566b SHA256 5a3bd8a941602e33799dc6c8b09a38e0009b98c004ebf4557cc6391221909900
diff --git a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.1.ebuild b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.1.ebuild
new file mode 100644
index 000000000000..d4f150e2d16a
--- /dev/null
+++ b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-tutcode/ibus-tutcode-1.0.1.ebuild,v 1.1 2011/11/09 04:54:11 naota Exp $
+
+EAPI=4
+
+DESCRIPTION="a Japanese TUT-Code input engine for IBus"
+HOMEPAGE="https://github.com/deton/ibus-tutcode/"
+SRC_URI="https://github.com/downloads/deton/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.5
+	>=sys-devel/gettext-0.16.1"
+RDEPEND="${DEPEND}
+	app-i18n/ibus"
+
+src_install() {
+	default
+	dodoc ${PN}.json.example
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7ed733d97030..533c34fefba8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -74,6 +74,7 @@ DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a0
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
 DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
 DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
+DIST libreoffice-3.4.4.2-patchset-01.tar.xz 3576 RMD160 6a2bea02a549661d03d68febe650e929a273ceb9 SHA1 85bfeefad25ffa99beb7620125b33ec91a94295a SHA256 c3bf80e40a21ff436f4b9e9f45aab8e4ea1e0ddf2dd99202d513e2db1a7e5853
 DIST libreoffice-artwork-3.3.4.1.tar.bz2 21989297 RMD160 7700b89bebbf299697fb4420ec3091f107fcca25 SHA1 9dd17d8934c1efa8f14727b8513b51b25f82aebc SHA256 d20f6da3a4c5d81816c401ca673eb151069f38277a9805dd6a36a9074d7f1fda
 DIST libreoffice-artwork-3.4.3.2.tar.bz2 13537796 RMD160 26c74962452a3be0258f9417bea66c50b9e9fc80 SHA1 a42d6a44c3b3605cea49c66162507adec5c1f246 SHA256 6b700d41c593d2befcd85fe497d4a6e96db3b7e1639921674ae238022d1ea743
 DIST libreoffice-artwork-3.4.4.2.tar.bz2 13539032 RMD160 e16be6bca3824198cbc66366aafa28878a7bc490 SHA1 ceb591a97a5132cf50756dffac974c76d9f535bd SHA256 b30265ed7b30fa87eee4677521b414984d41c2a9766364a624c623fffba4aae9
diff --git a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
similarity index 96%
rename from app-office/libreoffice/libreoffice-3.4.4.2.ebuild
rename to app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
index 58b5f92b01d5..7350a008c7fd 100644
--- a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild,v 1.2 2011/11/07 18:04:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.1 2011/11/09 19:08:40 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
@@ -31,6 +32,7 @@ unset SCM_ECLASS
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Bootstrap MUST be first!
 MODULES="bootstrap artwork base calc components extensions extras filters help
@@ -299,6 +301,8 @@ src_unpack() {
 		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
 	fi
 
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+
 	# copy extension templates; o what fun ...
 	if use templates; then
 		dest="${S}/extras/source/extensions"
@@ -329,6 +333,13 @@ src_prepare() {
 	# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
 	filter-flags "-O*"
 
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
 	base_src_prepare
 	eautoreconf
 }
@@ -357,9 +368,9 @@ src_configure() {
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
 	# dmake: not worth of splitting out
 	# cppunit: patched not to run anything, just main() { return 0; }
-	#          workaround to upstream running the tests during build
+	#		  workaround to upstream running the tests during build
 	# sane: just sane.h header that is used for scan in writer, not
-	#       linked or anything else, worthless to depend on
+	#	   linked or anything else, worthless to depend on
 	internal_libs+="
 		--without-system-hsqldb
 		--without-system-cppunit
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 4960ef15a791..2f5100735830 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.19 2011/11/07 18:04:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.20 2011/11/09 19:08:40 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
@@ -31,6 +32,7 @@ unset SCM_ECLASS
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Bootstrap MUST be first!
 MODULES="bootstrap artwork base calc components extensions extras filters help
@@ -270,6 +272,7 @@ pkg_setup() {
 src_unpack() {
 	local mod dest tmplfile tmplname mypv
 
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
 	if use branding; then
 		unpack "${BRANDING}"
 	fi
@@ -329,6 +332,14 @@ src_prepare() {
 	# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
 	filter-flags "-O*"
 
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
 	base_src_prepare
 	eautoreconf
 }
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index c3d1be898121..9a3d6b88291d 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.54 2011/11/08 11:03:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.56 2011/11/09 19:08:40 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
 ADDONS_URI="http://dev-www.libreoffice.org/src/"
 
 BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
 inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
@@ -31,10 +32,11 @@ unset SCM_ECLASS
 DESCRIPTION="LibreOffice, a full office productivity suite."
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs
 # Core MUST be first!
-MODULES="core binfilter dictionaries help"
+MODULES="core binfilter"
 # Only release has the tarballs
 if [[ ${PV} != *9999* ]]; then
 	for i in ${DEV_URI}; do
@@ -243,6 +245,7 @@ pkg_setup() {
 src_unpack() {
 	local mod dest tmplfile tmplname mypv
 
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
 	if use branding; then
 		unpack "${BRANDING}"
 	fi
@@ -299,6 +302,14 @@ src_prepare() {
 	export ARCH_FLAGS="${CXXFLAGS}"
 	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
 	base_src_prepare
 	eautoreconf
 	# hack in the autogen.sh
@@ -425,6 +436,7 @@ src_configure() {
 		--without-ppds \
 		--without-stlport \
 		--without-system-mozilla \
+		--without-help \
 		--without-helppack-integration \
 		$(use_enable binfilter) \
 		$(use_enable dbus) \
diff --git a/app-vim/slimv/slimv-0.9.2.ebuild b/app-vim/slimv/slimv-0.9.2.ebuild
index 8575dd6b12e4..0241096ac01c 100644
--- a/app-vim/slimv/slimv-0.9.2.ebuild
+++ b/app-vim/slimv/slimv-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/app-vim/slimv/slimv-0.9.2.ebuild,v 1.3 2011/11/09 06:33:21 radhermit Exp $
 
 EAPI=4
 
diff --git a/dev-embedded/mspdebug/Manifest b/dev-embedded/mspdebug/Manifest
index 693212196f61..d603bc0afb74 100644
--- a/dev-embedded/mspdebug/Manifest
+++ b/dev-embedded/mspdebug/Manifest
@@ -1,3 +1,2 @@
-DIST mspdebug-0.15.tar.gz 108076 RMD160 8ffa9eaee650a8fb8be74ce4505d53c9855fbe0a SHA1 9e46fceacf8194bb742b08d53fa00a0cd5d7ac06 SHA256 ffdb1cdb34b81fd2a5eccd1c115f7d785837ef708b4b8816eb7a7b28f529bacb
-DIST mspdebug-0.16.tar.gz 111742 RMD160 58f338e9904bf84d96ae0d8f63813b4dc7732b36 SHA1 8e1627c738b1a1001a00a549d90a66ce4c85ac02 SHA256 0a2c25e88cd037e315ebfc22d6bb2e7ec8932115f1f7579d89fdde48e51db510
 DIST mspdebug-0.17.tar.gz 144012 RMD160 7b7bda39df994d1f3af8c222066651bde2f48bea SHA1 84f183380022fc6aaf709f0ca80e7146a9adbbdd SHA256 f9c1ffb39969ad7716347112e66c6e67b9f57bc47ed7a4379697d1144ee3b8a4
+DIST mspdebug-0.18.tar.gz 171442 RMD160 fc701a02b48b410567c4026e3a01c46977c52ef4 SHA1 a5143c6b451c345c33b900bc2c89ff4219a0c88d SHA256 365f614b94679d36cd777135b2ab152a495bae7350ec192c6ce1a3a5b390170b
diff --git a/dev-embedded/mspdebug/mspdebug-0.16.ebuild b/dev-embedded/mspdebug/mspdebug-0.16.ebuild
deleted file mode 100644
index 8e06e0a86724..000000000000
--- a/dev-embedded/mspdebug/mspdebug-0.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/mspdebug/mspdebug-0.16.ebuild,v 1.1 2011/06/14 10:14:13 radhermit Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free debugger for use with MSP430 MCUs"
-HOMEPAGE="http://mspdebug.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline )
-	virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:-O1 \(.*\) -ggdb:\1:" Makefile
-}
-
-src_compile() {
-	local myflags
-	! use readline && myflags="WITHOUT_READLINE=1"
-
-	emake CC=$(tc-getCC) ${myflags}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc AUTHORS ChangeLog
-}
diff --git a/dev-embedded/mspdebug/mspdebug-0.15.ebuild b/dev-embedded/mspdebug/mspdebug-0.18.ebuild
similarity index 78%
rename from dev-embedded/mspdebug/mspdebug-0.15.ebuild
rename to dev-embedded/mspdebug/mspdebug-0.18.ebuild
index 10e3ad5e6a29..28337095cc1d 100644
--- a/dev-embedded/mspdebug/mspdebug-0.15.ebuild
+++ b/dev-embedded/mspdebug/mspdebug-0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/mspdebug/mspdebug-0.15.ebuild,v 1.1 2011/04/19 02:34:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/mspdebug/mspdebug-0.18.ebuild,v 1.1 2011/11/09 06:20:39 radhermit Exp $
 
 EAPI=4
 
@@ -27,10 +27,10 @@ src_compile() {
 	local myflags
 	! use readline && myflags="WITHOUT_READLINE=1"
 
-	emake CC=$(tc-getCC) ${myflags}
+	emake CC="$(tc-getCC)" ${myflags}
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc AUTHORS ChangeLog
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}"/usr install
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/dev-games/cegui/cegui-0.7.5-r1.ebuild b/dev-games/cegui/cegui-0.7.5-r1.ebuild
index b25f1e55c8fc..1f0f35486bf2 100644
--- a/dev-games/cegui/cegui-0.7.5-r1.ebuild
+++ b/dev-games/cegui/cegui-0.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v 1.4 2011/10/09 16:44:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v 1.6 2011/11/09 06:56:24 mr_bones_ Exp $
 
 EAPI=4
 inherit eutils
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 -ppc x86"
-IUSE="bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip"
+IUSE="bidi debug devil doc examples expat gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip"
 REQUIRED_USE="|| ( xml tinyxml )" # bug 362223
 
 RDEPEND="bidi? ( dev-libs/fribidi )
@@ -27,7 +27,6 @@ RDEPEND="bidi? ( dev-libs/fribidi )
 		dev-lang/lua
 		dev-lua/toluapp
 	)
-	ogre? ( dev-games/ogre )
 	opengl? (
 		virtual/opengl
 		virtual/glu
@@ -48,6 +47,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-tinyxml.patch \
 		"${FILESDIR}"/${P}-gcc46.patch
 
+	# build with newer zlib (bug #389863)
+	sed -i -e '74i#define OF(x) x' cegui/src/minizip/unzip.h || die
+	sed -i -e '125i#define OF(x) x' cegui/src/minizip/ioapi.h || die
 	if use examples ; then
 		cp -r Samples Samples.clean
 		rm -f $(find Samples.clean -name 'Makefile*')
@@ -55,7 +57,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# ogre-1.6.5 needs older cegui (bug #387103)
 	econf \
+		--disable-ogre-renderer \
 		$(use_enable bidi bidirectional-text) \
 		$(use_enable debug) \
 		$(use_enable devil) \
@@ -66,7 +70,6 @@ src_configure() {
 		$(use_enable lua lua-module) \
 		$(use_enable lua toluacegui) \
 		--enable-external-toluapp \
-		$(use_enable ogre ogre-renderer) \
 		$(use_enable opengl opengl-renderer) \
 		--enable-external-glew \
 		$(use_enable pcre) \
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
new file mode 100644
index 000000000000..55a10565328f
--- /dev/null
+++ b/dev-java/guava/Manifest
@@ -0,0 +1 @@
+DIST guava-r07.zip 3044916 RMD160 1ff305ee297e396c9019614a0f76ac9af810a954 SHA1 abc951ce3e1e7e008c5589524825c49349fbb62e SHA256 3d0da5843235b26dc5d47b75df48a6f06f0cc428534580762352b3b00fa45c40
diff --git a/dev-java/guava/guava-07.ebuild b/dev-java/guava/guava-07.ebuild
new file mode 100644
index 000000000000..205835172abf
--- /dev/null
+++ b/dev-java/guava/guava-07.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-07.ebuild,v 1.1 2011/11/09 19:17:24 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-r${PV}"
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://code.google.com/p/guava-libraries/"
+SRC_URI="http://guava-libraries.googlecode.com/files/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+JAVA_GENTOO_CLASSPATH="jsr305"
+
+java_prepare() {
+	unpack ./${PN}-src-r${PV}.zip
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc README
+}
diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml
new file mode 100644
index 000000000000..5c1de9832cf2
--- /dev/null
+++ b/dev-java/guava/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription lang="en">
+The Guava project contains several of Google's core libraries that we rely on in our Java-based projects: collections, caching, primitives support, concurrency libraries, common annotations, string processing, I/O, and so forth.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/jemalloc/jemalloc-2.2.3.ebuild b/dev-libs/jemalloc/jemalloc-2.2.3.ebuild
index fd77050e0a46..61c157f43067 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.3.ebuild
+++ b/dev-libs/jemalloc/jemalloc-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.3.ebuild,v 1.1 2011/09/17 12:24:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.3.ebuild,v 1.2 2011/11/09 19:53:21 xarthisius Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="debug stats"
 
diff --git a/dev-libs/libffi/libffi-3.0.10.ebuild b/dev-libs/libffi/libffi-3.0.10.ebuild
index b3bb4a7528b5..8cf023861d95 100644
--- a/dev-libs/libffi/libffi-3.0.10.ebuild
+++ b/dev-libs/libffi/libffi-3.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.10.ebuild,v 1.3 2011/10/18 06:39:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.10.ebuild,v 1.4 2011/11/09 16:14:39 jer Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 RDEPEND=""
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index c1ab81b75d39..d650725b6fc3 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -1,2 +1,3 @@
 DIST boto-1.9b.tar.gz 218406 RMD160 0d403ad76bf02a60699693dc13cd0911196ec844 SHA1 00a033b0a593c3ca82927867950f73d88b831155 SHA256 9f2372515a73260199aa041b93e490ef63bb6eaf9f95c58f6b3da7535b1b394e
 DIST boto-2.0.tar.gz 302074 RMD160 39d073ab4157d174140ae93232435654ce095ea0 SHA1 d6c4af2d4b4c4f600e46f6fb98ce61a2efb7f0ad SHA256 7b8714b0a6054f3a8c1b8e0908b8a0606c528c2c04b2910fb6dbd4337692e16b
+DIST boto-2.1.1.tar.gz 313294 RMD160 116ee5f3ff08b497f004e43da50cfcc5695c1934 SHA1 f4cb7574cc51283bed31f34cfc7c38ef81d185e8 SHA256 4d6d38aa8e9e536a27a9737eb4222f896417841fed9a12eedcb619ba8fb68a39
diff --git a/dev-python/boto/boto-2.1.1.ebuild b/dev-python/boto/boto-2.1.1.ebuild
new file mode 100644
index 000000000000..e2fde19c25fa
--- /dev/null
+++ b/dev-python/boto/boto-2.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.1.1.ebuild,v 1.1 2011/11/09 22:17:28 radhermit Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit distutils
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="http://code.google.com/p/boto/ http://pypi.python.org/pypi/boto"
+SRC_URI="http://boto.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-atk/ruby-atk-1.0.3.ebuild b/dev-ruby/ruby-atk/ruby-atk-1.0.3.ebuild
new file mode 100644
index 000000000000..79692c26d36c
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-atk/ruby-atk-1.0.3.ebuild,v 1.1 2011/11/09 13:44:29 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="${DEPEND} dev-libs/atk"
+RDEPEND="${RDEPEND} dev-libs/atk"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.0.3.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.0.3.ebuild
new file mode 100644
index 000000000000..c3db267e9400
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-1.0.3.ebuild,v 1.1 2011/11/09 13:45:47 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_NAME="gdk_pixbuf2"
+
+inherit ruby-ng-gnome2
+
+S=${WORKDIR}/ruby-gnome2-all-${PV}/gdk_pixbuf2
+
+DESCRIPTION="Ruby GdkPixbuf2 bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index 0ba60caf7ffa..985c4fd90555 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-1.0.3.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-1.0.3.ebuild
new file mode 100644
index 000000000000..5b2a627524b6
--- /dev/null
+++ b/dev-ruby/ruby-gio2/ruby-gio2-1.0.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gio2/ruby-gio2-1.0.3.ebuild,v 1.1 2011/11/09 13:43:26 naota Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of GooCanvas"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-1.0.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-1.0.3.ebuild
new file mode 100644
index 000000000000..6eb8afa69535
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-1.0.3.ebuild,v 1.1 2011/11/09 13:45:53 naota Exp $
+
+EAPI="3"
+USE_RUBY="ruby18 ree18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="${RDEPEND} >=dev-libs/glib-2"
+DEPEND="${DEPEND}
+	>=dev-libs/glib-2"
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-1.0.3.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-1.0.3.ebuild
new file mode 100644
index 000000000000..afd945bb1456
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-1.0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ruby-gtk2-1.0.3.ebuild,v 1.1 2011/11/09 13:48:21 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} x11-libs/gtk+:2"
+RDEPEND="${RDEPEND} x11-libs/gtk+:2"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-gio2-${PV}"
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-pango/ruby-pango-1.0.3.ebuild b/dev-ruby/ruby-pango/ruby-pango-1.0.3.ebuild
new file mode 100644
index 000000000000..e70359175565
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-1.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-pango/ruby-pango-1.0.3.ebuild,v 1.1 2011/11/09 13:45:00 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="${DEPEND}
+	>=x11-libs/pango-1.2.1
+	>=dev-ruby/rcairo-1.2.0"
+RDEPEND="${RDEPEND}
+	>=x11-libs/pango-1.2.1
+	>=dev-ruby/rcairo-1.2.0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-1.0.3.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-1.0.3.ebuild
new file mode 100644
index 000000000000..c3691bf05cf4
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-poppler/ruby-poppler-1.0.3.ebuild,v 1.1 2011/11/10 00:44:07 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	app-text/poppler[cairo]"
+DEPEND="${DEPEND}
+	app-text/poppler[cairo]
+	dev-util/pkgconfig"
+
+ruby_add_rdepend "dev-ruby/ruby-gdkpixbuf2
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gtk2-${PV}"
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-1.0.3.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-1.0.3.ebuild
new file mode 100644
index 000000000000..45dc55a067f5
--- /dev/null
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-1.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rsvg/ruby-rsvg-1.0.3.ebuild,v 1.1 2011/11/09 14:45:27 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_NAME=rsvg2
+
+inherit ruby-ng-gnome2
+
+S=${WORKDIR}/ruby-gnome2-all-${PV}/rsvg2
+
+DESCRIPTION="Ruby bindings for librsvg"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo"
+
+RDEPEND="${RDEPEND}
+	>=gnome-base/librsvg-2.8"
+DEPEND="${DEPEND}
+	>=gnome-base/librsvg-2.8
+	dev-util/pkgconfig"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	cairo? ( dev-ruby/rcairo )"
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
index 26bbeb32e1c5..7c05d04c3cd1 100644
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@@ -2,3 +2,4 @@ DIST ruby-gnome2-all-0.19.4.tar.gz 2401534 RMD160 11a102c28d00f8f5a7b2baeb2370a6
 DIST ruby-gnome2-all-0.90.8.tar.gz 2625780 RMD160 7d702a5b594b9bdf9085e346102f03b13622b2e0 SHA1 0982d1d12c87c1008c9930a37ad706ad6d8d8d51 SHA256 93a0d2dd4fdf64260f791bdfd3948a10d8a4ef2fae3b66841ebfa00090235e1f
 DIST ruby-gnome2-all-0.90.9.tar.gz 1158581 RMD160 7120f3afeae8849fc3de86d1a5fdcc5f4f94070c SHA1 f8d9951f37603720cb4f5d353a9b6b5261f6e56b SHA256 a0f32abb9e93eb39b16cfff6ebf437bd2feeb6b4ee22df6408effd90cfe8fa1e
 DIST ruby-gnome2-all-1.0.0.tar.gz 1160036 RMD160 4487a3484c77ccee928b45316053938b8a810693 SHA1 28866952d255a6ddae499329daa968def65d876b SHA256 cdfeadcae5cf4b80294bc87c23c71d35fb789ede87dedeed1d52ea176045abf5
+DIST ruby-gnome2-all-1.0.3.tar.gz 1141565 RMD160 bac4a901b3c09f548ced80c2a1cfbea482dc0ead SHA1 2a280760e411e443e4e617ca5345a3301fbd609d SHA256 0303c12096ebd85a633c848d1d5a7e132e1ce7237ad6b9051d2f290590d2c6b4
diff --git a/dev-ruby/ruby-vte/ruby-vte-1.0.3.ebuild b/dev-ruby/ruby-vte/ruby-vte-1.0.3.ebuild
new file mode 100644
index 000000000000..a2c25527366d
--- /dev/null
+++ b/dev-ruby/ruby-vte/ruby-vte-1.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-vte/ruby-vte-1.0.3.ebuild,v 1.1 2011/11/09 14:15:18 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby vte bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/vte-0.12.1:0"
+DEPEND="${DEPEND}
+	>=x11-libs/vte-0.12.1:0
+	dev-util/pkgconfig"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 4bf3897f608f..c622742d0320 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,3 +1,4 @@
 DIST ruby2ruby-1.2.4.gem 13312 RMD160 cc33f793bb1696ac7722b1b3ce1b46a85cfa7382 SHA1 8759023ce8259d1fe648dccf4bb97994fa3173a1 SHA256 50c36324622569eb7141188a026e347a02f19edec4359c31d6a9ea4f4cd1d35f
 DIST ruby2ruby-1.2.5.gem 17920 RMD160 392d307e96a209a0003131c790aa19944599978b SHA1 d35f97443f1757a0694998e8ec2d2ed7fe46a848 SHA256 016032afdbfebb7cffaab46884845aaf453e25d3420bbf10565aa9920368494e
 DIST ruby2ruby-1.3.0.gem 17920 RMD160 1d7094883cf5683480438fe22df9c7f1ddeca0bc SHA1 5e5f0966d2021e548a3b26bc0615145a1f00ca67 SHA256 c2c626123deb243c0c7e9ca9ff70b8eac309aa97ce34d577391f4a7666767c5a
+DIST ruby2ruby-1.3.1.gem 18944 RMD160 70380f58cbad6f46580002682d079c76632aa29e SHA1 a545b808989edcdf3286bee2a672f28e2a3b5202 SHA256 77c3e31741389af7992a3cf7410ed0b21fb2c2fc571a37343e02ca37d76d1517
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
new file mode 100644
index 000000000000..7826e5e075f7
--- /dev/null
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild,v 1.1 2011/11/09 06:15:23 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ree18"
+
+# Don't run tests, since they require the testcase from ParseTree;
+# ParseTree _is_ the testcase for ruby2ruby
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates readable ruby from ParseTree"
+HOMEPAGE="http://seattlerb.rubyforge.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/parsetree-3*
+	=dev-ruby/sexp-processor-3*
+	=dev-ruby/ruby_parser-2*"
+ruby_add_bdepend doc "dev-ruby/hoe dev-ruby/hoe-seattlerb"
+
+all_ruby_prepare() {
+	sed -i -e '/isolate/d' Rakefile || die
+}
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 651124aea1d1..70e69334380b 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1 +1,3 @@
+DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 RMD160 77621d56a6c362a30241a772534e3d3d5622b272 SHA1 6ef7afea28e28bb735e1bb741570eb43cfd44f1e SHA256 4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590
+DIST checkstyle-5.4-src.tar.gz 731222 RMD160 cbb60869f13060a628374a57e3a829d028c1df31 SHA1 50274b97caa6d506c0804b8dcb883cc4313f0ed1 SHA256 2c8b04a914a7835eaa355c058f7a4c52af308f8190d07fb3cbf9943cf751b8a8
 DIST checkstyle-src-4.4.tar.gz 2567907 RMD160 5d565d158cd88ec884fed37e6fbec8deb5661c58 SHA1 a5c7f9e57021c09ae32c399ca22ab49f03224d75 SHA256 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38
diff --git a/dev-util/checkstyle/checkstyle-5.4.ebuild b/dev-util/checkstyle/checkstyle-5.4.ebuild
new file mode 100644
index 000000000000..9c45e0cae380
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-5.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-5.4.ebuild,v 1.1 2011/11/09 19:23:15 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard."
+HOMEPAGE="http://checkstyle.sourceforge.net"
+SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
+	http://dev.gentoo.org/~sera/distfiles/${P}-maven-build.xml.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-cli:1
+	dev-java/commons-logging:0
+	dev-java/guava:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/maven-build.xml.patch
+
+	# maven ant:ant can't handle it.
+	pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > /dev/null || die
+		java -cp $(java-pkg_getjars antlr) antlr.Tool java.g || die
+	popd > /dev/null
+}
+
+JAVA_PKG_BSFIX_NAME="maven-build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="iso-8859-1"
+
+EANT_BUILD_XML="maven-build.xml"
+EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava"
+EANT_BUILD_TARGET="package"
+EANT_ANT_TASKS="ant-nodeps"
+
+src_test() {
+	EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	dodoc README
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/${PN}/com
+
+	# Install check files
+	insinto /usr/share/checkstyle/checks
+	doins suppressions.xml sun_checks.xml import-control.xml checkstyle_checks.xml
+
+	# Install extra files
+	insinto  /usr/share/checkstyle/contrib
+	doins -r contrib/*
+
+	java-pkg_dolauncher ${PN} \
+		--main com.puppycrawl.tools.checkstyle.Main
+
+	java-pkg_dolauncher ${PN}-gui \
+		--main com.puppycrawl.tools.checkstyle.gui.Main
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 31b70dd9022d..9a33558169bb 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,6 +14,7 @@ DIST git-1.7.6.4.tar.gz 3399093 RMD160 80d226e77b8b9ad6d0bba86773e26257e5b3d734
 DIST git-1.7.6.tar.bz2 2806337 RMD160 9ba5daa7bf56b6a242b3302e12c8ced7d3abc77a SHA1 c519b0765c419c84b561bb4a2a86526b16d95cde SHA256 778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082
 DIST git-1.7.7.1.tar.gz 3480051 RMD160 92bf7db1fb7a7659e0e6763f221283969687fe55 SHA1 9200e0b8ee543d297952b78aac8f61f8b3693f8e SHA256 6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f
 DIST git-1.7.7.2.tar.gz 3483993 RMD160 e1b2bdcf6ff7e206a346f09e7af02250f6e0fc7e SHA1 be5be63fbab63517fcccf5c876749c61b0019d14 SHA256 b309c172b63636bb746ded2771536cb5b2efdfa011511d81783e87950c665260
+DIST git-1.7.7.3.tar.gz 3484344 RMD160 638f21de4b834d64788413261ee572264f942f33 SHA1 382ee40da74a1b4a1875820c0f0a35c9ccd750f8 SHA256 dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100
 DIST git-1.7.7.tar.gz 3475448 RMD160 54a185d66fb1f0e1607dc4514640c4b353d2cd1c SHA1 bbf85bd767ca6b7e9caa1489bb4ba7ec64e0ab35 SHA256 5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6
 DIST git-1.7.8.rc1.tar.gz 3536204 RMD160 de0c196a5e010954b35b717a6a3512f5674879c6 SHA1 f35e5c4410b21710434cb591f4c89843e75bb793 SHA256 f5ae0ce19d345e1e2680941bfd0404968a649ecdb02c8fce1211283d95a0236b
 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2
@@ -32,6 +33,7 @@ DIST git-htmldocs-1.7.6.4.tar.gz 1606389 RMD160 931da8cc615cd1f52024a07f53ebc14e
 DIST git-htmldocs-1.7.6.tar.bz2 974583 RMD160 0c396a95126670a67c3e61ea69196508b88ef195 SHA1 926168673669d7568b94af6dec35b9ef10ecaedc SHA256 7e6685c89149d1e1e84a916d913452cfbac3ae801d02a0631243e41c25949277
 DIST git-htmldocs-1.7.7.1.tar.gz 1626041 RMD160 b001a9afcc0cf373622039cbd96967924f17b21e SHA1 b25dacb07ebbfc37e7a90c3d47f76b4c0f0487d9 SHA256 bd312ee9b767eda02b82cc1844696e60664be1ddb16790a357ceac689cfe4189
 DIST git-htmldocs-1.7.7.2.tar.gz 1634159 RMD160 66e5a7816ce0660b93edd3d2c3f441eb3207813c SHA1 8f0eb6f1150ea8c6922343aa4c3ee6cf37e8a091 SHA256 504313b32c0144cba8758c1ec1b2977b3c70a6656921dea885bef4944116add3
+DIST git-htmldocs-1.7.7.3.tar.gz 1660184 RMD160 b3c7e10545bcf896e7294ee4f8c7dcd2c2fb35f4 SHA1 bc0f89cb04e562e4a6d3b936382dbc8f593d861f SHA256 b84992ea9d2dad0ddc643a87f5c463342acd0f9475ecfd082ac5f61b00294dc0
 DIST git-htmldocs-1.7.7.tar.gz 1391354 RMD160 7e0fb2f27053d97d4945eb2e41080e7f9b31f8e8 SHA1 33183db94fd25e001bd8a9fd6696b992f61e28d8 SHA256 bcb11eda56ac74687cc6852f6ee104ab5dcf13039546616c608783cebc7f4a40
 DIST git-htmldocs-1.7.8.rc1.tar.gz 1694277 RMD160 c5bf09b2d2614df0c018cfb7a36a415a4e8a0598 SHA1 72e27cd397f5ae7b3c9d8bb030a76d7c99cdbb50 SHA256 c841cb7f0238742a99e4e09bb6192c2d27763473383ee145bb4f3067937954d9
 DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447
@@ -50,5 +52,6 @@ DIST git-manpages-1.7.6.4.tar.gz 468334 RMD160 91d0df4b4182bead27149dbf03481d3e1
 DIST git-manpages-1.7.6.tar.bz2 309563 RMD160 9534cf6540c3be85c6f3b5dfca8ca0cf3f2f366f SHA1 45e0759597d649b13f684f55a186d46dafb7d414 SHA256 a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad
 DIST git-manpages-1.7.7.1.tar.gz 474532 RMD160 3b3cb0cc3c53e24a022fb2cba5dd9baba928bd9f SHA1 419c750617ae0c952e2e43f0357c16de6ebc0a44 SHA256 28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5
 DIST git-manpages-1.7.7.2.tar.gz 474637 RMD160 dd5b397967c20702922c01d145d36ea040c1939a SHA1 07e0887315224ac83c61ed60602c345c32a5d658 SHA256 8a80657b6095b10d0f9db9707de6d02c38e364a5ccf25ee94edb4daa4c27c755
+DIST git-manpages-1.7.7.3.tar.gz 475209 RMD160 99ea33e5d21d8daae28c23a9850016bc5e3975a8 SHA1 cf1b0d35e2d242bc4cffce3b2bf5b3e32857b395 SHA256 62bec01d704d3495fcf66a3b97a8fb7c337a06202784fa7a7fa510360e79671f
 DIST git-manpages-1.7.7.tar.gz 476036 RMD160 4bc0504533df3c956e9ad5133e6bd8bfca980007 SHA1 75d3cceb46f7a46eeb825033dff76af5eb5ea3d9 SHA256 dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb
 DIST git-manpages-1.7.8.rc1.tar.gz 497264 RMD160 a0da361fafc53fdccb12d6d8586657efc5eba3fe SHA1 95429858e879df3f9425cf1279e03cdec7832379 SHA256 20f63b8b0be15be013dd762fd86a832245ce0363b1ee785f0490b22dc62a8ab5
diff --git a/dev-vcs/git/git-1.7.7.3.ebuild b/dev-vcs/git/git-1.7.7.3.ebuild
new file mode 100644
index 000000000000..438521135b6b
--- /dev/null
+++ b/dev-vcs/git/git-1.7.7.3.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.3.ebuild,v 1.1 2011/11/09 10:29:18 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl[-build] )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	# Merged in 1.7.5.x
+	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first
+	cd "${S}/t"
+	git_emake clean
+
+	# Now run the tests
+	cd "${S}"
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+
+	# And exit
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b0b184c91955..3dc35f69c4e7 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.477 2011/10/31 01:12:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.478 2011/11/09 17:25:43 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -123,12 +123,18 @@ if tc_version_is_at_least 3 ; then
 	RDEPEND+=" virtual/libiconv"
 fi
 if tc_version_is_at_least 4 ; then
-	RDEPEND+=" >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2"
+	GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2"
+	if tc_version_is_at_least 4.3 ; then
+		RDEPEND+=" ${GMP_MPFR_DEPS}"
+	elif in_iuse fortran ; then
+		RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
+	fi
 	if tc_version_is_at_least 4.5 ; then
 		RDEPEND+=" >=dev-libs/mpc-0.8.1"
 	fi
+	in_iuse lto && RDEPEND+=" lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) )"
 fi
-if has graphite ${IUSE} ; then
+if in_iuse graphite ; then
 	RDEPEND+="
 	    graphite? (
 	        >=dev-libs/cloog-ppl-0.15.10
@@ -144,8 +150,18 @@ DEPEND="${RDEPEND}
 		>=dev-util/dejagnu-1.4.4
 		>=sys-devel/autogen-5.5.4
 	)"
-if tc_version_is_at_least 4.2 && has gcj ${IUSE} ; then
-	DEPEND+=" gcj? ( app-arch/zip app-arch/unzip )"
+if in_iuse gcj ; then
+	GCJ_GTK_DEPS="
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libXtst
+		x11-proto/xproto
+		x11-proto/xextproto
+		=x11-libs/gtk+-2*"
+	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
+	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
+	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
+	DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
 fi
 
 PDEPEND=">=sys-devel/gcc-config-1.4"
@@ -1068,7 +1084,7 @@ gcc-compiler-configure() {
 	gcc-multilib-configure
 
 	if tc_version_is_at_least "4.0" ; then
-		if has mudflap ${IUSE} ; then
+		if in_iuse mudflap ; then
 			confgcc+=" $(use_enable mudflap libmudflap)"
 		else
 			confgcc+=" --disable-libmudflap"
@@ -1087,7 +1103,7 @@ gcc-compiler-configure() {
 		fi
 
 		if tc_version_is_at_least "4.2" ; then
-			if has openmp ${IUSE} ; then
+			if in_iuse openmp ; then
 				# Make sure target has pthreads support. #326757 #335883
 				# There shouldn't be a chicken&egg problem here as openmp won't
 				# build without a C library, and you can't build that w/out
@@ -2403,7 +2419,7 @@ is_ada() {
 }
 
 is_treelang() {
-	has boundschecking ${IUSE} && use boundschecking && return 1 #260532
+	use_if_iuse boundschecking && return 1 #260532
 	is_crosscompile && return 1 #199924
 	gcc-lang-supported treelang || return 1
 	#use treelang
diff --git a/games-rpg/pcgen/pcgen-5.16.4.ebuild b/games-rpg/pcgen/pcgen-5.16.4.ebuild
index d461686e30a0..083e3db9650d 100644
--- a/games-rpg/pcgen/pcgen-5.16.4.ebuild
+++ b/games-rpg/pcgen/pcgen-5.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/pcgen/pcgen-5.16.4.ebuild,v 1.4 2011/01/15 15:59:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/pcgen/pcgen-5.16.4.ebuild,v 1.5 2011/11/09 02:17:53 mr_bones_ Exp $
 
 EAPI=2
 inherit versionator games
@@ -12,10 +12,10 @@ SRC_URI="mirror://sourceforge/pcgen/pcgen${MY_PV}_full.zip"
 
 LICENSE="LGPL-2 OGL-1.0a"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND="dev-java/sun-jdk" # only works with the sun jdk (bug #353471)
 DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/pcgen${MY_PV}
diff --git a/games-strategy/openxcom/openxcom-9999.ebuild b/games-strategy/openxcom/openxcom-9999.ebuild
index eaf31d1a96b2..1d84cfc7d33b 100644
--- a/games-strategy/openxcom/openxcom-9999.ebuild
+++ b/games-strategy/openxcom/openxcom-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/openxcom/openxcom-9999.ebuild,v 1.7 2011/11/05 20:16:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openxcom/openxcom-9999.ebuild,v 1.8 2011/11/09 10:19:29 scarabeus Exp $
 
 EAPI=3
 
@@ -34,7 +34,7 @@ src_prepare() {
 
 src_configure() {
 	egamesconf \
-		--docdir="${EPREFIX}/usr/share/${PF}/" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
 		--disable-werror \
 		$(use_enable debug) \
 		$(use_with doc docs)
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 2a47ad351f77..4ae67aacbfdc 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -7,7 +7,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9-20111106.tar.gz 3679774 RMD160 1c80eaaef74fb53f44a85a1f20e50271a706569f SHA1 62a9c0d847a70443915e2aefd5f5d82ac990334d SHA256 1981581d8602f416515d9301e529498285d1142ca07504c1edd96cc8e4a2120c
+DIST postfix-2.9-20111108.tar.gz 3681258 RMD160 d8b3ca39745010a477f611220299c3b4518d94cf SHA1 329c75d44bd4f16ef2f81b3fb639c5c65269ae44 SHA256 2efc171f98e516f60a3b91060b135e51f646540eb0e644191935fcaf3f882cae
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
diff --git a/mail-mta/postfix/postfix-2.9_pre20111106.ebuild b/mail-mta/postfix/postfix-2.9_pre20111108.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-2.9_pre20111106.ebuild
rename to mail-mta/postfix/postfix-2.9_pre20111108.ebuild
index 8ffbe2494ffe..489e586c2d3f 100644
--- a/mail-mta/postfix/postfix-2.9_pre20111106.ebuild
+++ b/mail-mta/postfix/postfix-2.9_pre20111108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20111106.ebuild,v 1.1 2011/11/07 09:31:29 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20111108.ebuild,v 1.1 2011/11/09 09:48:16 eras Exp $
 
 EAPI=4
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 68797049b530..7a98546a9dd5 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1 +1,2 @@
 DIST darktable-0.9.2.tar.gz 2269319 RMD160 95b5f28afd787070d5e8c236f7e3bb2d27522cae SHA1 5527854edd10cca074bd956772b81d646a796293 SHA256 c7f17961db67f430c449e5294ff4a59ae2a649ba17af0fa55f3e9c5bec9ca20a
+DIST darktable-0.9.3.tar.gz 2330605 RMD160 a7c51262a52fae0b33179fb4d9030eb78444305d SHA1 36ed6c1102b920096cf80affd71adfa66ae85381 SHA256 1cd75253355bd70b698dc78c2463c1b70867ac96cb6f23337a3b6dec6277892a
diff --git a/media-gfx/darktable/darktable-0.9.3.ebuild b/media-gfx/darktable/darktable-0.9.3.ebuild
new file mode 100644
index 000000000000..d888eed1c778
--- /dev/null
+++ b/media-gfx/darktable/darktable-0.9.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.3.ebuild,v 1.1 2011/11/09 17:48:17 radhermit Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2 cmake-utils toolchain-funcs
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://darktable.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libxml2:2
+	flickr? ( media-libs/flickcurl )
+	gnome? (
+		gnome-base/gconf
+		gnome-base/gnome-keyring
+	)
+	gnome-base/librsvg:2
+	gphoto2? ( media-libs/libgphoto2 )
+	kde? ( dev-libs/dbus-glib )
+	media-gfx/exiv2
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng
+	>=media-libs/libraw-0.13.4[demosaic]
+	media-libs/openexr
+	media-libs/tiff
+	net-misc/curl
+	opencl? ( video_cards_nvidia? (
+		x11-drivers/nvidia-drivers
+		>=dev-util/nvidia-cuda-toolkit-3.1
+	) )
+	slideshow? (
+		media-libs/libsdl
+		virtual/opengl
+	)
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libraw.patch
+	"${FILESDIR}"/${P}-no-rawspeed.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-opencl-kernels.patch
+)
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local myconf
+	if use gnome ; then
+		myconf="-DDONT_INSTALL_GCONF_SCHEMAS=OFF"
+	else
+		myconf="-DDONT_INSTALL_GCONF_SCHEMAS=ON"
+	fi
+
+	if use opencl && use video_cards_nvidia ; then
+		myconf+=" -DUSE_OPENCL=ON"
+	else
+		myconf+=" -DUSE_OPENCL=OFF"
+	fi
+
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	mycmakeargs=(
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use gnome GCONF_BACKEND)
+		$(cmake-utils_use_use gnome GNOME_KEYRING)
+		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
+		$(cmake-utils_use_use kde KWALLET)
+		$(cmake-utils_use_use nls NLS)
+		$(cmake-utils_use_use openmp OPENMP)
+		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
+		$(cmake-utils_use_build slideshow SLIDESHOW)
+		${myconf}
+		-DINSTALL_IOP_EXPERIMENTAL=ON
+		-DINSTALL_IOP_LEGACY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	cmake-utils_src_install
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+}
diff --git a/media-gfx/darktable/files/darktable-0.9.3-cflags.patch b/media-gfx/darktable/files/darktable-0.9.3-cflags.patch
new file mode 100644
index 000000000000..a949cc66b919
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.3-cflags.patch
@@ -0,0 +1,43 @@
+--- darktable-0.9.3.orig/src/CMakeLists.txt
++++ darktable-0.9.3/src/CMakeLists.txt
+@@ -231,39 +231,11 @@
+ # c++ code doesn't like -Werror (libraw)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ 
+-if(NOT APPLE)
+-  # apple build fails on deprecated warnings..
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+-endif(NOT APPLE)
+-
+ if(NOT WIN32)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+ endif(NOT WIN32)
+ 
+-if(NOT BINARY_PACKAGE_BUILD)
+-	MESSAGE("-- Checking for -march=native support")
+-	CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
+-	if (MARCHNATIVE)
+-		set(MARCH "-march=native")	
+-	else()
+-		MESSAGE("-- Checking for -mtune=native support")
+-		CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
+-		if (MTUNENATIVE)
+-			set(MARCH "-mtune=native")
+-		else()
+-			set(MARCH "-mtune=generic")
+-		endif()
+-	endif()
+-else()
+- 	set(MARCH "-mtune=generic")
+-endif()
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
+-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
+-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
+-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
+-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+   
+ 
+ #
diff --git a/media-gfx/darktable/files/darktable-0.9.3-no-rawspeed.patch b/media-gfx/darktable/files/darktable-0.9.3-no-rawspeed.patch
new file mode 100644
index 000000000000..774762ea654e
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.3-no-rawspeed.patch
@@ -0,0 +1,48 @@
+--- darktable-0.9.3.orig/src/CMakeLists.txt
++++ darktable-0.9.3/src/CMakeLists.txt
+@@ -290,21 +290,19 @@
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c
+   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../tools/create_metadata.sh ${CMAKE_CURRENT_SOURCE_DIR}/../tools/metadata.txt ${CMAKE_CURRENT_BINARY_DIR}
+ )
+-
+-# this is a dummy library whose sole purpose is to serve as a dependency for subdirs, such as imageio/storage/gallery.
+-# cmake can't depend on custom targets in other directories than the current one.
+-add_library(metadata_dummy ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
++add_custom_target(metadata_gen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
+ 
+ #
+ # build libdarktable
+ #
+-add_library(lib_darktable STATIC SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${SOURCES})
++add_library(lib_darktable SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${SOURCES})
++add_dependencies(lib_darktable metadata_gen)
+ if(APPLE)
+   set_target_properties(lib_darktable PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib/darktable")
+ endif(APPLE)
+ set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
+ set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
+-
++target_link_libraries(lib_darktable ${LIBS})
+ 
+ #
+ # the libraw part is a bit of a hack:
+@@ -329,7 +327,7 @@
+   add_dependencies(lib_darktable rawspeed)
+   add_library(rawspeed_static STATIC IMPORTED)
+   set_target_properties(rawspeed_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/rawspeed/librawspeed.a)
+-  target_link_libraries(lib_darktable ${LIBS} rawspeed_static)
++  target_link_libraries(lib_darktable rawspeed_static)
+   # compile rawspeed
+   add_subdirectory(external/rawspeed)
+ endif(NOT DONT_USE_RAWSPEED)
+--- darktable-0.9.3.orig/src/imageio/storage/CMakeLists.txt
++++ darktable-0.9.3/src/imageio/storage/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ foreach(module ${MODULES} ${MODULES_EXPERIMENTAL})
+ 	add_library(${module} MODULE "${module}.c")
+ endforeach(module)
+-add_dependencies(gallery metadata_dummy)
++add_dependencies(gallery metadata_gen)
+ 
+ foreach(module ${MODULES})
+ 	target_link_libraries(${module} ${LIBS})
diff --git a/media-gfx/darktable/files/darktable-0.9.3-opencl-kernels.patch b/media-gfx/darktable/files/darktable-0.9.3-opencl-kernels.patch
new file mode 100644
index 000000000000..ff05acbe2db0
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.3-opencl-kernels.patch
@@ -0,0 +1,12 @@
+--- darktable-0.9.3/data/kernels/CMakeLists.txt.orig
++++ darktable-0.9.3/data/kernels/CMakeLists.txt
+@@ -3,5 +3,7 @@
+ #
+ # install opencl kernel source files
+ #
+-FILE(GLOB DT_OPENCL_KERNELS "*.cl" "programs.conf")
+-install(FILES ${DT_OPENCL_KERNELS} DESTINATION ${SHARE_INSTALL}/kernels)
++if(USE_OPENCL)
++	FILE(GLOB DT_OPENCL_KERNELS "*.cl" "programs.conf")
++	install(FILES ${DT_OPENCL_KERNELS} DESTINATION ${SHARE_INSTALL}/kernels)
++endif(USE_OPENCL)
diff --git a/media-gfx/darktable/files/darktable-0.9.3-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9.3-system-libraw.patch
new file mode 100644
index 000000000000..189f264f8899
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.3-system-libraw.patch
@@ -0,0 +1,85 @@
+--- darktable-0.9.3.orig/cmake/modules/FindLibraw.cmake
++++ darktable-0.9.3/cmake/modules/FindLibraw.cmake
+@@ -0,0 +1,29 @@
++# - Try to find libraw
++# Once done, this will define
++#
++#  Libraw_FOUND - system has Libraw
++#  Libraw_INCLUDE_DIRS - the Libraw include directories
++#  Libraw_LIBRARIES - link these to use Libraw
++
++include(LibFindMacros)
++
++# Use pkg-config to get hints about paths
++libfind_pkg_check_modules(Libraw_PKGCONF libraw)
++
++# Include dir
++find_path(Libraw_INCLUDE_DIR
++  NAMES libraw.h
++  PATHS ${Libraw_PKGCONF_INCLUDE_DIRS}
++)
++
++# Finally the library itself
++find_library(Libraw_LIBRARY
++  NAMES raw_r
++  PATHS ${Libraw_PKGCONF_LIBRARY_DIRS}
++)
++
++# Set the include dir variables and the libraries and let libfind_process do the rest.
++# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
++set(Libraw_PROCESS_INCLUDES Libraw_INCLUDE_DIR Libraw_INCLUDE_DIRS)
++set(Libraw_PROCESS_LIBS Libraw_LIBRARY Libraw_LIBRARIES)
++libfind_process(Libraw)
+--- darktable-0.9.3.orig/src/CMakeLists.txt
++++ darktable-0.9.3/src/CMakeLists.txt
+@@ -70,7 +70,6 @@
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
+ 
+ # initial compiler flags
+ add_definitions("-DHAVE_CONFIG_H")
+@@ -122,7 +121,7 @@
+ endif(USE_CAMERA_SUPPORT)
+ 
+ # Find all the libs that don't require extra parameters
+-foreach(lib ${OUR_LIBS} LensFun GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
++foreach(lib ${OUR_LIBS} LensFun Libraw GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
+   find_package(${lib} REQUIRED)
+   include_directories(${${lib}_INCLUDE_DIRS})
+   list(APPEND LIBS ${${lib}_LIBRARIES})
+@@ -306,23 +305,6 @@
+ set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
+ 
+ 
+-#
+-# the libraw part is a bit of a hack:
+-# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
+-# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
+-# appended.
+-#
+-add_dependencies(lib_darktable libraw_r)
+-add_library(libraw_static STATIC IMPORTED)
+-set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LibRaw/liblibraw_r.a)
+-if(APPLE)
+-  set(LIBRAW_STATIC_LIBS libraw_static stdc++)
+-else(APPLE)
+-  set(LIBRAW_STATIC_LIBS libraw_static)
+-endif(APPLE)
+-
+-target_link_libraries(lib_darktable ${LIBS} ${LIBRAW_STATIC_LIBS})
+-
+ # same for librawspeed (can switch it off with -DDONT_USE_RAWSPEED, for macs):
+ if(NOT DONT_USE_RAWSPEED)
+   add_definitions("-DHAVE_RAWSPEED")
+@@ -337,9 +319,6 @@
+ install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
+ list(APPEND LIBS lib_darktable)
+ 
+-# Compile libraw modules
+-add_subdirectory(external/LibRaw)
+-
+ # Compile views modules
+ add_subdirectory(views)
+ 
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 2275ca3ad8f7..46956183e85a 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -8,6 +8,7 @@
 	</maintainer>
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
+		<flag name="opencl">Enable opencl support</flag>
 		<flag name="rawspeed">Enable the rawspeed backend</flag>
 		<flag name="slideshow">Build the opengl slideshow viewer</flag>
 	</use>
diff --git a/media-libs/libmediawiki/Manifest b/media-libs/libmediawiki/Manifest
index 9c184d066e5e..756acf6afb79 100644
--- a/media-libs/libmediawiki/Manifest
+++ b/media-libs/libmediawiki/Manifest
@@ -1,3 +1,2 @@
-DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
-DIST digikam-2.1.0.tar.bz2 53911470 RMD160 034f967a851f6cd748beb0c05e5fbe7d91526fe1 SHA1 4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7 SHA256 33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
 DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
+DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
diff --git a/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild b/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild
deleted file mode 100644
index 8fd900bb600d..000000000000
--- a/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild,v 1.2 2011/08/09 06:48:14 dilfridge Exp $
-
-EAPI=4
-
-DIGIKAMPN=digikam
-
-KDE_LINGUAS=""
-KDE_MINIMAL="4.7"
-
-CMAKE_MIN_VERSION=2.8
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit kde4-base
-
-MY_P="${DIGIKAMPN}-${PV/_/-}"
-
-DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${DIGIKAMPN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SLOT=4
-
-DEPEND=""
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}/extra/${PN}
-
-# bug 376761
-# RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-	)
-	kde4-base_src_configure
-}
diff --git a/media-libs/libmediawiki/libmediawiki-2.1.0.ebuild b/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild
similarity index 91%
rename from media-libs/libmediawiki/libmediawiki-2.1.0.ebuild
rename to media-libs/libmediawiki/libmediawiki-2.3.0.ebuild
index 91fa47fec821..61fd08ea9873 100644
--- a/media-libs/libmediawiki/libmediawiki-2.1.0.ebuild
+++ b/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.1.0.ebuild,v 1.1 2011/09/09 17:20:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.3.0.ebuild,v 1.1 2011/11/09 02:44:06 dilfridge Exp $
 
 EAPI=4
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 55fb575e9cce..03301add89ea 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,3 +1,4 @@
 DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
+DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild
new file mode 100644
index 000000000000..d25216791ab8
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.3.0.ebuild,v 1.1 2011/11/09 03:03:53 dilfridge Exp $
+
+EAPI=4
+
+OPENGL_REQUIRED="optional"
+
+KDE_MINIMAL="4.7"
+
+KDE_LINGUAS="ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga
+gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn
+nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk uz ven vi wa xh
+zh_CN zh_HK zh_TW zu"
+
+KDE_HANDBOOK="optional"
+
+inherit flag-o-matic kde4-base
+
+MY_P="digikam-${PV/_/-}"
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2
+	handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte"
+
+DEPEND="
+	$(add_kdebase_dep libkipi)
+	$(add_kdebase_dep libkdcraw)
+	$(add_kdebase_dep libkexiv2)
+	dev-libs/expat
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qjson
+	gpssync?	( >=media-libs/libkgeomap-${PV} )
+	mediawiki?	( >=media-libs/libmediawiki-${PV} )
+	media-libs/libpng
+	media-libs/tiff
+	virtual/jpeg
+	calendar?	( $(add_kdebase_dep kdepimlibs) )
+	crypt?		( app-crypt/qca:2 )
+	ipod?		(
+			  media-libs/libgpod
+			  x11-libs/gtk+:2
+			)
+	redeyes?	( >=media-libs/opencv-2.2.0-r10 )
+	scanner? 	(
+			  $(add_kdebase_dep libksane)
+			  media-gfx/sane-backends
+			)
+	vkontakte?	( >=net-libs/libkvkontakte-${PV} )
+"
+RDEPEND="${DEPEND}
+	cdr? 		( app-cdr/k3b )
+	expoblending? 	( media-gfx/hugin )
+	imagemagick? 	( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	mjpeg? 		( media-video/mjpegtools )
+	panorama?	(
+			  media-gfx/enblend
+			  >=media-gfx/hugin-2011.0.0
+			)
+"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0-expoblending.patch"
+	"${FILESDIR}/${PN}-2.0.0-tests.patch"
+	"${FILESDIR}/${PN}-2.2.0-panorama.patch"
+)
+
+src_prepare() {
+	# prepare the handbook
+	mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
+	if use handbook; then
+		echo "add_subdirectory( doc )" >> CMakeLists.txt
+	fi
+
+	# prepare the translations
+	mv "${WORKDIR}/${MY_P}/po" po || die
+	find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
+	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
+	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+	echo "add_subdirectory( po )" >> CMakeLists.txt
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	# Remove flags -floop-block -floop-interchange
+	# -floop-strip-mine due to bug #305443.
+	filter-flags -floop-block
+	filter-flags -floop-interchange
+	filter-flags -floop-strip-mine
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with ipod GLIB2)
+		$(cmake-utils_use_with ipod GObject)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with ipod Gpod)
+		$(cmake-utils_use_with calendar KdepimLibs)
+		$(cmake-utils_use_with mediawiki Mediawiki)
+		$(cmake-utils_use_with gpssync KGeoMap)
+		$(cmake-utils_use_with redeyes OpenCV)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with scanner Sane)
+		$(cmake-utils_use_enable expoblending)
+		$(cmake-utils_use_enable panorama)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 52d87e974ba4..32afeba00616 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -2,3 +2,4 @@ DIST fldigi-3.20.34.tar.gz 1475911 RMD160 a084b9be85817e73badbf98688a357cfe5e181
 DIST fldigi-3.21.12.tar.gz 1608635 RMD160 713c6dba82ede9793e7dd1712e8f3e19f53815ec SHA1 f3ce36c7ab3a82fe391d1a08d1d9912baefc6ea0 SHA256 6d54fbf776822c15b6ff8b38675be761972e767979091eaeae5e4ac34e4f9afc
 DIST fldigi-3.21.18.tar.gz 1619203 RMD160 47446ca70a9f2a4a32c3e6c7f457d4e5a4c07bd7 SHA1 4f1c8d832574575289f88208322e4be62f89392a SHA256 d92a89993bce367c9896046ef787797903be35a88607c09f097d4d16f0f9051d
 DIST fldigi-3.21.22.tar.gz 1621089 RMD160 d3adc82ae7dabe76a948b30430b3ec114eb59f4b SHA1 dc70c7c613bf21b61eca3aa9e421ab674538c813 SHA256 db4ffb2f8158cf2c808de3dfd455d5a4935654e3c3948968e764355a6f1945db
+DIST fldigi-3.21.23.tar.gz 1621660 RMD160 f3f68618e0052481069566dc306ee72e369138a9 SHA1 c90f588a9b75092b0cfb49e400cde03b391f75fa SHA256 bdc8c2d3a5155b32b75df91568f81d60bb4e79f65cb63fa1bc084eb55e38c731
diff --git a/media-radio/fldigi/fldigi-3.21.23.ebuild b/media-radio/fldigi/fldigi-3.21.23.ebuild
new file mode 100644
index 000000000000..a6f703daf335
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.21.23.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.23.ebuild,v 1.1 2011/11/09 15:11:28 tomjbe Exp $
+
+EAPI=2
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile xmlrpc"
+
+RDEPEND="<x11-libs/fltk-1.2:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng
+	x11-misc/xdg-utils
+	hamlib? ( media-libs/hamlib )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( >=media-libs/libsndfile-1.0.10 )
+	xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] <dev-libs/xmlrpc-c-1.18.02 )
+		dev-perl/RPC-XML
+		dev-perl/Term-ReadLine-Perl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+src_configure() {
+	econf $(use_with sndfile) \
+		$(use_with portaudio) \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		$(use_with xmlrpc) \
+		--without-asciidoc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README  || die "dodoc failed"
+}
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
index e2f49c21c6ed..2328c5611cbe 100644
--- a/media-radio/tucnak2/Manifest
+++ b/media-radio/tucnak2/Manifest
@@ -1,2 +1,3 @@
 DIST tucnak2-2.43.tar.gz 2979056 RMD160 8d31d45d05765ba843c373cbf1ecddaa46a47782 SHA1 7c940f264f914c9484c804273edee4c06e17aaed SHA256 41f9f7dcc131372097c34c4d9dd3df1c35d827c0f056f29a2647c51f1596f1e9
 DIST tucnak2-2.44.tar.gz 2986548 RMD160 cc8caa9800264f2c4d2c5cdb65a9864d6cb54e01 SHA1 15fc269024044c8b05222a3c14e1b3f8d057c044 SHA256 b571e2de547fd18a4964ee8881cf9b73f1b5a1eba06a862da120f9c361df5465
+DIST tucnak2-2.45.tar.gz 2969071 RMD160 efe8ca6b6b8643b3f0123d1fc7597976a6b673c2 SHA1 11280beff2050c363e282194d181fd4ae111bfe2 SHA256 27b00bbcbff79d8d4ba8845ec533ddcee9dde3e1f5e91934cdde1059ee58b86c
diff --git a/media-radio/tucnak2/tucnak2-2.45.ebuild b/media-radio/tucnak2/tucnak2-2.45.ebuild
new file mode 100644
index 000000000000..afdb383bf3b2
--- /dev/null
+++ b/media-radio/tucnak2/tucnak2-2.45.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.45.ebuild,v 1.1 2011/11/09 15:36:02 tomjbe Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw ftdi gpm hamlib suid"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	ftdi? ( dev-embedded/libftdi )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib )
+	>=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.39-doc.diff" \
+		"${FILESDIR}/${PN}-2.42-appname.diff"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with alsa) $(use_with ftdi) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3) --with-sdl
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	doman debian/tucnak2.1 || die "doman failed"
+	dodoc AUTHORS ChangeLog TODO doc/NAVOD.pdf || die "dodoc failed"
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper || die "fperms failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak2 add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak2 can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 60298ea62fbd..36ccbe0e7fbb 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1 +1 @@
-DIST pianobar-2011.09.22.tar.bz2 65436 RMD160 d69c4a94c59613fa6ca3e8ce2d9a6fe0878674a5 SHA1 5571454f4351cf34de2d7f0ae7113f1e729fbbe3 SHA256 6e54d4881e7ada6b0443611b0853215e9e54253667a58310d96dfe38be258ed3
+DIST pianobar-2011.11.09_p1.tar.bz2 67620 RMD160 5310bd4916e01eb6631dce922effb7a378a6cdef SHA1 44affa15f9f327d4ce56f3c2d9bcd7f7e3cf7b0d SHA256 1b2eba019fd0ecf771e620a07a51481a3b35048010b255b699b1478a19cc6923
diff --git a/media-sound/pianobar/files/pianobar-2011.07.09-tests.patch b/media-sound/pianobar/files/pianobar-2011.07.09-tests.patch
deleted file mode 100644
index ce6786dcbe84..000000000000
--- a/media-sound/pianobar/files/pianobar-2011.07.09-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- pianobar-2011.07.09/Makefile.orig
-+++ pianobar-2011.07.09/Makefile
-@@ -55,10 +55,12 @@
- 
- LIBWAITRESS_DIR=src/libwaitress
- LIBWAITRESS_SRC=${LIBWAITRESS_DIR}/waitress.c
-+LIBWAITRESS_TSRC=${LIBWAITRESS_DIR}/waitress-test.c
- LIBWAITRESS_HDR=\
- 		${LIBWAITRESS_DIR}/config.h \
- 		${LIBWAITRESS_DIR}/waitress.h
- LIBWAITRESS_OBJ=${LIBWAITRESS_SRC:.c=.o}
-+LIBWAITRESS_TOBJ=${LIBWAITRESS_TSRC:.c=.o}
- LIBWAITRESS_RELOBJ=${LIBWAITRESS_SRC:.c=.lo}
- LIBWAITRESS_INCLUDE=${LIBWAITRESS_DIR}
- 
-@@ -130,8 +132,8 @@
- debug: CFLAGS=-Wall -pedantic -ggdb
- 
- waitress-test: CFLAGS+= -DTEST
--waitress-test: ${LIBWAITRESS_OBJ}
--	${CC} ${LDFLAGS} ${LIBWAITRESS_OBJ} -o waitress-test
-+waitress-test: ${LIBWAITRESS_TOBJ}
-+	${CC} ${LDFLAGS} ${LIBWAITRESS_TOBJ} -o waitress-test
- 
- test: waitress-test
- 	./waitress-test
diff --git a/media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch b/media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch
new file mode 100644
index 000000000000..0ace55cb9375
--- /dev/null
+++ b/media-sound/pianobar/files/pianobar-2011.11.09_p1-tests.patch
@@ -0,0 +1,37 @@
+--- pianobar-2011.11.09_p1.orig/Makefile
++++ pianobar-2011.11.09_p1/Makefile
+@@ -55,10 +55,12 @@
+ 
+ LIBWAITRESS_DIR=src/libwaitress
+ LIBWAITRESS_SRC=${LIBWAITRESS_DIR}/waitress.c
++LIBWAITRESS_TSRC=${LIBWAITRESS_DIR}/waitress-test.c
+ LIBWAITRESS_HDR=\
+ 		${LIBWAITRESS_DIR}/config.h \
+ 		${LIBWAITRESS_DIR}/waitress.h
+ LIBWAITRESS_OBJ=${LIBWAITRESS_SRC:.c=.o}
++LIBWAITRESS_TOBJ=${LIBWAITRESS_TSRC:.c=.o}
+ LIBWAITRESS_RELOBJ=${LIBWAITRESS_SRC:.c=.lo}
+ LIBWAITRESS_INCLUDE=${LIBWAITRESS_DIR}
+ 
+@@ -133,8 +135,8 @@
+ debug: CFLAGS=-Wall -pedantic -ggdb
+ 
+ waitress-test: CFLAGS+= -DTEST
+-waitress-test: ${LIBWAITRESS_OBJ}
+-	${CC} ${LDFLAGS} ${LIBWAITRESS_OBJ} ${LIBGNUTLS_LDFLAGS} -o waitress-test
++waitress-test: ${LIBWAITRESS_TOBJ}
++	${CC} ${LDFLAGS} ${LIBWAITRESS_TOBJ} ${LIBGNUTLS_LDFLAGS} -o waitress-test
+ 
+ test: waitress-test
+ 	./waitress-test
+--- pianobar-2011.11.09_p1.orig/src/libwaitress/waitress.c
++++ pianobar-2011.11.09_p1/src/libwaitress/waitress.c
+@@ -1287,7 +1287,7 @@
+ 	gnutls_global_init ();
+ 	WaitressHandle_t waith;
+ 	char *buf;
+-	WaitressInit (&waith);
++	WaitressInit (&waith, NULL);
+ 	WaitressSetUrl (&waith, "http://6xq.net:80/");
+ 	printf ("ret: %s\n", WaitressErrorToStr (WaitressFetchBuf (&waith, &buf)));
+ 	printf ("%s\n", buf);
diff --git a/media-sound/pianobar/pianobar-2011.09.22.ebuild b/media-sound/pianobar/pianobar-2011.11.09_p1.ebuild
similarity index 84%
rename from media-sound/pianobar/pianobar-2011.09.22.ebuild
rename to media-sound/pianobar/pianobar-2011.11.09_p1.ebuild
index 07c24cf73a1a..afd56ad0e319 100644
--- a/media-sound/pianobar/pianobar-2011.09.22.ebuild
+++ b/media-sound/pianobar/pianobar-2011.11.09_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2011.09.22.ebuild,v 1.1 2011/09/22 18:15:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pianobar/pianobar-2011.11.09_p1.ebuild,v 1.1 2011/11/10 00:26:23 radhermit Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
 HOMEPAGE="http://6xq.net/projects/pianobar/"
-SRC_URI="http://6xq.net/static/projects/${PN}/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="aac +mp3"
 
 DEPEND="media-libs/libao
+	net-libs/gnutls
 	aac? ( media-libs/faad2 )
 	mp3? ( media-libs/libmad )"
 RDEPEND="${DEPEND}"
@@ -23,7 +24,7 @@ RDEPEND="${DEPEND}"
 REQUIRED_USE="|| ( mp3 aac )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2011.07.09-tests.patch
+	epatch "${FILESDIR}"/${P}-tests.patch
 }
 
 src_compile() {
diff --git a/media-video/ffmpeg/ffmpeg-0.7.7.ebuild b/media-video/ffmpeg/ffmpeg-0.7.7.ebuild
index b6c0e5e88e48..9703bb770888 100644
--- a/media-video/ffmpeg/ffmpeg-0.7.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.7.ebuild,v 1.3 2011/11/08 22:40:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.7.ebuild,v 1.4 2011/11/09 13:52:56 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 fi
 IUSE="
 	+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index d6389bc09aff..70b176f253a6 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.62 2011/11/07 13:30:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.63 2011/11/09 13:01:11 aballier Exp $
 
 EAPI="4"
 
@@ -38,7 +38,7 @@ IUSE="
 
 # String for CPU features in the useflag[:configure_option] form
 # if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
 
 for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
diff --git a/metadata/cache/app-emulation/libvirt-0.9.7 b/metadata/cache/app-emulation/libvirt-0.9.7
new file mode 100644
index 000000000000..e141081716fd
--- /dev/null
+++ b/metadata/cache/app-emulation/libvirt-0.9.7
@@ -0,0 +1,22 @@
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) json? ( dev-libs/yajl ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2 ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) dev-util/pkgconfig >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) )
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) json? ( dev-libs/yajl ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2 ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) )
+0
+http://libvirt.org/sources/libvirt-0.9.7.tar.gz ftp://libvirt.org/libvirt/libvirt-0.9.7.tar.gz
+
+http://www.libvirt.org/
+LGPL-2.1
+C toolkit to manipulate virtual machines
+~amd64 ~x86
+eutils multilib portability python toolchain-funcs user
+avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev uml virtualbox virt-network xen elibc_glibc
+
+
+
+3
+
+configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/app-i18n/ibus-tutcode-1.0.1 b/metadata/cache/app-i18n/ibus-tutcode-1.0.1
new file mode 100644
index 000000000000..e6b434019d9c
--- /dev/null
+++ b/metadata/cache/app-i18n/ibus-tutcode-1.0.1
@@ -0,0 +1,22 @@
+>=dev-lang/python-2.5 >=sys-devel/gettext-0.16.1
+>=dev-lang/python-2.5 >=sys-devel/gettext-0.16.1 app-i18n/ibus
+0
+https://github.com/downloads/deton/ibus-tutcode/ibus-tutcode-1.0.1.tar.bz2
+
+https://github.com/deton/ibus-tutcode/
+GPL-2
+a Japanese TUT-Code input engine for IBus
+~amd64 ~x86
+
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/app-office/libreoffice-3.4.4.2 b/metadata/cache/app-office/libreoffice-3.4.4.2
deleted file mode 100644
index 1780133919db..000000000000
--- a/metadata/cache/app-office/libreoffice-3.4.4.2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 >=net-misc/curl-7.21.4 >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
-0
-branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-bootstrap-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-artwork-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-base-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-calc-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-components-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extensions-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extras-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-filters-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-impress-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-core-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-gui-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-postprocess-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-sdk-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-testing-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-ure-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-writer-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-bootstrap-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-artwork-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-base-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-calc-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-components-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extensions-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extras-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-filters-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-help-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-impress-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-core-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-gui-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-postprocess-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-sdk-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-testing-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-ure-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-writer-3.4.4.2.tar.bz2 http://dev-www.libreoffice.org/src//128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip http://dev-www.libreoffice.org/src//bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz http://dev-www.libreoffice.org/src//fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll templates? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt linguas_de? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt ) linguas_en_GB? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt ) linguas_en_ZA? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt ) linguas_es? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt ) linguas_fr? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt ) linguas_hu? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt ) linguas_it? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt ) )
-test
-http://www.libreoffice.org
-LGPL-3
-LibreOffice, a full office productivity suite.
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python templates test +vba webdav linguas_de linguas_en_GB linguas_en_ZA linguas_es linguas_fr linguas_hu linguas_it elibc_FreeBSD java aqua kde kdeenablefinal
-|| ( gtk gnome kde ) gnome? ( gtk ) nsplugin? ( gtk )
->=app-office/libreoffice-l10n-3.4
-
-4
-
-compile configure install postinst postrm preinst prepare pretend setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/libreoffice-3.4.4.2-r1 b/metadata/cache/app-office/libreoffice-3.4.4.2-r1
new file mode 100644
index 000000000000..b6731190df17
--- /dev/null
+++ b/metadata/cache/app-office/libreoffice-3.4.4.2-r1
@@ -0,0 +1,22 @@
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 >=net-misc/curl-7.21.4 >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers] ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+0
+branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev.gentooexperimental.org/~scarabeus/libreoffice-3.4.4.2-patchset-01.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-bootstrap-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-artwork-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-base-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-calc-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-components-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extensions-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extras-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-filters-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-impress-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-core-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-gui-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-postprocess-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-sdk-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-testing-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-ure-3.4.4.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-writer-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-bootstrap-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-artwork-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-base-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-calc-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-components-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extensions-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extras-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-filters-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-help-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-impress-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-core-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-gui-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-postprocess-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-sdk-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-testing-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-ure-3.4.4.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-writer-3.4.4.2.tar.bz2 http://dev-www.libreoffice.org/src//128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip http://dev-www.libreoffice.org/src//bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz http://dev-www.libreoffice.org/src//fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll templates? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt linguas_de? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt ) linguas_en_GB? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt ) linguas_en_ZA? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt ) linguas_es? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt ) linguas_fr? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt ) linguas_hu? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt ) linguas_it? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt ) )
+test
+http://www.libreoffice.org
+LGPL-3
+LibreOffice, a full office productivity suite.
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
+binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python templates test +vba webdav linguas_de linguas_en_GB linguas_en_ZA linguas_es linguas_fr linguas_hu linguas_it elibc_FreeBSD java aqua kde kdeenablefinal
+|| ( gtk gnome kde ) gnome? ( gtk ) nsplugin? ( gtk )
+>=app-office/libreoffice-l10n-3.4
+
+4
+
+compile configure install postinst postrm preinst prepare pretend setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-embedded/mspdebug-0.16 b/metadata/cache/dev-embedded/mspdebug-0.16
deleted file mode 100644
index c928b76943dd..000000000000
--- a/metadata/cache/dev-embedded/mspdebug-0.16
+++ /dev/null
@@ -1,22 +0,0 @@
-readline? ( sys-libs/readline ) virtual/libusb:0
-readline? ( sys-libs/readline ) virtual/libusb:0
-0
-mirror://sourceforge/mspdebug/mspdebug-0.16.tar.gz
-
-http://mspdebug.sourceforge.net/
-GPL-2
-A free debugger for use with MSP430 MCUs
-~amd64 ~x86
-multilib toolchain-funcs
-readline
-
-
-
-4
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-embedded/mspdebug-0.15 b/metadata/cache/dev-embedded/mspdebug-0.18
similarity index 83%
rename from metadata/cache/dev-embedded/mspdebug-0.15
rename to metadata/cache/dev-embedded/mspdebug-0.18
index 980158a4917c..12554d773e68 100644
--- a/metadata/cache/dev-embedded/mspdebug-0.15
+++ b/metadata/cache/dev-embedded/mspdebug-0.18
@@ -1,7 +1,7 @@
 readline? ( sys-libs/readline ) virtual/libusb:0
 readline? ( sys-libs/readline ) virtual/libusb:0
 0
-mirror://sourceforge/mspdebug/mspdebug-0.15.tar.gz
+mirror://sourceforge/mspdebug/mspdebug-0.18.tar.gz
 
 http://mspdebug.sourceforge.net/
 GPL-2
diff --git a/metadata/cache/dev-games/cegui-0.7.5-r1 b/metadata/cache/dev-games/cegui-0.7.5-r1
index 0d9dc19dde9f..f1c51e451084 100644
--- a/metadata/cache/dev-games/cegui-0.7.5-r1
+++ b/metadata/cache/dev-games/cegui-0.7.5-r1
@@ -1,5 +1,5 @@
-bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) ogre? ( dev-games/ogre ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) dev-util/pkgconfig doc? ( app-doc/doxygen )
-bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) ogre? ( dev-games/ogre ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 )
+bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) dev-util/pkgconfig doc? ( app-doc/doxygen )
+bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 )
 0
 mirror://sourceforge/crayzedsgui/CEGUI-0.7.5.tar.gz doc? ( mirror://sourceforge/crayzedsgui/CEGUI-DOCS-0.7.5.tar.gz )
 
@@ -8,7 +8,7 @@ MIT
 Crazy Eddie's GUI System
 amd64 -ppc x86
 eutils multilib portability toolchain-funcs user
-bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip
+bidi debug devil doc examples expat gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip
 || ( xml tinyxml )
 
 
diff --git a/metadata/cache/dev-java/guava-07 b/metadata/cache/dev-java/guava-07
new file mode 100644
index 000000000000..6b2f7fb3c773
--- /dev/null
+++ b/metadata/cache/dev-java/guava-07
@@ -0,0 +1,22 @@
+dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+http://guava-libraries.googlecode.com/files/guava-r07.zip
+
+http://code.google.com/p/guava-libraries/
+Apache-2.0
+A collection of Google's core Java libraries
+~amd64 ~x86
+eutils java-pkg-2 java-pkg-simple java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source elibc_FreeBSD
+
+
+
+4
+
+compile install preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/jemalloc-2.2.3 b/metadata/cache/dev-libs/jemalloc-2.2.3
index c2b74874c177..f0d570eb0c24 100644
--- a/metadata/cache/dev-libs/jemalloc-2.2.3
+++ b/metadata/cache/dev-libs/jemalloc-2.2.3
@@ -6,7 +6,7 @@ http://www.canonware.com/download/jemalloc/jemalloc-2.2.3.tar.bz2
 http://www.canonware.com/jemalloc/
 BSD
 Jemalloc is a general-purpose scalable concurrent allocator
-~amd64 ~x86
+~amd64 ~ppc ~ppc64 ~x86
 autotools eutils libtool multilib portability toolchain-funcs user
 debug stats
 
diff --git a/metadata/cache/dev-libs/libffi-3.0.10 b/metadata/cache/dev-libs/libffi-3.0.10
index 5775d860e43d..8019bfc45e32 100644
--- a/metadata/cache/dev-libs/libffi-3.0.10
+++ b/metadata/cache/dev-libs/libffi-3.0.10
@@ -6,7 +6,7 @@ ftp://sourceware.org/pub/libffi/libffi-3.0.10.tar.gz
 http://sourceware.org/libffi/
 MIT
 a portable, high level programming interface to various calling conventions.
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils libtool multilib portability toolchain-funcs user
 debug static-libs test
 
diff --git a/metadata/cache/dev-python/boto-2.1.1 b/metadata/cache/dev-python/boto-2.1.1
new file mode 100644
index 000000000000..8da9883b521d
--- /dev/null
+++ b/metadata/cache/dev-python/boto-2.1.1
@@ -0,0 +1,22 @@
+dev-python/setuptools >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+http://boto.googlecode.com/files/boto-2.1.1.tar.gz
+
+http://code.google.com/p/boto/ http://pypi.python.org/pypi/boto
+MIT
+Amazon Web Services API
+~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos
+distutils multilib python toolchain-funcs
+
+
+
+
+3
+
+compile install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-atk-1.0.3 b/metadata/cache/dev-ruby/ruby-atk-1.0.3
new file mode 100644
index 000000000000..fb279b2cfb1f
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-atk-1.0.3
@@ -0,0 +1,22 @@
+dev-libs/atk test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+dev-libs/atk ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby Atk bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-gdkpixbuf2-1.0.3 b/metadata/cache/dev-ruby/ruby-gdkpixbuf2-1.0.3
new file mode 100644
index 000000000000..7df0d51aed36
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-gdkpixbuf2-1.0.3
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+x11-libs/gtk+:2 ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby GdkPixbuf2 bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-gio2-1.0.3 b/metadata/cache/dev-ruby/ruby-gio2-1.0.3
new file mode 100644
index 000000000000..e8c9efed7faa
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-gio2-1.0.3
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby binding of GooCanvas
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-glib2-1.0.3 b/metadata/cache/dev-ruby/ruby-glib2-1.0.3
new file mode 100644
index 000000000000..13273b56d136
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-glib2-1.0.3
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/pkg-config[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+>=dev-libs/glib-2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby Glib2 bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
+
+
+
+3
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-gtk2-1.0.3 b/metadata/cache/dev-ruby/ruby-gtk2-1.0.3
new file mode 100644
index 000000000000..ea519d5fe4ea
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-gtk2-1.0.3
@@ -0,0 +1,22 @@
+x11-libs/gtk+:2 ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-pango-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-pango-1.0.3[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-atk-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-gio2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-atk-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+x11-libs/gtk+:2 ruby_targets_ruby18? ( >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-atk-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-gio2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-atk-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby Gtk2 bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-pango-1.0.3 b/metadata/cache/dev-ruby/ruby-pango-1.0.3
new file mode 100644
index 000000000000..930b2e01dc34
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-pango-1.0.3
@@ -0,0 +1,22 @@
+>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby Pango bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-poppler-1.0.3 b/metadata/cache/dev-ruby/ruby-poppler-1.0.3
new file mode 100644
index 000000000000..3ed40c43c579
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-poppler-1.0.3
@@ -0,0 +1,22 @@
+app-text/poppler[cairo] dev-util/pkgconfig test? ( ruby_targets_ruby18? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby18] >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby19] >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+app-text/poppler[cairo] ruby_targets_ruby18? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby18] >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby19] >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby poppler-glib bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-rsvg-1.0.3 b/metadata/cache/dev-ruby/ruby-rsvg-1.0.3
new file mode 100644
index 000000000000..aed91f441968
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-rsvg-1.0.3
@@ -0,0 +1,22 @@
+>=gnome-base/librsvg-2.8 dev-util/pkgconfig test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby18] cairo? ( dev-ruby/rcairo[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby19] cairo? ( dev-ruby/rcairo[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+>=gnome-base/librsvg-2.8 ruby_targets_ruby18? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby18] >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby18] cairo? ( dev-ruby/rcairo[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.0.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-1.0.3[ruby_targets_ruby19] cairo? ( dev-ruby/rcairo[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby bindings for librsvg
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+cairo test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby-vte-1.0.3 b/metadata/cache/dev-ruby/ruby-vte-1.0.3
new file mode 100644
index 000000000000..b08c87dcf3cd
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-vte-1.0.3
@@ -0,0 +1,22 @@
+>=x11-libs/vte-0.12.1:0 dev-util/pkgconfig test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ) dev-util/pkgconfig ruby_targets_ruby18? ( dev-ruby/pkg-config[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] )
+>=x11-libs/vte-0.12.1:0 ruby_targets_ruby18? ( >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1.0.3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.0.3.tar.gz
+
+http://ruby-gnome2.sourceforge.jp/
+Ruby
+Ruby vte bindings
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng ruby-ng-gnome2 toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/ruby2ruby-1.3.1 b/metadata/cache/dev-ruby/ruby2ruby-1.3.1
new file mode 100644
index 000000000000..5fd9e6121cca
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby2ruby-1.3.1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( =dev-ruby/parsetree-3*[ruby_targets_ruby18] =dev-ruby/sexp-processor-3*[ruby_targets_ruby18] =dev-ruby/ruby_parser-2*[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/parsetree-3*[ruby_targets_ree18] =dev-ruby/sexp-processor-3*[ruby_targets_ree18] =dev-ruby/ruby_parser-2*[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/hoe[ruby_targets_ree18] dev-ruby/hoe-seattlerb[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( =dev-ruby/parsetree-3*[ruby_targets_ruby18] =dev-ruby/sexp-processor-3*[ruby_targets_ruby18] =dev-ruby/ruby_parser-2*[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/parsetree-3*[ruby_targets_ree18] =dev-ruby/sexp-processor-3*[ruby_targets_ree18] =dev-ruby/ruby_parser-2*[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+mirror://rubygems/ruby2ruby-1.3.1.gem
+
+http://seattlerb.rubyforge.org/
+GPL-2
+Generates readable ruby from ParseTree
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-util/checkstyle-5.4 b/metadata/cache/dev-util/checkstyle-5.4
new file mode 100644
index 000000000000..2de8ba648138
--- /dev/null
+++ b/metadata/cache/dev-util/checkstyle-5.4
@@ -0,0 +1,22 @@
+dev-java/ant-core:0 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:0 >=virtual/jdk-1.5 dev-java/ant-nodeps:0 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/ant-core:0 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:0 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+mirror://sourceforge/checkstyle/checkstyle-5.4-src.tar.gz http://dev.gentoo.org/~sera/distfiles/checkstyle-5.4-maven-build.xml.tar.bz2
+
+http://checkstyle.sourceforge.net
+LGPL-2.1
+A development tool to help programmers write Java code that adheres to a coding standard.
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-1.7.7.3 b/metadata/cache/dev-vcs/git-1.7.7.3
new file mode 100644
index 000000000000..58500ee234f0
--- /dev/null
+++ b/metadata/cache/dev-vcs/git-1.7.7.3
@@ -0,0 +1,22 @@
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+0
+http://git-core.googlecode.com/files/git-1.7.7.3.tar.gz mirror://kernel/software/scm/git/git-1.7.7.3.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.3.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.3.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.3.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.3.tar.gz )
+
+http://www.git-scm.com/
+GPL-2
+GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user
++blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
+cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/games-rpg/pcgen-5.16.4 b/metadata/cache/games-rpg/pcgen-5.16.4
index 691d7833469a..4a4634149926 100644
--- a/metadata/cache/games-rpg/pcgen-5.16.4
+++ b/metadata/cache/games-rpg/pcgen-5.16.4
@@ -1,12 +1,12 @@
 app-arch/unzip
->=virtual/jre-1.5
+dev-java/sun-jdk
 0
 mirror://sourceforge/pcgen/pcgen5164_full.zip
 
 http://pcgen.sourceforge.net/
 LGPL-2 OGL-1.0a
 D&D character generator
-amd64 ppc x86
+amd64 x86
 base eutils games multilib portability toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/mail-mta/postfix-2.9_pre20111106 b/metadata/cache/mail-mta/postfix-2.9_pre20111108
similarity index 96%
rename from metadata/cache/mail-mta/postfix-2.9_pre20111106
rename to metadata/cache/mail-mta/postfix-2.9_pre20111108
index c6deabfaabae..eab05fb7d625 100644
--- a/metadata/cache/mail-mta/postfix-2.9_pre20111106
+++ b/metadata/cache/mail-mta/postfix-2.9_pre20111108
@@ -1,7 +1,7 @@
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 0
-ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.9-20111106.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.9-20111108.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
 
 http://www.postfix.org/
 IBM
diff --git a/metadata/cache/media-gfx/darktable-0.9.3 b/metadata/cache/media-gfx/darktable-0.9.3
new file mode 100644
index 000000000000..b3e51b6f59d3
--- /dev/null
+++ b/metadata/cache/media-gfx/darktable-0.9.3
@@ -0,0 +1,22 @@
+dev-db/sqlite:3 dev-libs/libxml2:2 flickr? ( media-libs/flickcurl ) gnome? ( gnome-base/gconf gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) kde? ( dev-libs/dbus-glib ) media-gfx/exiv2 media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng >=media-libs/libraw-0.13.4[demosaic] media-libs/openexr media-libs/tiff net-misc/curl opencl? ( video_cards_nvidia? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 ) ) slideshow? ( media-libs/libsdl virtual/opengl ) virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 dev-util/pkgconfig nls? ( sys-devel/gettext ) app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-db/sqlite:3 dev-libs/libxml2:2 flickr? ( media-libs/flickcurl ) gnome? ( gnome-base/gconf gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) kde? ( dev-libs/dbus-glib ) media-gfx/exiv2 media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng >=media-libs/libraw-0.13.4[demosaic] media-libs/openexr media-libs/tiff net-misc/curl opencl? ( video_cards_nvidia? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 ) ) slideshow? ( media-libs/libsdl virtual/opengl ) virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2
+0
+mirror://sourceforge/darktable/darktable-0.9.3.tar.gz
+
+http://darktable.sf.net/
+GPL-3
+A virtual lighttable and darkroom for photographers
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/libmediawiki-2.1.0 b/metadata/cache/media-libs/libmediawiki-2.1.0
deleted file mode 100644
index b6735bd678f8..000000000000
--- a/metadata/cache/media-libs/libmediawiki-2.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 >=dev-util/cmake-2.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
->=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
-4
-mirror://sourceforge/digikam/digikam-2.1.0.tar.bz2
-
-http://www.digikam.org/
-GPL-2
-KDE C++ interface for MediaWiki based web service as wikipedia.org
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-aqua kdeenablefinal
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libmediawiki-2.0.0 b/metadata/cache/media-libs/libmediawiki-2.3.0
similarity index 96%
rename from metadata/cache/media-libs/libmediawiki-2.0.0
rename to metadata/cache/media-libs/libmediawiki-2.3.0
index c98a87cc5551..1e74a37ca168 100644
--- a/metadata/cache/media-libs/libmediawiki-2.0.0
+++ b/metadata/cache/media-libs/libmediawiki-2.3.0
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4 >=dev-util/cmake-2.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 >=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 4
-mirror://sourceforge/digikam/digikam-2.0.0.tar.bz2
+mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 
 http://www.digikam.org/
 GPL-2
diff --git a/metadata/cache/media-plugins/kipi-plugins-2.3.0 b/metadata/cache/media-plugins/kipi-plugins-2.3.0
new file mode 100644
index 000000000000..3232b32385f3
--- /dev/null
+++ b/metadata/cache/media-plugins/kipi-plugins-2.3.0
@@ -0,0 +1,22 @@
+>=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.3.0 ) mediawiki? ( >=media-libs/libmediawiki-2.3.0 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( >=net-libs/libkvkontakte-2.3.0 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
+>=kde-base/libkipi-4.7:4[aqua=] >=kde-base/libkdcraw-4.7:4[aqua=] >=kde-base/libkexiv2-4.7:4[aqua=] dev-libs/expat dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson gpssync? ( >=media-libs/libkgeomap-2.3.0 ) mediawiki? ( >=media-libs/libmediawiki-2.3.0 ) media-libs/libpng media-libs/tiff virtual/jpeg calendar? ( >=kde-base/kdepimlibs-4.7:4[aqua=] ) crypt? ( app-crypt/qca:2 ) ipod? ( media-libs/libgpod x11-libs/gtk+:2 ) redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( >=kde-base/libksane-4.7:4[aqua=] media-gfx/sane-backends ) vkontakte? ( >=net-libs/libkvkontakte-2.3.0 ) cdr? ( app-cdr/k3b ) expoblending? ( media-gfx/hugin ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) mjpeg? ( media-video/mjpegtools ) panorama? ( media-gfx/enblend >=media-gfx/hugin-2011.0.0 ) >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ar(+)] ) linguas_az? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_az(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_be(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bg(+)] ) linguas_bn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bn(+)] ) linguas_br? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_br(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_csb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_csb(+)] ) linguas_cy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cy(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fo(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_fy? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fy(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_ha? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ha(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_he(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hi(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hr(+)] ) linguas_hsb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hsb(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_id? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_id(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ka(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ko(+)] ) linguas_ku? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ku(+)] ) linguas_lb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lb(+)] ) linguas_lo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lo(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lv(+)] ) linguas_mi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mi(+)] ) linguas_mk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mk(+)] ) linguas_mn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mn(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ms(+)] ) linguas_mt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_mt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_ne? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ne(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nn(+)] ) linguas_nso? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nso(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_rw? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_rw(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sq(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_ss? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ss(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ta(+)] ) linguas_te? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_te(+)] ) linguas_tg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tg(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_tt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tt(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_uz? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uz(+)] ) linguas_ven? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ven(+)] ) linguas_vi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_vi(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_wa(+)] ) linguas_xh? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_xh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_HK? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_HK(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) linguas_zu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zu(+)] ) handbook? ( >=kde-base/kdelibs-4.7:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
+4
+mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
+
+http://www.digikam.org/
+GPL-2 handbook? ( FDL-1.2 )
+Plugins for the KDE Image Plugin Interface
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
+cdr calendar crypt debug expoblending gpssync +imagemagick ipod +mediawiki mjpeg panorama redeyes scanner vkontakte linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_fy linguas_ga linguas_gl linguas_ha linguas_he linguas_hi linguas_hr linguas_hsb linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_ko linguas_ku linguas_lb linguas_lo linguas_lt linguas_lv linguas_mi linguas_mk linguas_mn linguas_ms linguas_mt linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_se linguas_sk linguas_sl linguas_sq linguas_sr linguas_ss linguas_sv linguas_ta linguas_te linguas_tg linguas_th linguas_tr linguas_tt linguas_uk linguas_uz linguas_ven linguas_vi linguas_wa linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu opengl +handbook aqua kdeenablefinal
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-radio/fldigi-3.21.23 b/metadata/cache/media-radio/fldigi-3.21.23
new file mode 100644
index 000000000000..0c244dc6138c
--- /dev/null
+++ b/metadata/cache/media-radio/fldigi-3.21.23
@@ -0,0 +1,22 @@
+<x11-libs/fltk-1.2:1[threads,xft] media-libs/libsamplerate media-libs/libpng x11-misc/xdg-utils hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 ) xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] <dev-libs/xmlrpc-c-1.18.02 ) dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl ) nls? ( sys-devel/gettext ) dev-util/pkgconfig
+<x11-libs/fltk-1.2:1[threads,xft] media-libs/libsamplerate media-libs/libpng x11-misc/xdg-utils hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 ) xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] <dev-libs/xmlrpc-c-1.18.02 ) dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl )
+0
+http://www.w1hkj.com/downloads/fldigi/fldigi-3.21.23.tar.gz
+
+http://www.w1hkj.com/Fldigi.html
+GPL-3
+Sound card based multimode software modem for Amateur Radio use
+~amd64 ~x86
+
+hamlib nls portaudio pulseaudio sndfile xmlrpc
+
+
+
+2
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/media-radio/tucnak2-2.45 b/metadata/cache/media-radio/tucnak2-2.45
new file mode 100644
index 000000000000..610fe4885b06
--- /dev/null
+++ b/metadata/cache/media-radio/tucnak2-2.45
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2
+0
+http://tucnak.nagano.cz/tucnak2-2.45.tar.gz
+
+http://tucnak.nagano.cz
+GPL-2
+Amateur Radio VHF Contest Logbook
+~amd64 ~x86
+autotools eutils libtool multilib portability toolchain-funcs user
+alsa fftw ftdi gpm hamlib suid
+
+
+
+2
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/media-sound/pianobar-2011.09.22 b/metadata/cache/media-sound/pianobar-2011.09.22
deleted file mode 100644
index e3d8cacd9855..000000000000
--- a/metadata/cache/media-sound/pianobar-2011.09.22
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libao aac? ( media-libs/faad2 ) mp3? ( media-libs/libmad )
-media-libs/libao aac? ( media-libs/faad2 ) mp3? ( media-libs/libmad )
-0
-http://6xq.net/static/projects/pianobar/pianobar-2011.09.22.tar.bz2
-
-http://6xq.net/projects/pianobar/
-as-is
-A console-based replacement for Pandora's flash player
-~amd64 ~x86
-eutils flag-o-matic multilib portability toolchain-funcs user
-aac +mp3
-|| ( mp3 aac )
-
-
-4
-
-compile install prepare test
-
-
-
-
-
diff --git a/metadata/cache/media-sound/pianobar-2011.11.09_p1 b/metadata/cache/media-sound/pianobar-2011.11.09_p1
new file mode 100644
index 000000000000..1fe66815e655
--- /dev/null
+++ b/metadata/cache/media-sound/pianobar-2011.11.09_p1
@@ -0,0 +1,22 @@
+media-libs/libao net-libs/gnutls aac? ( media-libs/faad2 ) mp3? ( media-libs/libmad )
+media-libs/libao net-libs/gnutls aac? ( media-libs/faad2 ) mp3? ( media-libs/libmad )
+0
+http://dev.gentoo.org/~radhermit/distfiles/pianobar-2011.11.09_p1.tar.bz2
+
+http://6xq.net/projects/pianobar/
+as-is
+A console-based replacement for Pandora's flash player
+~amd64 ~x86
+eutils flag-o-matic multilib portability toolchain-funcs user
+aac +mp3
+|| ( mp3 aac )
+
+
+4
+
+compile install prepare test
+
+
+
+
+
diff --git a/metadata/cache/media-video/ffmpeg-0.7.7 b/metadata/cache/media-video/ffmpeg-0.7.7
index 6a9b8b8cacf9..b0f188782618 100644
--- a/metadata/cache/media-video/ffmpeg-0.7.7
+++ b/metadata/cache/media-video/ffmpeg-0.7.7
@@ -6,7 +6,7 @@ http://ffmpeg.org/releases/ffmpeg-0.7.7.tar.bz2
 http://ffmpeg.org/
 GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 Complete solution to record, convert and stream audio and video. Includes libavcodec.
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 eutils flag-o-matic multilib portability toolchain-funcs user
 +3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib video_cards_nvidia
 
diff --git a/metadata/cache/media-video/ffmpeg-9999 b/metadata/cache/media-video/ffmpeg-9999
index 561f766f3427..3d894478c263 100644
--- a/metadata/cache/media-video/ffmpeg-9999
+++ b/metadata/cache/media-video/ffmpeg-9999
@@ -8,7 +8,7 @@ GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 Complete solution to record, convert and stream audio and video. Includes libavcodec.
 
 eutils flag-o-matic git-2 multilib portability toolchain-funcs user
-aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio qt-faststart rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon
+aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio qt-faststart rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon iwmmxt
 bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l )
 
 
diff --git a/metadata/cache/net-dns/c-ares-1.7.4 b/metadata/cache/net-dns/c-ares-1.7.4
index 892881a08c89..2ee96b1036a9 100644
--- a/metadata/cache/net-dns/c-ares-1.7.4
+++ b/metadata/cache/net-dns/c-ares-1.7.4
@@ -1,9 +1,9 @@
 
 
 0
-http://daniel.haxx.se/projects/c-ares/c-ares-1.7.4.tar.gz
+http://c-ares.haxx.se/download/c-ares-1.7.4.tar.gz
 
-http://daniel.haxx.se/projects/c-ares/
+http://c-ares.haxx.se/
 MIT
 C library that resolves names asynchronously
 alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
diff --git a/metadata/cache/net-dns/dnsmasq-2.59 b/metadata/cache/net-dns/dnsmasq-2.59
new file mode 100644
index 000000000000..a88493393d4e
--- /dev/null
+++ b/metadata/cache/net-dns/dnsmasq-2.59
@@ -0,0 +1,22 @@
+dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dev-util/pkgconfig || ( app-arch/xz-utils app-arch/lzma-utils )
+dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn )
+0
+http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.59.tar.lzma
+
+http://www.thekelleys.org.uk/dnsmasq/
+|| ( GPL-2 GPL-3 )
+Small forwarding DNS server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils flag-o-matic multilib portability toolchain-funcs user
+conntrack dbus +dhcp idn ipv6 nls tftp
+
+
+
+4
+
+compile configure install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-ftp/filezilla-3.5.2 b/metadata/cache/net-ftp/filezilla-3.5.2
new file mode 100644
index 000000000000..a93ac7a394ca
--- /dev/null
+++ b/metadata/cache/net-ftp/filezilla-3.5.2
@@ -0,0 +1,22 @@
+>=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-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+0
+mirror://sourceforge/filezilla/FileZilla_3.5.2_src.tar.bz2
+
+http://filezilla-project.org/
+GPL-2
+FTP client with lots of useful features and an intuitive interface
+~amd64 ~ia64 ~ppc ~sparc ~x86
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user wxwidgets
+dbus nls test
+
+
+
+2
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-irc/unrealircd-3.2.9_rc2 b/metadata/cache/net-irc/unrealircd-3.2.9_rc2
index 4001ae073b2b..52174fd38952 100644
--- a/metadata/cache/net-irc/unrealircd-3.2.9_rc2
+++ b/metadata/cache/net-irc/unrealircd-3.2.9_rc2
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[ares] ) dev-libs/tre >=net-dns/c-ares-1.7 >=sys-apps/sed-4 >=dev-util/pkgconfig-0.25 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ssl? ( dev-libs/openssl )
+ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[ares] ) dev-libs/tre >=net-dns/c-ares-1.7 >=sys-apps/sed-4 >=dev-util/pkgconfig-0.25 ssl? ( dev-libs/openssl )
 ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl[ares] ) dev-libs/tre >=net-dns/c-ares-1.7
 0
 http://www.unrealircd.com/downloads/Unreal3.2.9-rc2.tar.gz
@@ -7,7 +7,7 @@ http://www.unrealircd.com/
 GPL-2
 An advanced Internet Relay Chat daemon
 ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux
-autotools eutils libtool multilib portability ssl-cert toolchain-funcs user versionator
+eutils multilib portability ssl-cert toolchain-funcs user versionator
 curl ipv6 +extban-stacking +operoverride +spoof operoverride-verify +prefixaq showlistmodes shunnotices ssl topicisnuhost +usermod zlib ssl
 
 
diff --git a/metadata/cache/net-libs/libkvkontakte-2.1.0 b/metadata/cache/net-libs/libkvkontakte-2.3.0
similarity index 96%
rename from metadata/cache/net-libs/libkvkontakte-2.1.0
rename to metadata/cache/net-libs/libkvkontakte-2.3.0
index 21d0a806cc8a..1973333323aa 100644
--- a/metadata/cache/net-libs/libkvkontakte-2.1.0
+++ b/metadata/cache/net-libs/libkvkontakte-2.3.0
@@ -1,7 +1,7 @@
 >=dev-libs/qjson-0.7.0 >=sys-apps/sed-4 >=dev-util/cmake-2.8 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 >=dev-libs/qjson-0.7.0 >=kde-base/oxygen-icons-4.7:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
 4
-mirror://sourceforge/digikam/digikam-2.1.0.tar.bz2
+mirror://sourceforge/digikam/digikam-2.3.0.tar.bz2
 
 http://www.digikam.org/
 GPL-2
diff --git a/metadata/cache/net-libs/nodejs-0.6.0 b/metadata/cache/net-libs/nodejs-0.6.0
new file mode 100644
index 000000000000..72029c1fbae2
--- /dev/null
+++ b/metadata/cache/net-libs/nodejs-0.6.0
@@ -0,0 +1,22 @@
+>=dev-lang/v8-3.5.10.22 dev-libs/openssl
+>=dev-lang/v8-3.5.10.22 dev-libs/openssl
+0
+http://nodejs.org/dist/v0.6.0/node-v0.6.0.tar.gz
+test
+http://nodejs.org/
+GPL-2
+Evented IO for V8 Javascript
+~x86 ~amd64
+eutils multilib portability toolchain-funcs user
+
+
+
+
+2
+
+compile configure install test
+
+
+
+
+
diff --git a/metadata/cache/net-libs/telepathy-farsight-0.0.19 b/metadata/cache/net-libs/telepathy-farsight-0.0.19
new file mode 100644
index 000000000000..5f02edea4610
--- /dev/null
+++ b/metadata/cache/net-libs/telepathy-farsight-0.0.19
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.16:2 >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.60 >=net-libs/telepathy-glib-0.14.3 >=net-libs/farsight2-0.0.29 python? ( >=dev-python/pygobject-2.12.0:2 >=dev-python/gst-python-0.10.10 ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+>=dev-libs/glib-2.16:2 >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.60 >=net-libs/telepathy-glib-0.14.3 >=net-libs/farsight2-0.0.29 python? ( >=dev-python/pygobject-2.12.0:2 >=dev-python/gst-python-0.10.10 ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+0
+http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.19.tar.gz
+
+http://telepathy.freedesktop.org
+LGPL-2.1
+Farsight connection manager for the Telepathy framework
+~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux
+multilib python toolchain-funcs
+python
+
+
+
+3
+
+configure install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-misc/iputils-20101006-r2 b/metadata/cache/net-misc/iputils-20101006-r2
new file mode 100644
index 000000000000..7521bf40e92b
--- /dev/null
+++ b/metadata/cache/net-misc/iputils-20101006-r2
@@ -0,0 +1,22 @@
+!net-misc/rarpd ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn ) virtual/os-headers
+!net-misc/rarpd ssl? ( dev-libs/openssl ) idn? ( net-dns/libidn )
+0
+http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2 mirror://gentoo/iputils-s20101006-manpages.tar.bz2
+
+http://www.linux-foundation.org/en/Net:Iputils
+BSD
+Network monitoring tools including ping and ping6
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux
+eutils flag-o-matic multilib portability toolchain-funcs user
+doc idn ipv6 SECURITY_HAZARD ssl static
+
+
+
+2
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/openswan-2.6.37 b/metadata/cache/net-misc/openswan-2.6.37
index 9475d1ca871e..dda7ff232bec 100644
--- a/metadata/cache/net-misc/openswan-2.6.37
+++ b/metadata/cache/net-misc/openswan-2.6.37
@@ -6,7 +6,7 @@ test
 http://www.openswan.org/
 GPL-2
 Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN).
-~amd64 ~ppc ~sparc ~x86
+~amd64 ~ppc ~sparc x86
 eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator
 caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss
 
diff --git a/metadata/cache/sys-apps/biosdevname-0.3.11 b/metadata/cache/sys-apps/biosdevname-0.3.11
new file mode 100644
index 000000000000..7f660bf0d595
--- /dev/null
+++ b/metadata/cache/sys-apps/biosdevname-0.3.11
@@ -0,0 +1,22 @@
+sys-fs/udev sys-apps/pciutils
+sys-fs/udev
+0
+http://linux.dell.com/biosdevname/biosdevname-0.3.11/biosdevname-0.3.11.tar.gz
+
+http://linux.dell.com/biosdevname/
+GPL-2
+Sets BIOS-given device names instead of kernel eth* names
+~amd64 ~x86
+
+
+
+
+
+4
+
+postinst
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/biosdevname-0.3.8 b/metadata/cache/sys-apps/biosdevname-0.3.8
deleted file mode 100644
index bf54a3270a0d..000000000000
--- a/metadata/cache/sys-apps/biosdevname-0.3.8
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-apps/pciutils
-sys-apps/pciutils
-0
-http://linux.dell.com/biosdevname/biosdevname-0.3.8/biosdevname-0.3.8.tar.gz
-
-http://linux.dell.com/biosdevname/
-GPL-2
-Sets BIOS-given device names instead of kernel eth* names
-~amd64 ~x86
-
-
-
-
-
-4
-
-configure postinst
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/less-445-r1 b/metadata/cache/sys-apps/less-445-r1
new file mode 100644
index 000000000000..3a8452d63c8c
--- /dev/null
+++ b/metadata/cache/sys-apps/less-445-r1
@@ -0,0 +1,22 @@
+app-misc/editor-wrapper >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
+app-misc/editor-wrapper >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
+0
+http://www.greenwoodsoftware.com/less/less-445.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color
+
+http://www.greenwoodsoftware.com/less/
+|| ( GPL-3 BSD-2 )
+Excellent text file viewer
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils multilib portability toolchain-funcs user
+pcre unicode
+
+
+
+2
+
+configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/pkgcore-0.7.5 b/metadata/cache/sys-apps/pkgcore-0.7.5-r1
similarity index 70%
rename from metadata/cache/sys-apps/pkgcore-0.7.5
rename to metadata/cache/sys-apps/pkgcore-0.7.5-r1
index 5b3fb7f74d20..58d5b46f8827 100644
--- a/metadata/cache/sys-apps/pkgcore-0.7.5
+++ b/metadata/cache/sys-apps/pkgcore-0.7.5-r1
@@ -1,4 +1,4 @@
->=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.4 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx ) >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.4 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx dev-python/pyparsing ) >=app-admin/eselect-python-20091230 dev-lang/python
 >=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.4 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) >=app-admin/eselect-python-20091230 dev-lang/python
 0
 http://pkgcore.googlecode.com/files/pkgcore-0.7.5.tar.bz2
@@ -7,7 +7,7 @@ http://pkgcore.googlecode.com/
 GPL-2
 pkgcore package manager
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-distutils multilib python toolchain-funcs
+distutils eutils multilib portability python toolchain-funcs user
 -doc build
 
 
diff --git a/metadata/cache/sys-devel/clang-3.0_rc3 b/metadata/cache/sys-devel/clang-3.0_rc3
new file mode 100644
index 000000000000..c532bb9ecee8
--- /dev/null
+++ b/metadata/cache/sys-devel/clang-3.0_rc3
@@ -0,0 +1,22 @@
+static-analyzer? ( dev-lang/perl ) >=app-admin/eselect-python-20091230
+~sys-devel/llvm-3.0_rc3[multitarget=] >=app-admin/eselect-python-20091230
+0
+http://llvm.org/pre-releases/3.0/rc3/llvm-3.0rc3.src.tar.gz http://llvm.org/pre-releases/3.0/rc3/clang-3.0rc3.src.tar.gz
+
+http://clang.llvm.org/
+UoI-NCSA
+C language family frontend for LLVM
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+eutils multilib portability python toolchain-funcs user
+debug multitarget +static-analyzer +system-cxx-headers test
+
+
+
+3
+
+compile configure install postinst postrm prepare test
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/gcc-2.95.3-r10 b/metadata/cache/sys-devel/gcc-2.95.3-r10
index 36e1aacbec03..7cd90b1059e2 100644
--- a/metadata/cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/cache/sys-devel/gcc-2.95.3-r10
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-apps/texinfo-4.2-r4 !build? ( >=sys-libs/ncurses-5.2-r2 ) !build? ( nls? ( sys-devel/gettext ) ) sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=sys-libs/zlib-1.1.4 >=sys-apps/texinfo-4.2-r4 !build? ( >=sys-libs/ncurses-5.2-r2 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) )
+sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) )
 2.95
 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/~lv/GCC/gcc-2.95.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-2.95.3-patches-1.3.tar.bz2
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx
 
->=sys-devel/gcc-config-1.4 >=sys-devel/gcc-config-1.4
+>=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-3.2.2 b/metadata/cache/sys-devel/gcc-3.2.2
index e6d57e9f9e66..2b284f9b369c 100644
--- a/metadata/cache/sys-devel/gcc-3.2.2
+++ b/metadata/cache/sys-devel/gcc-3.2.2
@@ -1,4 +1,4 @@
-sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* ) >=media-libs/libart_lgpl-2.1 )
 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 3.2
 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/~lv/GCC/gcc-3.2.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.2.2-patches-1.1.tar.bz2
diff --git a/metadata/cache/sys-devel/gcc-3.3.6-r1 b/metadata/cache/sys-devel/gcc-3.3.6-r1
index 7b1324201583..3a1ece5a99e8 100644
--- a/metadata/cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/cache/sys-devel/gcc-3.3.6-r1
@@ -1,5 +1,5 @@
->=sys-devel/gcc-config-1.4 >=sys-libs/zlib-1.1.4 elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 ) >=sys-devel/binutils-2.14.90.0.6-r1 sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=sys-devel/gcc-config-1.4 >=sys-libs/zlib-1.1.4 elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 ) >=sys-devel/binutils-2.14.90.0.6-r1 sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
+>=sys-devel/binutils-2.14.90.0.6-r1 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* ) >=media-libs/libart_lgpl-2.1 )
+>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 3.3
 mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.3.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-3.3.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-ssp-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-patches-1.7.tar.bz2 mirror://gentoo/gcc-3.3.6-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.3.6-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-3.3.6-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-piepatches-v8.7.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/~lv/GCC/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
 strip
@@ -8,9 +8,9 @@ GPL-2 LGPL-2.1
 The GNU Compiler Collection
 ~amd64 ~x86
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp boundschecking bootstrap doc gcj gtk hardened libffi multilib objc
+build multislot nls nptl test vanilla altivec fortran nocxx nopie boundschecking nossp bootstrap doc gcj gtk hardened libffi multilib objc
 
->=sys-devel/gcc-config-1.4 >=sys-devel/gcc-config-1.4
+>=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-3.4.6-r2 b/metadata/cache/sys-devel/gcc-3.4.6-r2
index e0d3ac1b3d4c..7c326d01a589 100644
--- a/metadata/cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/cache/sys-devel/gcc-3.4.6-r2
@@ -1,5 +1,5 @@
->=sys-devel/gcc-config-1.4 >=sys-libs/zlib-1.1.4 virtual/libiconv elibc_glibc? ( >=sys-libs/glibc-2.3.3_pre20040420-r1 hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex >=sys-devel/binutils-2.14.90.0.8-r1 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=sys-devel/gcc-config-1.4 >=sys-libs/zlib-1.1.4 virtual/libiconv elibc_glibc? ( >=sys-libs/glibc-2.3.3_pre20040420-r1 hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
+>=sys-devel/binutils-2.14.90.0.8-r1 amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 ) sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 3.4
 mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.4.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-3.4.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-ssp-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-ssp-1.0.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-3.4.6-patches-1.6.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.6.tar.bz2 mirror://gentoo/gcc-3.4.6-piepatches-v8.7.10.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-3.4.6-piepatches-v8.7.10.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-3.4.6-piepatches-v8.7.10.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-piepatches-v8.7.10.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-piepatches-v8.7.10.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-piepatches-v8.7.10.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-piepatches-v8.7.10.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/~lv/GCC/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
 strip
@@ -8,9 +8,9 @@ GPL-2 LGPL-2.1
 The GNU Compiler Collection
 -* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-ip28 ip32r10k n32 n64 build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp boundschecking d bootstrap doc gcj gtk hardened libffi multilib objc
+ip28 ip32r10k n32 n64 build multislot nls nptl test vanilla altivec fortran nocxx nopie boundschecking d nossp bootstrap doc gcj gtk hardened libffi multilib objc
 
->=sys-devel/gcc-config-1.4 >=sys-devel/gcc-config-1.4
+>=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.0.4 b/metadata/cache/sys-devel/gcc-4.0.4
index 0bec03901c06..c946fe4a2836 100644
--- a/metadata/cache/sys-devel/gcc-4.0.4
+++ b/metadata/cache/sys-devel/gcc-4.0.4
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 fortran? ( dev-libs/gmp dev-libs/mpfr ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 fortran? ( dev-libs/gmp dev-libs/mpfr ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 )
 4.0
 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/~lv/GCC/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.0.4-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.0.4-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.0.4-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-piepatches-v8.7.8.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-piepatches-v8.7.8.tar.bz2
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.3.6 ) >=sys-devel/gcc-config-1.4
+>=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.1.2 b/metadata/cache/sys-devel/gcc-4.1.2
index 936fd4ace423..05b99c5b2aa7 100644
--- a/metadata/cache/sys-devel/gcc-4.1.2
+++ b/metadata/cache/sys-devel/gcc-4.1.2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 )
 4.1
 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/~lv/GCC/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.1.2-patches-1.3.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.3.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx d bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.3.6 ) >=sys-devel/gcc-config-1.4
+>=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.2.4-r1 b/metadata/cache/sys-devel/gcc-4.2.4-r1
index a57ebb15afdc..eac858497e41 100644
--- a/metadata/cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/cache/sys-devel/gcc-4.2.4-r1
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 )
 4.2
 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/~lv/GCC/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.2.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.1.tar.bz2
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.3.6 ) >=sys-devel/gcc-config-1.4
+>=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.3.3-r2 b/metadata/cache/sys-devel/gcc-4.3.3-r2
index d302b45c6e86..064488c44cb4 100644
--- a/metadata/cache/sys-devel/gcc-4.3.3-r2
+++ b/metadata/cache/sys-devel/gcc-4.3.3-r2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 4.3
 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/~lv/GCC/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.3.4 b/metadata/cache/sys-devel/gcc-4.3.4
index 6a15e7c27c2e..5c7264168185 100644
--- a/metadata/cache/sys-devel/gcc-4.3.4
+++ b/metadata/cache/sys-devel/gcc-4.3.4
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 4.3
 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/~lv/GCC/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.3.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.3.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -10,7 +10,7 @@ alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.3.5 b/metadata/cache/sys-devel/gcc-4.3.5
index 1d593ae7fa66..0f13cebfcd60 100644
--- a/metadata/cache/sys-devel/gcc-4.3.5
+++ b/metadata/cache/sys-devel/gcc-4.3.5
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 4.3
 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/~lv/GCC/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.3.6-r1 b/metadata/cache/sys-devel/gcc-4.3.6-r1
index 45da212d3bdf..3198a7f0ba40 100644
--- a/metadata/cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/cache/sys-devel/gcc-4.3.6-r1
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( sys-devel/autogen dev-util/dejagnu ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/flex elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3 !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 4.3
 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/~lv/GCC/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.4.2 b/metadata/cache/sys-devel/gcc-4.4.2
index dbe4c0c85792..5758632b4d5f 100644
--- a/metadata/cache/sys-devel/gcc-4.4.2
+++ b/metadata/cache/sys-devel/gcc-4.4.2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 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.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.4
 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/~lv/GCC/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -10,7 +10,7 @@ The GNU Compiler Collection
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
 build multislot nls nptl test vanilla altivec fortran nocxx bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.4.3-r3 b/metadata/cache/sys-devel/gcc-4.4.3-r3
index 4bdf81b69702..fd1d95716089 100644
--- a/metadata/cache/sys-devel/gcc-4.4.3-r3
+++ b/metadata/cache/sys-devel/gcc-4.4.3-r3
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 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.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.4
 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/~lv/GCC/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 ~alpha ~amd64 arm -hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.4.4-r2 b/metadata/cache/sys-devel/gcc-4.4.4-r2
index 1158c0172c57..0fa24a7dbe3c 100644
--- a/metadata/cache/sys-devel/gcc-4.4.4-r2
+++ b/metadata/cache/sys-devel/gcc-4.4.4-r2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 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.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.4
 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/~lv/GCC/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.4.5 b/metadata/cache/sys-devel/gcc-4.4.5
index 53ddbe504014..a08c3e9fa4ea 100644
--- a/metadata/cache/sys-devel/gcc-4.4.5
+++ b/metadata/cache/sys-devel/gcc-4.4.5
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 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.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.4
 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/~lv/GCC/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.4.6-r1 b/metadata/cache/sys-devel/gcc-4.4.6-r1
index 23364e084b70..9636d15871f0 100644
--- a/metadata/cache/sys-devel/gcc-4.4.6-r1
+++ b/metadata/cache/sys-devel/gcc-4.4.6-r1
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.4 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 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.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.4
 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/~lv/GCC/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 ~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.5.1-r1 b/metadata/cache/sys-devel/gcc-4.5.1-r1
index 7077b20c228d..fea1d1b0814d 100644
--- a/metadata/cache/sys-devel/gcc-4.5.1-r1
+++ b/metadata/cache/sys-devel/gcc-4.5.1-r1
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.8 ) lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.8 ) lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-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 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.5
 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/~lv/GCC/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp lto
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite lto
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.5.2 b/metadata/cache/sys-devel/gcc-4.5.2
index 42bcc1deabf7..94911a42ec3d 100644
--- a/metadata/cache/sys-devel/gcc-4.5.2
+++ b/metadata/cache/sys-devel/gcc-4.5.2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.8 ) lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.8 ) lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-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 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.5
 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/~lv/GCC/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp lto
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite lto
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.5.3-r1 b/metadata/cache/sys-devel/gcc-4.5.3-r1
index c8c936ea7f19..293e9eac98ab 100644
--- a/metadata/cache/sys-devel/gcc-4.5.3-r1
+++ b/metadata/cache/sys-devel/gcc-4.5.3-r1
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.8 ) lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.4 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/ppl-0.10 >=dev-libs/cloog-ppl-0.15.8 ) lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >=sys-devel/binutils-2.15.94 sys-devel/gnuconfig >=sys-apps/sed-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 lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.5
 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/~lv/GCC/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.5.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.5.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp lto
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite lto
 
->=sys-devel/gcc-config-1.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.6.0 b/metadata/cache/sys-devel/gcc-4.6.0
index 33dcc2a27155..f653103d341f 100644
--- a/metadata/cache/sys-devel/gcc-4.6.0
+++ b/metadata/cache/sys-devel/gcc-4.6.0
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 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 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 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 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-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 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.6
 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/~lv/GCC/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp go
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite go
 
->=sys-devel/gcc-config-1.4 go? ( >=sys-devel/gcc-config-1.5 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+go? ( >=sys-devel/gcc-config-1.5 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.6.1-r1 b/metadata/cache/sys-devel/gcc-4.6.1-r1
index 122ce1448199..51991edf2ff9 100644
--- a/metadata/cache/sys-devel/gcc-4.6.1-r1
+++ b/metadata/cache/sys-devel/gcc-4.6.1-r1
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 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 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 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 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-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 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.6
 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/~lv/GCC/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.6.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/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/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp go
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite go
 
->=sys-devel/gcc-config-1.4 go? ( >=sys-devel/gcc-config-1.5 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+go? ( >=sys-devel/gcc-config-1.5 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-4.6.2 b/metadata/cache/sys-devel/gcc-4.6.2
index 45ad47302f79..b9b67d724390 100644
--- a/metadata/cache/sys-devel/gcc-4.6.2
+++ b/metadata/cache/sys-devel/gcc-4.6.2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 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 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) nls? ( sys-devel/gettext ) ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( app-arch/zip app-arch/unzip )
->=sys-libs/zlib-1.1.4 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 ) !build? ( gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) nls? ( sys-devel/gettext ) ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 )
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) ) >=sys-devel/binutils-2.18 sys-devel/gnuconfig >=sys-apps/sed-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 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.10 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+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.10 )
 4.6
 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/~lv/GCC/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.6.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~lv/GCC/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 strip
@@ -8,9 +8,9 @@ GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL
 The GNU Compiler Collection
 
 eutils fixheadtails flag-o-matic gnuconfig libtool multilib portability toolchain toolchain-funcs user versionator
-build multislot nls nptl test vanilla altivec fortran nocxx nopie bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite nossp go
+build multislot nls nptl test vanilla altivec fortran nocxx nopie nossp bootstrap doc gcj gtk hardened libffi multilib objc objc-gc mudflap objc++ openmp fixed-point graphite go
 
->=sys-devel/gcc-config-1.4 go? ( >=sys-devel/gcc-config-1.5 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
+go? ( >=sys-devel/gcc-config-1.5 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.4
 
 
 
diff --git a/metadata/cache/sys-devel/gcc-apple-4.0.1_p5490-r2 b/metadata/cache/sys-devel/gcc-apple-4.0.1_p5490-r2
index c99658e2c711..cc1ffcd0cdc5 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.0.1_p5490-r2
+++ b/metadata/cache/sys-devel/gcc-apple-4.0.1_p5490-r2
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+>=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
 40
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5490.tar.gz
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.0.1_p5493 b/metadata/cache/sys-devel/gcc-apple-4.0.1_p5493
index 43c22a40267a..18b352ab6271 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.0.1_p5493
+++ b/metadata/cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+>=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
 40
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5493.tar.gz
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2
index 6c80cc50c966..fb971392286a 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_42-5566.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.1/gcc-fortran-4.2.1.tar.bz2 )
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574
index 6a5dd9110f05..681c5a565cc0 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_42-5574.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.1/gcc-fortran-4.2.1.tar.bz2 )
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646
index edb7f4cff178..848cd473f570 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5646.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.1/gcc-fortran-4.2.1.tar.bz2 )
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647
index e6b88837f452..dc41c556ce78 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5646.1.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 )
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659
index 8910f38c7179..3d7eafb44e73 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5659.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 )
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664
index 12b2fe8540cd..f0d062e42395 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 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 )
 strip
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666
index c236805ee70e..42b7955e87d9 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666
@@ -1,5 +1,5 @@
->=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=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 >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2
+>=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-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=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
 42
 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 )
 strip
diff --git a/metadata/cache/sys-devel/kgcc64-4.1.2 b/metadata/cache/sys-devel/kgcc64-4.1.2
index d85f0656c968..a88eb67e9cac 100644
--- a/metadata/cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/cache/sys-devel/kgcc64-4.1.2
@@ -1,5 +1,5 @@
-hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-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.2.1 >=dev-libs/mpfr-2.3.2
+hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+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
 4.1
 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/~lv/GCC/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.0.1.tar.bz2
 strip
diff --git a/metadata/cache/sys-devel/kgcc64-4.2.4 b/metadata/cache/sys-devel/kgcc64-4.2.4
index 7d7335b9669f..3d8e0c052bf4 100644
--- a/metadata/cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/cache/sys-devel/kgcc64-4.2.4
@@ -1,5 +1,5 @@
-hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-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.2.1 >=dev-libs/mpfr-2.3.2
+hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+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
 4.2
 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/~lv/GCC/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~eradicator/gcc/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/~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 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.0.tar.bz2
 strip
diff --git a/metadata/cache/sys-devel/llvm-3.0_rc3 b/metadata/cache/sys-devel/llvm-3.0_rc3
new file mode 100644
index 000000000000..6064cebe54a8
--- /dev/null
+++ b/metadata/cache/sys-devel/llvm-3.0_rc3
@@ -0,0 +1,22 @@
+dev-lang/perl >=sys-devel/make-3.79 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) libffi? ( dev-util/pkgconfig virtual/libffi ) ocaml? ( dev-lang/ocaml ) udis86? ( amd64? ( dev-libs/udis86[pic] ) !amd64? ( dev-libs/udis86 ) )
+dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+0
+http://llvm.org/pre-releases/3.0/rc3/llvm-3.0rc3.src.tar.gz
+
+http://llvm.org/
+UoI-NCSA
+Low Level Virtual Machine
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+eutils flag-o-matic multilib portability toolchain-funcs user
+debug +libffi multitarget ocaml test udis86 vim-syntax
+
+
+
+3
+
+compile configure install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/llvm-9999 b/metadata/cache/sys-devel/llvm-9999
index fc661305259d..5ca73e49a31c 100644
--- a/metadata/cache/sys-devel/llvm-9999
+++ b/metadata/cache/sys-devel/llvm-9999
@@ -8,7 +8,7 @@ UoI-NCSA
 Low Level Virtual Machine
 
 eutils flag-o-matic multilib portability subversion toolchain-funcs user
-debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax
+debug +libffi multitarget ocaml test udis86 vim-syntax
 
 
 
diff --git a/metadata/cache/sys-fs/udev-175 b/metadata/cache/sys-fs/udev-175
index b0b96e86b71c..4bf08841d3b9 100644
--- a/metadata/cache/sys-fs/udev-175
+++ b/metadata/cache/sys-fs/udev-175
@@ -1,8 +1,8 @@
-selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.34
+selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.34 doc? ( dev-util/gtk-doc )
 selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) acl? ( sys-apps/coreutils[acl] ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-1.12.5
 0
 http://people.freedesktop.org/~kay/udev/udev-175.tar.bz2 mirror://gentoo/udev-gentoo-scripts-5.tar.bz2
-test? ( userpriv )
+
 http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 GPL-2
 Linux dynamic and persistent device naming support (aka userspace devfs)
diff --git a/metadata/cache/sys-fs/udev-9999 b/metadata/cache/sys-fs/udev-9999
index 9e85eb109d4f..6963dcf1bd41 100644
--- a/metadata/cache/sys-fs/udev-9999
+++ b/metadata/cache/sys-fs/udev-9999
@@ -1,4 +1,4 @@
-selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.34 test? ( app-text/tree ) dev-util/gtk-doc dev-vcs/git || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.34 dev-util/gtk-doc test? ( app-text/tree ) dev-vcs/git || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl dev-libs/glib:2 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/util-linux-2.16 >=sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) acl? ( sys-apps/coreutils[acl] ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-1.12.5
 0
 
diff --git a/metadata/cache/sys-kernel/gentoo-sources-2.6.32-r37 b/metadata/cache/sys-kernel/gentoo-sources-2.6.32-r37
new file mode 100644
index 000000000000..18b65bc91c02
--- /dev/null
+++ b/metadata/cache/sys-kernel/gentoo-sources-2.6.32-r37
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+2.6.32-r37
+mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) mirror://gentoo/genpatches-2.6.32-44.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-44.extras.tar.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches
+GPL-2 !deblob? ( freedist )
+Full sources including the Gentoo patchset for the 2.6 kernel tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/rt-sources-3.0.8_p23 b/metadata/cache/sys-kernel/rt-sources-3.0.8_p23
new file mode 100644
index 000000000000..d96e31be38a2
--- /dev/null
+++ b/metadata/cache/sys-kernel/rt-sources-3.0.8_p23
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.0.8_p23
+mirror://kernel/linux/kernel/v3.x/patch-3.0.8.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) http://dev.gentoo.org/~psomas/patch-3.0.8-rt23.patch.gz
+binchecks strip
+https://tglx.de/~tglx/rt/
+GPL-2 !deblob? ( freedist )
+Real-time patchset for the Linux Kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/e2fsprogs-libs-1.41.12 b/metadata/cache/sys-libs/e2fsprogs-libs-1.41.12
index 7c8b284f1dae..4e8e6f57a4dc 100644
--- a/metadata/cache/sys-libs/e2fsprogs-libs-1.41.12
+++ b/metadata/cache/sys-libs/e2fsprogs-libs-1.41.12
@@ -1,5 +1,5 @@
 nls? ( sys-devel/gettext ) dev-util/pkgconfig
-elibc_glibc? ( >=sys-libs/glibc-2.6 ) !sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 0
 mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.41.12.tar.gz
 
@@ -8,7 +8,7 @@ GPL-2
 e2fsprogs libraries (common error and subsystem)
 alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 multilib toolchain-funcs
-nls elibc_glibc
+nls
 
 
 
diff --git a/metadata/cache/sys-libs/e2fsprogs-libs-1.41.14 b/metadata/cache/sys-libs/e2fsprogs-libs-1.41.14
index 45d0032a3c6d..1826136582ba 100644
--- a/metadata/cache/sys-libs/e2fsprogs-libs-1.41.14
+++ b/metadata/cache/sys-libs/e2fsprogs-libs-1.41.14
@@ -1,5 +1,5 @@
 nls? ( sys-devel/gettext ) dev-util/pkgconfig
-elibc_glibc? ( >=sys-libs/glibc-2.6 ) !sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 0
 mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.41.14.tar.gz
 
@@ -8,7 +8,7 @@ GPL-2
 e2fsprogs libraries (common error and subsystem)
 alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 multilib toolchain-funcs
-nls elibc_glibc
+nls
 
 
 
diff --git a/metadata/cache/sys-libs/e2fsprogs-libs-1.41.7 b/metadata/cache/sys-libs/e2fsprogs-libs-1.41.7
index f63fc27480b2..da763a35d665 100644
--- a/metadata/cache/sys-libs/e2fsprogs-libs-1.41.7
+++ b/metadata/cache/sys-libs/e2fsprogs-libs-1.41.7
@@ -1,5 +1,5 @@
 nls? ( sys-devel/gettext ) dev-util/pkgconfig
-elibc_glibc? ( >=sys-libs/glibc-2.6 ) !sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41
+!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41
 0
 mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.41.7.tar.gz
 
@@ -8,7 +8,7 @@ GPL-2
 e2fsprogs libraries (common error, subsystem, uuid, block id)
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils flag-o-matic multilib portability toolchain-funcs user
-nls elibc_glibc
+nls
 
 
 
diff --git a/metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702 b/metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702
index c1dda304a2da..7e5336437316 100644
--- a/metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702
+++ b/metadata/cache/sys-libs/e2fsprogs-libs-1.42_pre0702
@@ -1,5 +1,5 @@
 nls? ( sys-devel/gettext ) dev-util/pkgconfig
-elibc_glibc? ( >=sys-libs/glibc-2.6 ) !sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
+!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 0
 mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42-WIP-0702.tar.gz
 
@@ -8,7 +8,7 @@ GPL-2
 e2fsprogs libraries (common error and subsystem)
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 multilib toolchain-funcs
-nls elibc_glibc
+nls
 
 
 
diff --git a/metadata/cache/www-client/chromium-16.0.912.15 b/metadata/cache/www-client/chromium-16.0.912.32
similarity index 96%
rename from metadata/cache/www-client/chromium-16.0.912.15
rename to metadata/cache/www-client/chromium-16.0.912.32
index 57f90d37f160..f464555beb9c 100644
--- a/metadata/cache/www-client/chromium-16.0.912.15
+++ b/metadata/cache/www-client/chromium-16.0.912.32
@@ -1,7 +1,7 @@
 app-arch/bzip2 >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libgcrypt dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex >=net-print/cups-1.3.11 pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) dev-lang/nacl-toolchain-newlib dev-lang/perl dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 app-arch/bzip2 >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libgcrypt dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex >=net-print/cups-1.3.11 pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-16.0.912.15.tar.bz2
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-16.0.912.32.tar.bz2
 
 http://chromium.org/
 BSD
@@ -14,7 +14,7 @@ bindist gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg
 
 4
 
-compile configure install postinst postrm preinst prepare pretend setup test
+compile configure install postinst postrm preinst prepare setup test
 
 
 
diff --git a/metadata/cache/www-client/chromium-9999-r1 b/metadata/cache/www-client/chromium-9999-r1
index 22752cd7b199..658a286a215c 100644
--- a/metadata/cache/www-client/chromium-9999-r1
+++ b/metadata/cache/www-client/chromium-9999-r1
@@ -1,5 +1,5 @@
-app-arch/bzip2 >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libgcrypt dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex >=net-print/cups-1.3.11 pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) dev-lang/nacl-toolchain-newlib dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libgcrypt dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex >=net-print/cups-1.3.11 pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-arch/bzip2 >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) dev-lang/nacl-toolchain-newlib dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 live
 
 
@@ -8,7 +8,7 @@ BSD
 Open-source version of Google Chrome web browser
 
 eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python subversion toolchain-funcs user versionator virtualx
-bindist gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
+bindist cups gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
 
 
 
diff --git a/metadata/cache/www-client/google-chrome-16.0.912.21_beta108057 b/metadata/cache/www-client/google-chrome-16.0.912.32_beta108990
similarity index 92%
rename from metadata/cache/www-client/google-chrome-16.0.912.21_beta108057
rename to metadata/cache/www-client/google-chrome-16.0.912.32_beta108990
index 4d19c816370c..79276cc48df7 100644
--- a/metadata/cache/www-client/google-chrome-16.0.912.21_beta108057
+++ b/metadata/cache/www-client/google-chrome-16.0.912.32_beta108990
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4
 app-arch/bzip2 app-misc/ca-certificates media-libs/alsa-lib dev-libs/atk dev-libs/dbus-glib dev-libs/expat dev-libs/glib:2 dev-libs/libxslt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype net-print/cups media-libs/libpng:1.2 sys-apps/dbus >=sys-devel/gcc-4.4.0[-nocxx] sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXrender x11-libs/libXext x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:stable !www-client/google-chrome:unstable
 beta
-amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_16.0.912.21-r108057_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_16.0.912.21-r108057_i386.deb )
+amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_16.0.912.32-r108990_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_16.0.912.32-r108990_i386.deb )
 mirror strip
 http://www.google.com/chrome
 google-chrome
diff --git a/metadata/cache/www-client/opera-11.60.1147 b/metadata/cache/www-client/opera-11.60.1147
new file mode 100644
index 000000000000..ccc89f2f4b03
--- /dev/null
+++ b/metadata/cache/www-client/opera-11.60.1147
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+0
+amd64? ( http://snapshot.opera.com/unix/betarc1_11.60-1147/opera-11.60-1147.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/betarc1_11.60-1147/opera-11.60-1147.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/betarc1_11.60-1147/opera-11.60-1147.i386.freebsd.tar.xz )
+
+http://www.opera.com/
+OPERA-11 LGPL-2 LGPL-3
+A fast and secure web browser and Internet suite
+~amd64 ~x86 ~x86-fbsd
+eutils fdo-mime gnome2-utils multilib pax-utils portability toolchain-funcs user versionator
+elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+4
+
+install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/surfraw-2.2.8 b/metadata/cache/www-client/surfraw-2.2.8
index cc9972cb2a49..00b6f20314af 100644
--- a/metadata/cache/www-client/surfraw-2.2.8
+++ b/metadata/cache/www-client/surfraw-2.2.8
@@ -6,7 +6,7 @@ test
 http://surfraw.alioth.debian.org/
 public-domain
 A fast unix command line interface to WWW
-amd64 ~hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+amd64 hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 bash-completion-r1 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/x11-misc/screen-message-0.19 b/metadata/cache/x11-misc/screen-message-0.19
new file mode 100644
index 000000000000..ee27b31449ec
--- /dev/null
+++ b/metadata/cache/x11-misc/screen-message-0.19
@@ -0,0 +1,22 @@
+>=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.16
+>=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.16
+0
+mirror://debian/pool/main/s/screen-message/screen-message_0.19.orig.tar.gz
+
+http://www.joachim-breitner.de/blog/archives/249-screen-message-uploaded-to-Debian.html
+|| ( GPL-2 GPL-3 )
+Display a multi-line message large, fullscreen, black on white
+~amd64 ~x86
+
+
+
+
+
+2
+
+install
+
+
+
+
+
diff --git a/metadata/cache/xfce-extra/xfce4-weather-plugin-0.7.4-r1 b/metadata/cache/xfce-extra/xfce4-weather-plugin-0.7.4-r1
new file mode 100644
index 000000000000..1e9535927716
--- /dev/null
+++ b/metadata/cache/xfce-extra/xfce4-weather-plugin-0.7.4-r1
@@ -0,0 +1,22 @@
+>=x11-libs/gtk+-2.6:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=dev-libs/libxml2-2.4 dev-util/intltool dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.6:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=dev-libs/libxml2-2.4
+0
+mirror://xfce/src/panel-plugins/xfce4-weather-plugin/0.7/xfce4-weather-plugin-0.7.4.tar.bz2
+
+http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
+GPL-2
+A weather plug-in for the Xfce desktop environment
+~amd64 ~x86
+autotools base eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user xfconf
+debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 160a6475c9ca..c3b041c586c1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 09 Nov 2011 01:06:46 +0000
+Thu, 10 Nov 2011 01:06:46 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 160a6475c9ca..553e4fe79c9a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 09 Nov 2011 01:06:46 +0000
+Thu, 10 Nov 2011 01:06:47 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 11d9f6e4b6a0..00c6830056ee 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 09 Nov 2011 01:06:48 +0000
+Thu, 10 Nov 2011 01:06:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4f67f8022864..2ddfb3f39d62 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov  9 01:06:46 UTC 2011
+Thu Nov 10 01:06:46 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e8531bd7ebf8..d63668c82b1d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 09 Nov 2011 01:30:01 +0000
+Thu, 10 Nov 2011 01:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f9c48363fc87..a19726df6802 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1320800701 Wed Nov  9 01:05:01 2011 UTC
+1320887101 Thu Nov 10 01:05:01 2011 UTC
diff --git a/net-dns/c-ares/c-ares-1.7.4.ebuild b/net-dns/c-ares/c-ares-1.7.4.ebuild
index 9ae065d988ed..85a547c8326f 100644
--- a/net-dns/c-ares/c-ares-1.7.4.ebuild
+++ b/net-dns/c-ares/c-ares-1.7.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.7.4.ebuild,v 1.6 2011/07/24 11:26:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.7.4.ebuild,v 1.7 2011/11/09 20:08:44 vapier Exp $
 
 EAPI="2"
 
 DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://daniel.haxx.se/projects/c-ares/"
-SRC_URI="http://daniel.haxx.se/projects/c-ares/${P}.tar.gz"
+HOMEPAGE="http://c-ares.haxx.se/"
+SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index fca83f20c0cd..7d62d8cd8d56 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -2,3 +2,4 @@ DIST dnsmasq-2.52.tar.lzma 304860 RMD160 38e05bfd746d618c0ac51ae245540b008474bde
 DIST dnsmasq-2.55.tar.lzma 320116 RMD160 2e6f623da3f453a2c6086dc80315a9308a4245ef SHA1 0bd62b3846bad2ed5e243b1b8aae59c2e0e20da5 SHA256 ae36d8031640b3202d196170025ee13e6d9240cb6d523a2a3e4f7ab1289e1473
 DIST dnsmasq-2.56.tar.lzma 331543 RMD160 448787766684dc354582423e234825c808df557f SHA1 f6e6f488798c5b0d84698abf4801f922ff78e36c SHA256 36341d2534801cae3463489b79d912f9db8b5dbf5527efd69821a7984def2c33
 DIST dnsmasq-2.57.tar.lzma 333348 RMD160 e78d2f87804e88b2021da3c593191338d0deaed4 SHA1 cbf0c22a7b856746b23f2d894070c60d32c4a97e SHA256 b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d
+DIST dnsmasq-2.59.tar.lzma 340720 RMD160 ca7b841d97e0ef7ab5a8c2c099ecb79de28633b3 SHA1 41de5a8187210d7473a084c27526d47853c2017f SHA256 3bba1f637d04145e756ffc31a5076961a0aaf4716d097fa0d4a9a24dc8869391
diff --git a/net-dns/dnsmasq/dnsmasq-2.59.ebuild b/net-dns/dnsmasq/dnsmasq-2.59.ebuild
new file mode 100644
index 000000000000..b445a7a73556
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.59.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild,v 1.1 2011/11/09 01:32:08 chutzpah Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_/}"
+MY_PV="${PV/_/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="conntrack dbus +dhcp idn ipv6 nls tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	idn? ( net-dns/libidn )
+	conntrack? ( net-libs/libnetfilter_conntrack )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
+}
+
+src_configure() {
+	COPTS=""
+	use conntrack && COPTS+=" -DHAVE_CONNTRACK"
+	use tftp || COPTS+=" -DNO_TFTP"
+	use dhcp || COPTS+=" -DNO_DHCP"
+	use ipv6 || COPTS+=" -DNO_IPV6"
+	use dbus && COPTS+=" -DHAVE_DBUS"
+	use idn  && COPTS+=" -DHAVE_IDN"
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		COPTS="${COPTS}" \
+		all$(use nls && echo "-i18n")
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n")
+
+	dodoc CHANGELOG FAQ
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r1 dnsmasq
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+}
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r1 b/net-dns/dnsmasq/files/dnsmasq-init-r1
new file mode 100644
index 000000000000..bb3f3c0a8366
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-init-r1
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init-r1,v 1.1 2011/11/09 01:32:08 chutzpah Exp $
+
+extra_commands="reload"
+
+depend() {
+	provide dns
+	need localmount net
+	after bootmisc
+	use logger
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dnsmasq \
+	    --pidfile /var/run/dnsmasq.pid \
+	    -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dnsmasq \
+	    --pidfile /var/run/dnsmasq.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	if ! service_started "${SVCNAME}" ; then
+	    eend 1 "${SVCNAME} is not started"
+	    return 1
+	fi
+	start-stop-daemon --stop --oknodo --signal HUP \
+	    --exec /usr/sbin/dnsmasq --pidfile /var/run/dnsmasq.pid
+	eend $?
+}
diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index bbe15b456234..1e40ae7bd4de 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -8,6 +8,7 @@
 <use>
 	<flag name='dhcp'>Enable support for reading ISC DHCPd lease files</flag>
 	<flag name='tftp'>Enables built in TFTP server for netbooting</flag>
+	<flag name='conntrack'>Add support for Linux conntrack connection marking.</flag>
 </use>
 </pkgmetadata>
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index fdc07127352b..964b39386be4 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,2 +1,3 @@
 DIST FileZilla_3.3.4.1_src.tar.bz2 3231505 RMD160 d863f90f8944a66c7d316470cd2affaec1e6b930 SHA1 0b6ce2b46480dc64d959dced54dcc1eaaa08e82a SHA256 2843ab4c89743cfecc5418f9ede1d20147f30cb38e97b148657a7f81c2147185
 DIST FileZilla_3.5.1_src.tar.bz2 3364243 RMD160 6f5c7e9db07cb1b5cc43de194f35a032a6f966b8 SHA1 e4b2048cf8740e05cfff8e444a9059f79784e3f6 SHA256 62abc6a7ced8e92a2a557c58935c773d656bd211aa937313f435a0d4b763ab05
+DIST FileZilla_3.5.2_src.tar.bz2 3363064 RMD160 7f6c5cb6ce89522c923cbfe3309605c4e914ff6a SHA1 a3169625510a04914a790c9d1d960bc34a005847 SHA256 e403f8c3f72f7e2c7f7be5584142b1244f9b6d496246676fef8a22243a1190f0
diff --git a/net-ftp/filezilla/filezilla-3.5.2.ebuild b/net-ftp/filezilla/filezilla-3.5.2.ebuild
new file mode 100644
index 000000000000..c1ceab80f9bb
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.5.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.5.2.ebuild,v 1.1 2011/11/09 16:56:46 voyageur Exp $
+
+EAPI=2
+
+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-2.8.3
+	>=x11-libs/wxGTK-2.8.9:2.8[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	dev-util/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-flags -DTIXML_USE_STL
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=system \
+		--disable-autoupdatecheck || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
+
+	dodoc AUTHORS ChangeLog NEWS
+}
diff --git a/net-irc/unrealircd/files/unrealircd-3.2.9-disabled-stacked-extbans.patch b/net-irc/unrealircd/files/unrealircd-3.2.9-disabled-stacked-extbans.patch
new file mode 100644
index 000000000000..447f674e00ac
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd-3.2.9-disabled-stacked-extbans.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+# Date 1320859299 0
+# Node ID 110ba58ecd56ad5debb00726e5e3ca8d5df135bf
+# Parent  a673dd0f7b377ec35ce26fffc4affc9c7563c7b1
+- Fix compilation issue when disabling stacked extbans. https://bugs.gentoo.org/389949
+
+diff -r a673dd0f7b37 -r 110ba58ecd56 Changes
+diff -r a673dd0f7b37 -r 110ba58ecd56 src/extbans.c
+--- a/src/extbans.c	Wed Nov 09 17:16:55 2011 +0000
++++ b/src/extbans.c	Wed Nov 09 17:21:39 2011 +0000
+@@ -533,9 +533,9 @@
+ 	req.conv_param = extban_conv_param_nuh;
+ #else
+ 	req.conv_param = extban_conv_param_nuh_or_extban;
++	req.is_ok = extban_is_ok_nuh_extban;
+ #endif
+ 	req.is_banned = extban_modej_is_banned;
+-	req.is_ok = extban_is_ok_nuh_extban;
+ 	req.options = EXTBOPT_ACTMODIFIER;
+ 	ExtbanAdd(NULL, req);
+ 
diff --git a/net-irc/unrealircd/unrealircd-3.2.9.ebuild b/net-irc/unrealircd/unrealircd-3.2.9.ebuild
index 2f062326eac9..958bb944674e 100644
--- a/net-irc/unrealircd/unrealircd-3.2.9.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9.ebuild,v 1.1 2011/11/06 02:58:47 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9.ebuild,v 1.2 2011/11/09 18:13:51 binki Exp $
 
 EAPI=4
 
@@ -34,6 +34,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-disabled-stacked-extbans.patch
+
 	# QA check against bundled pkgs
 	rm extras/*.gz || die
 
diff --git a/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild b/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
index ed80ed6b5e20..461dcb5a43c8 100644
--- a/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild,v 1.1 2011/07/27 12:41:19 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild,v 1.2 2011/11/09 18:13:51 binki Exp $
 
 EAPI=4
 
-inherit eutils autotools ssl-cert versionator multilib
+inherit eutils ssl-cert versionator multilib
 
 MY_P=Unreal${PV/_/-}
 
@@ -34,6 +34,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.9-disabled-stacked-extbans.patch
+
 	# QA check against bundled pkgs
 	rm extras/*.gz || die
 
diff --git a/net-libs/libkvkontakte/Manifest b/net-libs/libkvkontakte/Manifest
index 5d5984e85043..756acf6afb79 100644
--- a/net-libs/libkvkontakte/Manifest
+++ b/net-libs/libkvkontakte/Manifest
@@ -1,2 +1,2 @@
-DIST digikam-2.1.0.tar.bz2 53911470 RMD160 034f967a851f6cd748beb0c05e5fbe7d91526fe1 SHA1 4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7 SHA256 33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
 DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
+DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch b/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch
deleted file mode 100644
index 6c48a5f0ea8a..000000000000
--- a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN digikam-2.1.0.orig/extra/libkvkontakte/libkvkontakte/CMakeLists.txt digikam-2.1.0/extra/libkvkontakte/libkvkontakte/CMakeLists.txt
---- digikam-2.1.0.orig/extra/libkvkontakte/libkvkontakte/CMakeLists.txt	2011-09-07 11:45:12.000000000 +0200
-+++ digikam-2.1.0/extra/libkvkontakte/libkvkontakte/CMakeLists.txt	2011-09-09 21:08:31.052194279 +0200
-@@ -65,9 +65,7 @@
- 
- install(TARGETS kvkontakte
- 	EXPORT LibKVkontakteExport
--	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
--	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
--	RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
-+	${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/version.h
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch b/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch
deleted file mode 100644
index 90a2f8cb89b8..000000000000
--- a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN digikam-2.1.0.orig/extra/libkvkontakte/CMakeLists.txt digikam-2.1.0/extra/libkvkontakte/CMakeLists.txt
---- digikam-2.1.0.orig/extra/libkvkontakte/CMakeLists.txt	2011-09-07 11:45:12.000000000 +0200
-+++ digikam-2.1.0/extra/libkvkontakte/CMakeLists.txt	2011-09-09 21:19:34.114194182 +0200
-@@ -11,11 +11,6 @@
- # TODO: calculate the version id properly (here is currently a hack that won't work for 1.10.0):
- set(LIBKVKONTAKTE_VERSION_ID "0x0${LIBKVKONTAKTE_VERSION_MAJOR}0${LIBKVKONTAKTE_VERSION_MINOR}0${LIBKVKONTAKTE_VERSION_PATCH}")
- 
--# set up install directories. INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR must not be absolute paths
--set(LIB_INSTALL_DIR_SUFFIX "" CACHE STRING "The directories where to install libraries to")
--set(LIB_INSTALL_DIR lib${LIB_INSTALL_DIR_SUFFIX} )
--set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
--
- # Use a versioned install directory for the headers so multiple versions can be installed in parallel
- set(INCLUDE_INSTALL_DIR include )
- 
-@@ -29,6 +24,8 @@
- include(KDE4Defaults)
- include(MacroLibrary)
- 
-+set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
-+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
- 
- set(QJSON_VERSION_REQUIRED 0.7)
diff --git a/net-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild
similarity index 82%
rename from net-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild
rename to net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild
index 73f7345b10bc..1d7e509f74b6 100644
--- a/net-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild,v 1.1 2011/09/09 19:22:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild,v 1.1 2011/11/09 02:49:24 dilfridge Exp $
 
 EAPI=4
 
@@ -29,10 +29,7 @@ RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}/extra/${PN}
 
-PATCHES=(
-	"${FILESDIR}/${P}-libsuffix.patch"
-	"${FILESDIR}/${P}-definstall.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-libdir.patch" )
 
 src_configure() {
 	mycmakeargs=(
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f143e031c8d3..fe3f2a28571a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,2 +1,3 @@
 DIST node-v0.4.11.tar.gz 12419274 RMD160 0512138fbf05d472a42bfa5453c5dd851c06c716 SHA1 ea0898745094cf771b2860d90629ec867734be52 SHA256 e009522d52c4a844c46e51c63b852899d1b7e6d949d1a139cdc16b4f6c4ab63f
 DIST node-v0.4.12.tar.gz 12421469 RMD160 3861afdcbe49516c018fa0d5a5416b15a10b8f05 SHA1 1c6e34b90ad6b989658ee85e0d0cb16797b16460 SHA256 c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4
+DIST node-v0.6.0.tar.gz 9242110 RMD160 9dcfb94a55352b72efc10cfa078a9047ee4e610f SHA1 731bb2d5d8235470e5e14d71549c082eba5a5b66 SHA256 1b6a34b6f2099145c44a0c20d3a5cab7c9ec063de1a195ddeda61ad55d601d7f
diff --git a/net-libs/nodejs/nodejs-0.6.0.ebuild b/net-libs/nodejs/nodejs-0.6.0.ebuild
new file mode 100644
index 000000000000..e8414405e96f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.6.0.ebuild,v 1.1 2011/11/09 19:08:47 patrick Exp $
+
+EAPI="2"
+
+inherit eutils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.5.10.22
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+src_configure() {
+	# this is a waf confuserator
+	./configure --shared-v8 --prefix=/usr || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
+
+src_test() {
+	emake test || die
+}
diff --git a/net-libs/telepathy-farsight/Manifest b/net-libs/telepathy-farsight/Manifest
index f36212d09acc..0fc578028ff0 100644
--- a/net-libs/telepathy-farsight/Manifest
+++ b/net-libs/telepathy-farsight/Manifest
@@ -1,3 +1,4 @@
 DIST telepathy-farsight-0.0.15.tar.gz 555835 RMD160 376da9dd5d1d34121671e16b9a7acd0ee751d718 SHA1 20217842746c0507f2f1fe42a6bd613422a738cf SHA256 3dc3d9cdb43fb9ef772d16917e50e3cc95f71b1585d26d740f3148f4fdb6eb0f
 DIST telepathy-farsight-0.0.16.tar.gz 563212 RMD160 6a97fbeda0049ae3ee6d02f08f3e3749bc5ed391 SHA1 afef272f032ae40f3de75e5ebc7dbef5bfafdd33 SHA256 b8dfde94061be6d31accc27d37a38eee4f543dc954fe30671cf8215a27edd9be
 DIST telepathy-farsight-0.0.17.tar.gz 567010 RMD160 d1d1c62cc63a1aba069ce7127b325371ca1db3d8 SHA1 774c086a5d84a0efb27b369373c2ccfa6f31a2b9 SHA256 f6cca23be605f2d384f0669fb565f9d854d2ea9083df57b8db328a76d285808d
+DIST telepathy-farsight-0.0.19.tar.gz 585743 RMD160 ab10a100e9c2178439f8aa87c66d76f3664ed8f0 SHA1 15357e24346c6a67f9d3c609184367babc0f0019 SHA256 2c89b8b259f91df33f93703eab1de493b193b163c32facb532ec2710b8f05269
diff --git a/net-libs/telepathy-farsight/telepathy-farsight-0.0.19.ebuild b/net-libs/telepathy-farsight/telepathy-farsight-0.0.19.ebuild
new file mode 100644
index 000000000000..33211628b0bc
--- /dev/null
+++ b/net-libs/telepathy-farsight/telepathy-farsight-0.0.19.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-farsight/telepathy-farsight-0.0.19.ebuild,v 1.1 2011/11/09 09:54:43 ford_prefect Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit python
+
+DESCRIPTION="Farsight connection manager for the Telepathy framework"
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+IUSE="python"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.60
+	>=net-libs/telepathy-glib-0.14.3
+	>=net-libs/farsight2-0.0.29
+	python? (
+		>=dev-python/pygobject-2.12.0:2
+		>=dev-python/gst-python-0.10.10 )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use python; then
+		python_convert_shebangs -r 2 .
+	fi
+}
+
+src_configure() {
+	econf $(use_enable python) --disable-static
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	python_clean_installation_image
+	dodoc NEWS ChangeLog || die
+}
diff --git a/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff b/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff
new file mode 100644
index 000000000000..86c85bcaa27c
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff
@@ -0,0 +1,224 @@
+http://openwall.info/wiki/people/segoon/ping
+
+--- iputils-s20101006/ping.c
++++ iputils-s20101006/ping.c
+@@ -88,6 +88,7 @@ struct sockaddr_in whereto;	/* who to pi
+ int optlen = 0;
+ int settos = 0;			/* Set TOS, Precendence or other QOS options */
+ int icmp_sock;			/* socket file descriptor */
++int using_ping_socket = 0;
+ u_char outpack[0x10000];
+ int maxpacket = sizeof(outpack);
+ 
+@@ -123,7 +124,11 @@ main(int argc, char **argv)
+ 	char *target, hnamebuf[MAX_HOSTNAMELEN];
+ 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
+ 
+-	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
++	icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
++	if (icmp_sock != -1)
++		using_ping_socket = 1;
++	else
++		icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+ 	socket_errno = errno;
+ 
+ 	uid = getuid();
+@@ -377,13 +382,35 @@ main(int argc, char **argv)
+ 		}
+ 	}
+ 
+-	if ((options&F_STRICTSOURCE) &&
+-	    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
+-		perror("bind");
+-		exit(2);
++	if (!using_ping_socket) {
++		if ((options&F_STRICTSOURCE) &&
++		    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
++			perror("bind");
++			exit(2);
++		}
++	} else {
++		struct sockaddr_in sa;
++		socklen_t sl;
++
++		sa.sin_family = AF_INET;
++		sa.sin_port = 0;
++		sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
++			source.sin_addr.s_addr : 0;
++		sl = sizeof(sa);
++
++		if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
++			perror("bind");
++			exit(2);
++		}
++
++		if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
++			perror("getsockname");
++			exit(2);
++		}
++		ident = sa.sin_port;
+ 	}
+ 
+-	if (1) {
++	if (!using_ping_socket) {
+ 		struct icmp_filter filt;
+ 		filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
+ 			      (1<<ICMP_DEST_UNREACH)|
+@@ -398,6 +425,12 @@ main(int argc, char **argv)
+ 	hold = 1;
+ 	if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
+ 		fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
++	if (using_ping_socket) {
++		if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
++			perror("WARNING: setsockopt(IP_RECVTTL)");
++		if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
++			perror("WARNING: setsockopt(IP_RETOPTS)");
++	}
+ 
+ 	/* record route option */
+ 	if (options & F_RROUTE) {
+@@ -566,6 +599,7 @@ int receive_error_msg()
+ 		nerrors++;
+ 	} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
+ 		struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
++		int error_pkt;
+ 
+ 		if (res < sizeof(icmph) ||
+ 		    target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
+@@ -576,9 +610,18 @@ int receive_error_msg()
+ 			goto out;
+ 		}
+ 
+-		acknowledge(ntohs(icmph.un.echo.sequence));
++		error_pkt = (e->ee_type != ICMP_REDIRECT &&
++			     e->ee_type != ICMP_SOURCE_QUENCH);
++		if (error_pkt) {
++			acknowledge(ntohs(icmph.un.echo.sequence));
++			net_errors++;
++			nerrors++;
++		}
++		else {
++			saved_errno = 0;
++		}
+ 
+-		if (!working_recverr) {
++		if (!using_ping_socket && !working_recverr) {
+ 			struct icmp_filter filt;
+ 			working_recverr = 1;
+ 			/* OK, it works. Add stronger filter. */
+@@ -589,15 +632,14 @@ int receive_error_msg()
+ 				perror("\rWARNING: setsockopt(ICMP_FILTER)");
+ 		}
+ 
+-		net_errors++;
+-		nerrors++;
+ 		if (options & F_QUIET)
+ 			goto out;
+ 		if (options & F_FLOOD) {
+-			write(STDOUT_FILENO, "\bE", 2);
++			if (error_pkt)
++				write(STDOUT_FILENO, "\bE", 2);
+ 		} else {
+ 			print_timestamp();
+-			printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
++			printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
+ 			pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
+ 			fflush(stdout);
+ 		}
+@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, 
+ 	struct iphdr *ip;
+ 	int hlen;
+ 	int csfailed;
++	struct cmsghdr *cmsg;
++	int ttl;
++	__u8 *opts;
++	int optlen;
+ 
+ 	/* Check the IP header */
+ 	ip = (struct iphdr *)buf;
+-	hlen = ip->ihl*4;
+-	if (cc < hlen + 8 || ip->ihl < 5) {
+-		if (options & F_VERBOSE)
+-			fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
+-				pr_addr(from->sin_addr.s_addr));
+-		return 1;
++	if (!using_ping_socket) {
++		hlen = ip->ihl*4;
++		if (cc < hlen + 8 || ip->ihl < 5) {
++			if (options & F_VERBOSE)
++				fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
++					pr_addr(from->sin_addr.s_addr));
++			return 1;
++		}
++		ttl = ip->ttl;
++		opts = buf + sizeof(struct iphdr);
++		optlen = hlen - sizeof(struct iphdr);
++	} else {
++		hlen = 0;
++		ttl = 0;
++		opts = buf;
++		optlen = 0;
++		for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
++			if (cmsg->cmsg_level != SOL_IP)
++				continue;
++			if (cmsg->cmsg_type == IP_TTL) {
++				if (cmsg->cmsg_len < sizeof(int))
++					continue;
++				ttl = *(int *) CMSG_DATA(cmsg);
++			} else if (cmsg->cmsg_type == IP_RETOPTS) {
++				opts = (__u8 *) CMSG_DATA(cmsg);
++				optlen = cmsg->cmsg_len;
++			}
++		}
+ 	}
+ 
+ 	/* Now the ICMP part */
+@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, 
+ 			return 1;			/* 'Twas not our ECHO */
+ 		if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
+ 				      ntohs(icp->un.echo.sequence),
+-				      ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
++				      ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
+ 				      pr_echo_reply))
+ 			return 0;
+ 	} else {
+@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, 
+ 	}
+ 
+ 	if (!(options & F_FLOOD)) {
+-		pr_options(buf + sizeof(struct iphdr), hlen);
++		pr_options(opts, optlen + sizeof(struct iphdr));
+ 
+ 		if (options & F_AUDIBLE)
+ 			putchar('\a');
+@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
+ 			printf("Redirect, Bad Code: %d", code);
+ 			break;
+ 		}
+-		if (icp)
+-			printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
++		printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
+ 		if (icp && (options & F_VERBOSE))
+ 			pr_iph((struct iphdr*)(icp + 1));
+ 		break;
+@@ -1217,7 +1284,7 @@ void install_filter(void)
+ 		insns
+ 	};
+ 
+-	if (once)
++	if (once || using_ping_socket)
+ 		return;
+ 	once = 1;
+ 
+--- iputils-s20101006/ping_common.c
++++ iputils-s20101006/ping_common.c
+@@ -515,7 +515,8 @@ void setup(int icmp_sock)
+ 			*p++ = i;
+ 	}
+ 
+-	ident = htons(getpid() & 0xFFFF);
++	if (!ident)
++		ident = htons(getpid() & 0xFFFF);
+ 
+ 	set_signal(SIGINT, sigexit);
+ 	set_signal(SIGALRM, sigexit);
diff --git a/net-misc/iputils/iputils-20101006-r2.ebuild b/net-misc/iputils/iputils-20101006-r2.ebuild
new file mode 100644
index 000000000000..ace5a8c68d57
--- /dev/null
+++ b/net-misc/iputils/iputils-20101006-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20101006-r2.ebuild,v 1.1 2011/11/09 22:34:11 vapier Exp $
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+
+EAPI="2"
+
+inherit flag-o-matic eutils toolchain-funcs
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
+	inherit git-2
+else
+	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
+		mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
+
+RDEPEND="!net-misc/rarpd
+	ssl? ( dev-libs/openssl )
+	idn? ( net-dns/libidn )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+S=${WORKDIR}/${PN}-s${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
+	epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
+	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
+	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
+	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
+	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
+	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
+	epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
+	epatch "${FILESDIR}"/${PN}-20101006-owl-pingsock.diff
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+	use static && append-ldflags -static
+	use ssl && append-cppflags -DHAVE_OPENSSL
+	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
+	export IDN=$(use idn && echo yes)
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake -j1 html man || die
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping || die
+	use ipv6 && dobin ping6
+	dosbin arping || die
+	into /usr
+	dosbin tracepath || die
+	use ipv6 && dosbin trace{path,route}6
+	dosbin clockdiff rarpd rdisc ipg tftpd || die
+
+	fperms 4711 /bin/ping
+	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
+
+	dodoc INSTALL RELNOTES
+	use ipv6 \
+		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
+		|| rm -f doc/*6.8
+	rm -f doc/setkey.8
+	doman doc/*.8
+
+	use doc && dohtml doc/*.html
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 44546cfe1ed8..5207736b8d17 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.5 2011/09/21 09:01:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.6 2011/11/09 22:34:11 vapier Exp $
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
@@ -53,6 +53,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
 	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
 	epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
+	epatch "${FILESDIR}"/${PN}-20101006-owl-pingsock.diff
 	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
 	use static && append-ldflags -static
 	use ssl && append-cppflags -DHAVE_OPENSSL
diff --git a/net-misc/openswan/openswan-2.6.37.ebuild b/net-misc/openswan/openswan-2.6.37.ebuild
index c60e004824cf..d594372af6cc 100644
--- a/net-misc/openswan/openswan-2.6.37.ebuild
+++ b/net-misc/openswan/openswan-2.6.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37.ebuild,v 1.1 2011/11/07 21:56:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37.ebuild,v 1.2 2011/11/09 13:51:58 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss"
 
 RESTRICT="test" # requires user mode linux setup
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 778a1563f738..e393c88fae7d 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.70 2011/11/02 16:30:14 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.71 2011/11/09 01:31:23 chutzpah Exp $
+
+# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
+# mask conntrack USE flag for dnsmasq as dep is not keyworded
+net-dns/dnsmasq conntrack
 
 # Tobias Klausmann <klausman@gentoo.org> (02 Nov 2011)
 # libpcre jit is not supported on alpha
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 5eea3ef32618..a6d95c999e6e 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.64 2011/11/03 18:25:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.65 2011/11/09 01:31:23 chutzpah Exp $
+
+# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
+# mask conntrack USE flag for dnsmasq as dep is not keyworded
+net-dns/dnsmasq conntrack
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (03 Nov 2011)
 # Missing keywords in gst-plugins-{faac,lame,speex,twolame}, bug #389433
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index 72c5464804bf..b9b2834f782c 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/64ul/package.use.mask,v 1.14 2011/08/10 15:29:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/64ul/package.use.mask,v 1.15 2011/11/09 01:31:23 chutzpah Exp $
+
+# Patrick McLean <chutzpah@gentoo.org> (08 Nov 2011)
+# mask conntrack USE flag for dnsmasq as dep is not keyworded
+net-dns/dnsmasq conntrack
 
 # Brent Baude <ranger@gentoo.org> (06 Jan 2010)
 # masking toolame for mplayer bug 280281
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 91d84c436411..7a6f74e660d0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.280 2011/10/31 05:33:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.281 2011/11/09 08:53:18 xarthisius Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Kacper Kowalik <xarthisius@gentoo.org> (9 Nov 2011)
+# pathdb works only as a SIGSEGV generator, mask until upstream
+# fixes it bug #385683
+dev-lang/path64 debugger
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Oct 2011)
 # Let's not suddenly enable clutter on stable evolution versions
 <mail-client/evolution-3 clutter
diff --git a/profiles/package.mask b/profiles/package.mask
index 54a5d692a508..186b5b684b63 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13216 2011/11/08 15:59:03 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13220 2011/11/09 19:03:55 scarabeus Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Bernard Cafarelli <voyageur@gentoo.org> (9 Nov 2011)
+# Mask release candidates
+=sys-devel/llvm-3.0_rc*
+=sys-devel/clang-3.0_rc*
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (8 Nov 2011)
+# Dead project, and has started crashing KDE apps, see bug 388261 and
+# the comments on its homepage. Masked for lastriting
+x11-themes/polyester
+
 # Nathan Phillip Brink <binki@gentoo.org> (8 Nov 2011)
 # Masking alpha release series.
 >=net-irc/atheme-services-7.0.0_alpha1
@@ -141,10 +151,6 @@ games-strategy/dark-oberon
 # Mask for testing
 >=sys-devel/distcc-3.2_rc1
 
-# Tomáš Chvátal <scarabeus@gentoo.org> (25 Oct 2011)
-# Mask the RC unless it is declared as release.
-~app-office/libreoffice-3.4.4.2
-
 # Stefan Briesenick <sbriesen@gentoo.org> (20 Oct 2011)
 # unmaintained upstream, obsolete in general. (bug #337657)
 # Masked for removal on 20 Nov 2011
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 67d07a87eed4..b60eaeb902fa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2169,6 +2169,7 @@ media-gfx/blender:verse - Adds verse clustering features to Blender.
 media-gfx/brlcad:benchmarks - Run benchmarks during test phase (need test option enabled)
 media-gfx/comix:rar - Pulls app-arch/unrar for rar file support
 media-gfx/darktable:flickr - Add support for uploading photos to flickr
+media-gfx/darktable:opencl - Enable opencl support
 media-gfx/darktable:rawspeed - Enable the rawspeed backend
 media-gfx/darktable:slideshow - Build the opengl slideshow viewer
 media-gfx/digikam:addressbook - Add support for kdepim
@@ -3197,6 +3198,7 @@ net-dns/bind-tools:pkcs11 - Enable PKCS#11 key support/tools for DNSSEC
 net-dns/bind-tools:urandom - Use /dev/urandom instead of /dev/random
 net-dns/ddclient:hardened - Use iproute2 instead of ifconfig to grab an IP address
 net-dns/ddclient:ssl - Connect to the server utilizing SSL
+net-dns/dnsmasq:conntrack - Add support for Linux conntrack connection marking.
 net-dns/dnsmasq:dhcp - Enable support for reading ISC DHCPd lease files
 net-dns/dnsmasq:tftp - Enables built in TFTP server for netbooting
 net-dns/ldns-utils:gost - Enable GOST support
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 3532a7648a2f..7466872aaed2 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1 +1 @@
-DIST biosdevname-0.3.8.tar.gz 189422 RMD160 32ef7232613c4585a911453cd4d6000952bdade9 SHA1 5220cb8e9d9d5447e8402e45ae4c6cdca22c1d98 SHA256 f9bdfb1da4b9f93c28b8b53b5d8c6e572d2b21df2fa8e81d72191398f4e1ed60
+DIST biosdevname-0.3.11.tar.gz 186408 RMD160 a81a33ecdf03e4cadc71679b11415b530f266b67 SHA1 1a2afa8281678ff7aad0a26e7cfbd8ffa9119228 SHA256 02c127f7fff76127cd6006e7cdd9da9335035bcb3e0a0fcf039fbb5c0f5d2dc0
diff --git a/sys-apps/biosdevname/biosdevname-0.3.8.ebuild b/sys-apps/biosdevname/biosdevname-0.3.11.ebuild
similarity index 86%
rename from sys-apps/biosdevname/biosdevname-0.3.8.ebuild
rename to sys-apps/biosdevname/biosdevname-0.3.11.ebuild
index cb134e5c6e31..a8fbaceffb27 100644
--- a/sys-apps/biosdevname/biosdevname-0.3.8.ebuild
+++ b/sys-apps/biosdevname/biosdevname-0.3.11.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.3.8.ebuild,v 1.2 2011/03/28 20:23:54 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.3.11.ebuild,v 1.1 2011/11/09 11:29:31 aidecoe Exp $
+
+EAPI=4
 
-EAPI="4"
 DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
 HOMEPAGE="http://linux.dell.com/biosdevname/"
 SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="sys-apps/pciutils"
-RDEPEND="${DEPEND}"
 
-src_configure() {
-	econf --prefix="${EPREFIX}"
-}
+CDEPEND="sys-fs/udev"
+DEPEND="${CDEPEND}
+	sys-apps/pciutils"
+RDEPEND="${CDEPEND}"
 
 pkg_postinst() {
 	elog "To make it working you need to remove"
diff --git a/sys-apps/less/less-445-r1.ebuild b/sys-apps/less/less-445-r1.ebuild
new file mode 100644
index 000000000000..88fe4b8f3439
--- /dev/null
+++ b/sys-apps/less/less-445-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-445-r1.ebuild,v 1.1 2011/11/09 18:43:05 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
+	http://www-zeuthen.desy.de/~friebel/unix/less/code2color"
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="pcre unicode"
+
+DEPEND="app-misc/editor-wrapper
+	>=sys-libs/ncurses-5.2
+	pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cp "${DISTDIR}"/code2color "${S}"/
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/code2color.patch
+}
+
+src_configure() {
+	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
+	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
+
+	local regex="posix"
+	use pcre && regex="pcre"
+
+	econf \
+		--with-regex=${regex} \
+		--with-editor=/usr/libexec/gentoo-editor
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	dobin code2color || die "dobin"
+	newbin "${FILESDIR}"/lesspipe.sh lesspipe || die "newbin"
+	dosym lesspipe /usr/bin/lesspipe.sh
+	newenvd "${FILESDIR}"/less.envd 70less
+
+	dodoc NEWS README* "${FILESDIR}"/README.Gentoo
+}
+
+pkg_postinst() {
+	einfo "lesspipe offers colorization options.  Run 'lesspipe -h' for info."
+}
diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch b/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch
new file mode 100644
index 000000000000..625d0d45df5c
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.7.5-force-python-binary.patch
@@ -0,0 +1,28 @@
+From d0320842a1b749612b3cdb6f30617760c29ced75 Mon Sep 17 00:00:00 2001
+From: Brian Harring <ferringb@gmail.com>
+Date: Wed, 9 Nov 2011 15:28:32 -0800
+Subject: [PATCH] force python binary used for pinspect calls.
+
+---
+ .../ebuild/eapi-bash/ebuild-default-functions.lib  |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib b/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
+index 3ee5e99..cff5405 100644
+--- a/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
++++ b/pkgcore/ebuild/eapi-bash/ebuild-default-functions.lib
+@@ -13,8 +13,9 @@ portageq() {
+ 	# being snagged by the sandbox
+ 	local portageq_str=portageq
+ 	${PKGCORE_DISABLE_COMPAT-false} && portageq_str=query
+-	SANDBOX_on=0 PYTHONPATH="$PKGCORE_PYTHONPATH" "${PKGCORE_BIN_PATH}/pinspect" ${portageq_str} "${command}" \
+-	    --eapi "${EAPI:--1}" --use "${USE}" "$@"
++	SANDBOX_on=0 PYTHONPATH="$PKGCORE_PYTHONPATH" "${PKGCORE_PYTHON_BINARY}" \
++		"${PKGCORE_BIN_PATH}/pinspect" ${portageq_str} "${command}" \
++			--eapi "${EAPI:--1}" --use "${USE}" "$@"
+ 	local ret="$?"
+ 	[ "$ret" == 127 ] && die "pinspect couldn't be found; broken pkgcore installation?"
+ 	return $(( $ret ))
+-- 
+1.7.8.rc1
+
diff --git a/sys-apps/pkgcore/pkgcore-0.7.5.ebuild b/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild
similarity index 89%
rename from sys-apps/pkgcore/pkgcore-0.7.5.ebuild
rename to sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild
index fffce2907917..4260aabd48ef 100644
--- a/sys-apps/pkgcore/pkgcore-0.7.5.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.5.ebuild,v 1.1 2011/11/08 23:04:45 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.5-r1.ebuild,v 1.1 2011/11/10 00:56:45 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="pkgcore package manager"
 HOMEPAGE="http://pkgcore.googlecode.com/"
@@ -20,7 +20,7 @@ RDEPEND=">=dev-lang/python-2.4
 	>=dev-python/snakeoil-0.4.4
 	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
+	doc? ( dev-python/sphinx dev-python/pyparsing )"
 
 DOCS="AUTHORS NEWS"
 
@@ -30,6 +30,10 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	epatch "$FILESDIR/"$PN-$PV-force-python-binary.patch
+}
+
 src_compile() {
 	distutils_src_compile
 
diff --git a/sys-boot/unetbootin/unetbootin-563.ebuild b/sys-boot/unetbootin/unetbootin-563.ebuild
index 1ccef96301fb..e7a1e8c5ec3c 100644
--- a/sys-boot/unetbootin/unetbootin-563.ebuild
+++ b/sys-boot/unetbootin/unetbootin-563.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-563.ebuild,v 1.1 2011/10/13 19:25:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-563.ebuild,v 1.2 2011/11/09 16:31:32 jer Exp $
 
 EAPI="4"
 
@@ -56,7 +56,7 @@ src_install() {
 	for lingua in ${UNETBOOTIN_LINGUAS}; do
 		if use linguas_${lingua}; then
 			insinto /usr/share/${PN}
-			doins ${PN}_${lingua}.qm || die
+			doins ${PN}_${lingua}.qm
 		fi
 	done
 }
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 452eca098894..c5a3277f7af6 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,4 +1,6 @@
 DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1 94977c84ce136307dbbeade95e67bfe3c25161ff SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1
 DIST clang-2.9.tgz 6243772 RMD160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 SHA1 5fd3b5cec050ec12858c1602b23cf096282ad4a4 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
+DIST clang-3.0rc3.src.tar.gz 7235549 RMD160 79544e26400858b8cade18b25f5b9df6b1dd7b90 SHA1 0ce0245175d42a345b200b40ae15e22ccd98260a SHA256 d911747a2431dea3b707b499e524b91e563e4563d0c7926fffa36ad1fbaeabc4
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
+DIST llvm-3.0rc3.src.tar.gz 10348810 RMD160 971ce6ed7c242827a8c02af7248f6305b1624bd3 SHA1 268025875ee738adaf1d45c3a2627f7c6e0b8272 SHA256 273b3a4fb3608b2373680af48bf083253e51a7ef52456034f6542460c0edac18
diff --git a/sys-devel/clang/clang-3.0_rc3.ebuild b/sys-devel/clang/clang-3.0_rc3.ebuild
new file mode 100644
index 000000000000..157b91f2d89f
--- /dev/null
+++ b/sys-devel/clang/clang-3.0_rc3.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0_rc3.ebuild,v 1.1 2011/11/09 22:55:22 voyageur Exp $
+
+EAPI=3
+
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils multilib python
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="http://clang.llvm.org/"
+# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
+SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.0_}/llvm-${PV/_}.src.tar.gz
+	http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.0_}/${P/_}.src.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug multitarget +static-analyzer +system-cxx-headers test"
+
+DEPEND="static-analyzer? ( dev-lang/perl )"
+RDEPEND="~sys-devel/llvm-${PV}[multitarget=]"
+
+S=${WORKDIR}/llvm-${PV/_}.src
+
+src_prepare() {
+	rm -f "${S}"/tools/clang
+	mv "${WORKDIR}"/clang-${PV/_}.src "${S}"/tools/clang || die "clang source directory move failed"
+
+	# Same as llvm doc patches
+	epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
+
+	# multilib-strict
+	sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \
+		-i tools/clang/lib/Headers/Makefile \
+		|| die "clang Makefile failed"
+	# Fix cxx_include_root path for Gentoo
+	epatch "${FILESDIR}"/${P/_*}-fix_cxx_include_root.patch
+	# fix the static analyzer for in-tree install
+	sed -e 's/import ScanView/from clang \0/'  \
+		-i tools/clang/tools/scan-view/scan-view \
+		|| die "scan-view sed failed"
+	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
+		-i tools/clang/tools/scan-build/scan-build \
+		|| die "scan-build sed failed"
+	# Specify python version
+	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
+
+	# From llvm src_prepare
+	einfo "Fixing install dirs"
+	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
+		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
+		-i Makefile.config.in || die "Makefile.config sed failed"
+
+	einfo "Fixing rpath and CFLAGS"
+	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
+		-i Makefile.rules || die "rpath sed failed"
+}
+
+src_configure() {
+	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)"
+
+	# Setup the search path to include the Prefix includes
+	if use prefix ; then
+		CONF_FLAGS="${CONF_FLAGS} \
+			--with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
+	fi
+
+	if use multitarget; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+	fi
+
+	if use amd64; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
+	fi
+
+	if use system-cxx-headers; then
+		# Try to get current gcc headers path
+		local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+		CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
+		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
+		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"
+		if has_multilib_profile; then
+			CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
+		fi
+	fi
+
+	econf ${CONF_FLAGS} || die "econf failed"
+}
+
+src_compile() {
+	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed"
+}
+
+src_test() {
+	cd "${S}"/test || die "cd failed"
+	emake site.exp || die "updating llvm site.exp failed"
+
+	cd "${S}"/tools/clang || die "cd clang failed"
+
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	if ! emake -j1 VERBOSE=1 test; then
+		has test $FEATURES && die "Make test failed. See above for details."
+		has test $FEATURES || eerror "Make test failed. See above for details."
+	fi
+}
+
+src_install() {
+	cd "${S}"/tools/clang || die "cd clang failed"
+	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+
+	if use static-analyzer ; then
+		dobin tools/scan-build/ccc-analyzer
+		dosym ccc-analyzer /usr/bin/c++-analyzer
+		dobin tools/scan-build/scan-build
+
+		insinto /usr/share/${PN}
+		doins tools/scan-build/scanview.css
+		doins tools/scan-build/sorttable.js
+
+		cd tools/scan-view || die "cd scan-view failed"
+		dobin scan-view
+		install-scan-view() {
+			insinto "$(python_get_sitedir)"/clang
+			doins Reporter.py Resources ScanView.py startfile.py
+			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+		}
+		python_execute_function install-scan-view
+	fi
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		for lib in libclang.dylib ; do
+			ebegin "fixing install_name of $lib"
+			install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
+				"${ED}"/usr/lib/llvm/${lib}
+			eend $?
+		done
+		for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
+			ebegin "fixing references in ${f##*/}"
+			install_name_tool \
+				-change "@rpath/libclang.dylib" \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
+					"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
+				-change "${S}"/Release/lib/libclang.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				"${ED}"/$f
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize clang
+	if use system-cxx-headers; then
+		elog "C++ headers search path is hardcoded to the active gcc profile one"
+		elog "If you change the active gcc profile, or update gcc to a new version,"
+		elog "you will have to remerge this package to update the search path"
+	else
+		elog "If clang++ fails to find C++ headers on your system,"
+		elog "you can remerge clang with USE=system-cxx-headers to use C++ headers"
+		elog "from the active gcc profile"
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup clang
+}
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 052c9831b985..54834c843b83 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.17 2011/10/04 11:52:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.19 2011/11/09 22:55:22 voyageur Exp $
 
 EAPI=3
 
@@ -19,7 +19,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug multitarget +static-analyzer +system-cxx-headers test"
 
-# Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html
 DEPEND="static-analyzer? ( dev-lang/perl )"
 RDEPEND="~sys-devel/llvm-${PV}[multitarget=]"
 
@@ -39,6 +38,8 @@ src_prepare() {
 	sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \
 		-i tools/clang/lib/Headers/Makefile \
 		|| die "clang Makefile failed"
+	# Fix cxx_include_root path for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.0-fix_cxx_include_root.patch
 	# fix the static analyzer for in-tree install
 	sed -e 's/import ScanView/from clang \0/'  \
 		-i tools/clang/tools/scan-view/scan-view \
@@ -85,9 +86,6 @@ src_configure() {
 		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
 	fi
 
-	# Skip llvm-gcc parts even if installed
-	CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"
-
 	if use system-cxx-headers; then
 		# Try to get current gcc headers path
 		local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
diff --git a/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch b/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch
new file mode 100644
index 000000000000..e1beff3f1615
--- /dev/null
+++ b/sys-devel/clang/files/clang-3.0-fix_cxx_include_root.patch
@@ -0,0 +1,21 @@
+Bug #387309
+
+--- llvm/tools/clang/lib/Driver/ToolChains.cpp.orig	2011-11-09 23:10:04.000000000 +0100
++++ llvm/tools/clang/lib/Driver/ToolChains.cpp	2011-11-09 23:11:04.000000000 +0100
+@@ -1586,12 +1586,13 @@
+     // This is of the form /foo/bar/include/c++/4.5.2/
+     if (CxxIncludeRoot.back() == '/')
+       llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the /
++    llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the g++-v4
++    llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include
+     StringRef Version = llvm::sys::path::filename(CxxIncludeRoot);
+     llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the version
+-    llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the c++
+-    llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the include
++    llvm::sys::path::remove_filename(CxxIncludeRoot); // remove the ARCH
+     GccInstallPath = CxxIncludeRoot.str();
+-    GccInstallPath.append("/lib/gcc/");
++    GccInstallPath.append("/");
+     GccInstallPath.append(CXX_INCLUDE_ARCH);
+     GccInstallPath.append("/");
+     GccInstallPath.append(Version);
diff --git a/sys-devel/gcc/gcc-2.95.3-r10.ebuild b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
index 1e946aaa853d..bc7b20049d41 100644
--- a/sys-devel/gcc/gcc-2.95.3-r10.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.6 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.7 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.3"
 SPLIT_SPECS="no"
@@ -10,14 +10,6 @@ inherit toolchain eutils flag-o-matic
 DESCRIPTION="The GNU Compiler Collection"
 
 KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
-DEPEND="${RDEPEND}
-	!build? ( nls? ( sys-devel/gettext ) )"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 
 [[ $(tc-arch ${TARGET}) == "alpha" ]] && GENTOO_PATCH_EXCLUDE="10_all_new-atexit.patch"
 
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index 33058df2fe77..ea2a4e5414cd 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.19 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.20 2011/11/09 19:22:56 vapier Exp $
 
 MAN_VER=""
 PATCH_VER="1.7"
@@ -34,41 +34,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 # ia64 - broken static handling; USE=static emerge busybox
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
-RDEPEND=">=sys-devel/gcc-config-1.4
-	>=sys-libs/zlib-1.1.4
-	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	sparc? ( hardened? ( >=sys-libs/glibc-2.3.3.20040420 ) )
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-			)
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
-fi
-
+RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
 DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 
 src_unpack() {
 	toolchain_src_unpack
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index 7498d616ca5f..03bc79d6121f 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.27 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.28 2011/11/09 19:22:56 vapier Exp $
 
 MAN_VER=""
 PATCH_VER="1.6"
@@ -46,40 +46,10 @@ IUSE="ip28 ip32r10k n32 n64"
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
-RDEPEND=">=sys-devel/gcc-config-1.4
-	>=sys-libs/zlib-1.1.4
-	virtual/libiconv
-	elibc_glibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-			)
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
-fi
-
+RDEPEND=""
 DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 
 src_unpack() {
 	toolchain_src_unpack
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index 450d83a5853d..b0faa14db1cb 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.10 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.11 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -21,40 +21,10 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="-* ~ia64 ~m68k"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	fortran? (
-		dev-libs/gmp
-		dev-libs/mpfr
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
-fi
 
 src_unpack() {
 	toolchain_src_unpack
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 6cae7fcf0b36..3b39221ec2ce 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.29 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.30 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -16,43 +16,12 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	fortran? (
-		>=dev-libs/gmp-4.2.1
-		>=dev-libs/mpfr-2.2.0_p10
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
-fi
 
 src_unpack() {
 	toolchain_src_unpack
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index f7630c827984..9aade885b812 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.9 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.10 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -15,45 +15,12 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-2.1 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	fortran? (
-		>=dev-libs/gmp-4.2.1
-		>=dev-libs/mpfr-2.2.0_p10
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
-fi
 
 src_unpack() {
 	toolchain_src_unpack
diff --git a/sys-devel/gcc/gcc-4.3.3-r2.ebuild b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
index 98ba83adccd5..526386864b99 100644
--- a/sys-devel/gcc/gcc-4.3.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.3-r2.ebuild,v 1.12 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.3-r2.ebuild,v 1.13 2011/11/09 19:22:56 vapier Exp $
 
 GENTOO_PATCH_EXCLUDE="69_all_gcc43-pr39013.patch" #262567
 
@@ -27,42 +27,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.3.4.ebuild b/sys-devel/gcc/gcc-4.3.4.ebuild
index 1cdcbd18454f..a03a3e7b8e60 100644
--- a/sys-devel/gcc/gcc-4.3.4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.4.ebuild,v 1.18 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.4.ebuild,v 1.19 2011/11/09 19:22:57 vapier Exp $
 
 GENTOO_PATCH_EXCLUDE="69_all_gcc43-pr39013.patch \
 02_all_gcc-4.3-alpha-PR42113.patch" #262567 #309279
@@ -28,42 +28,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.3.5.ebuild b/sys-devel/gcc/gcc-4.3.5.ebuild
index 5e3addaf555c..a6932c2a123f 100644
--- a/sys-devel/gcc/gcc-4.3.5.ebuild
+++ b/sys-devel/gcc/gcc-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.5.ebuild,v 1.7 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.5.ebuild,v 1.8 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -25,42 +25,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
index 94863d07bbc4..b0d5644e245c 100644
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.6-r1.ebuild,v 1.2 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.6-r1.ebuild,v 1.3 2011/11/09 19:22:56 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -25,42 +25,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( sys-devel/autogen dev-util/dejagnu )
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	sys-devel/flex
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.2.ebuild b/sys-devel/gcc/gcc-4.4.2.ebuild
index c99ea33ebd5d..112c9c20e32a 100644
--- a/sys-devel/gcc/gcc-4.4.2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.2.ebuild,v 1.9 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.2.ebuild,v 1.10 2011/11/09 19:22:56 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -25,45 +25,14 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.4
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.3-r3.ebuild b/sys-devel/gcc/gcc-4.4.3-r3.ebuild
index ac45592c1975..192394e9d646 100644
--- a/sys-devel/gcc/gcc-4.4.3-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.3-r3.ebuild,v 1.11 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.3-r3.ebuild,v 1.12 2011/11/09 19:22:56 vapier Exp $
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
@@ -22,45 +22,14 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 arm -hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.4
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.4-r2.ebuild b/sys-devel/gcc/gcc-4.4.4-r2.ebuild
index a97d6f2962d6..0a679ec85deb 100644
--- a/sys-devel/gcc/gcc-4.4.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.4-r2.ebuild,v 1.14 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.4-r2.ebuild,v 1.15 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
@@ -24,45 +24,13 @@ DESCRIPTION="The GNU Compiler Collection"
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.4
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.5.ebuild b/sys-devel/gcc/gcc-4.4.5.ebuild
index a6255577195b..3edc6c2619de 100644
--- a/sys-devel/gcc/gcc-4.4.5.ebuild
+++ b/sys-devel/gcc/gcc-4.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.5.ebuild,v 1.12 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.5.ebuild,v 1.13 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -24,45 +24,13 @@ DESCRIPTION="The GNU Compiler Collection"
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.4
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.6-r1.ebuild b/sys-devel/gcc/gcc-4.4.6-r1.ebuild
index 3db838c50360..7a87c9e9f592 100644
--- a/sys-devel/gcc/gcc-4.4.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.6-r1.ebuild,v 1.2 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.6-r1.ebuild,v 1.3 2011/11/09 19:22:56 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -24,45 +24,13 @@ DESCRIPTION="The GNU Compiler Collection"
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.3.2
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.4
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.5.1-r1.ebuild b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
index c9f8aea9406b..c7d982535027 100644
--- a/sys-devel/gcc/gcc-4.5.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.1-r1.ebuild,v 1.6 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.1-r1.ebuild,v 1.7 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
@@ -23,47 +23,14 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.8
-	)
-	lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) )
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.5.2.ebuild b/sys-devel/gcc/gcc-4.5.2.ebuild
index c6fd214cf6a9..23e52b01feed 100644
--- a/sys-devel/gcc/gcc-4.5.2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.2.ebuild,v 1.6 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.2.ebuild,v 1.7 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -23,47 +23,14 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.8
-	)
-	lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) )
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.5.3-r1.ebuild b/sys-devel/gcc/gcc-4.5.3-r1.ebuild
index 3c0fd850d722..e84eabaf5c6b 100644
--- a/sys-devel/gcc/gcc-4.5.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.3-r1.ebuild,v 1.8 2011/10/24 18:00:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.3-r1.ebuild,v 1.9 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -23,47 +23,14 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-devel/gcc-config-1.4
-	virtual/libiconv
-	>=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	graphite? (
-		>=dev-libs/ppl-0.10
-		>=dev-libs/cloog-ppl-0.15.8
-	)
-	lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) )
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.6.0.ebuild b/sys-devel/gcc/gcc-4.6.0.ebuild
index ee7f74790927..066798d41799 100644
--- a/sys-devel/gcc/gcc-4.6.0.ebuild
+++ b/sys-devel/gcc/gcc-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.0.ebuild,v 1.5 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.0.ebuild,v 1.6 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
@@ -23,46 +23,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS=""
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	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
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/dejagnu-1.4.4
-		>=sys-devel/autogen-5.5.4
-	)
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
-	>=sys-devel/flex-2.5.4
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND=">=sys-devel/gcc-config-1.4
-	go? ( >=sys-devel/gcc-config-1.5 )"
+PDEPEND="go? ( >=sys-devel/gcc-config-1.5 )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
diff --git a/sys-devel/gcc/gcc-4.6.1-r1.ebuild b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
index 80b8e99a8f68..1ecf00650b89 100644
--- a/sys-devel/gcc/gcc-4.6.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.1-r1.ebuild,v 1.2 2011/09/26 17:38:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.1-r1.ebuild,v 1.3 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -23,46 +23,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS=""
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	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
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/dejagnu-1.4.4
-		>=sys-devel/autogen-5.5.4
-	)
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
-	>=sys-devel/flex-2.5.4
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND=">=sys-devel/gcc-config-1.4
-	go? ( >=sys-devel/gcc-config-1.5 )"
+PDEPEND="go? ( >=sys-devel/gcc-config-1.5 )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild
index 7d1fc6f0d6e5..980ed5cbdcc3 100644
--- a/sys-devel/gcc/gcc-4.6.2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.1 2011/10/30 19:40:28 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.2 2011/11/09 19:22:57 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -23,46 +23,13 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS=""
-IUSE=""
 
-RDEPEND=">=sys-libs/zlib-1.1.4
-	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
-	)
-	!build? (
-		gcj? (
-			gtk? (
-				x11-libs/libXt
-				x11-libs/libX11
-				x11-libs/libXtst
-				x11-proto/xproto
-				x11-proto/xextproto
-				=x11-libs/gtk+-2*
-				x11-libs/pango
-			)
-			>=media-libs/libart_lgpl-2.1
-			app-arch/zip
-			app-arch/unzip
-		)
-		nls? ( sys-devel/gettext )
-	)"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/dejagnu-1.4.4
-		>=sys-devel/autogen-5.5.4
-	)
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875
-	>=sys-devel/flex-2.5.4
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND=">=sys-devel/gcc-config-1.4
-	go? ( >=sys-devel/gcc-config-1.5 )"
+PDEPEND="go? ( >=sys-devel/gcc-config-1.5 )"
 
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 5182c6c39c71..7b6ca1948334 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,2 +1,3 @@
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
+DIST llvm-3.0rc3.src.tar.gz 10348810 RMD160 971ce6ed7c242827a8c02af7248f6305b1624bd3 SHA1 268025875ee738adaf1d45c3a2627f7c6e0b8272 SHA256 273b3a4fb3608b2373680af48bf083253e51a7ef52456034f6542460c0edac18
diff --git a/sys-devel/llvm/llvm-3.0_rc3.ebuild b/sys-devel/llvm/llvm-3.0_rc3.ebuild
new file mode 100644
index 000000000000..15339a5c6460
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.0_rc3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc3.ebuild,v 1.1 2011/11/09 22:54:04 voyageur Exp $
+
+EAPI="3"
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.0_}/${P/_}.src.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug +libffi multitarget ocaml test udis86 vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=sys-devel/make-3.79
+	>=sys-devel/flex-2.5.4
+	>=sys-devel/bison-1.875d
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	libffi? ( dev-util/pkgconfig
+		virtual/libffi )
+	ocaml? ( dev-lang/ocaml )
+	udis86? ( amd64? ( dev-libs/udis86[pic] )
+		!amd64? ( dev-libs/udis86 ) )"
+RDEPEND="dev-lang/perl
+	libffi? ( virtual/libffi )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+S=${WORKDIR}/${P/_}.src
+
+pkg_setup() {
+	# need to check if the active compiler is ok
+
+	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
+	broken_gcc_x86=" 3.4.0 3.4.2 "
+	broken_gcc_amd64=" 3.4.6 "
+
+	gcc_vers=$(gcc-fullversion)
+
+	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
+		elog "Your version of gcc is known to miscompile llvm."
+		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
+		elog "possible solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+
+	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
+		elog "Your version of gcc is known to miscompile llvm on x86"
+		elog "architectures.  Check"
+		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
+		elog "solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+
+	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
+	then
+		 elog "Your version of gcc is known to miscompile llvm in amd64"
+		 elog "architectures.  Check"
+		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
+		 elog "solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	 fi
+}
+
+src_prepare() {
+	# unfortunately ./configure won't listen to --mandir and the-like, so take
+	# care of this.
+	einfo "Fixing install dirs"
+	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
+		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \
+		-i Makefile.config.in || die "Makefile.config sed failed"
+	sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed"
+
+	einfo "Fixing rpath and CFLAGS"
+	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
+		-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
+		-i Makefile.rules || die "rpath sed failed"
+
+	epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
+	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
+}
+
+src_configure() {
+	local CONF_FLAGS="--enable-shared
+		--with-optimize-option=
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)"
+
+	if use multitarget; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+	fi
+
+	if use amd64; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
+	fi
+
+	if use ocaml; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
+	fi
+
+	if use udis86; then
+		CONF_FLAGS="${CONF_FLAGS} --with-udis86"
+	fi
+
+	if use libffi; then
+		append-cppflags "$(pkg-config --cflags libffi)"
+	fi
+	CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)"
+	econf ${CONF_FLAGS} || die "econf failed"
+}
+
+src_compile() {
+	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed"
+}
+
+src_install() {
+	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins utils/vim/*.vim
+	fi
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do
+			# libEnhancedDisassembly is Darwin10 only, so non-fatal
+			[[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue
+			ebegin "fixing install_name of $lib"
+			install_name_tool \
+				-id "${EPREFIX}"/usr/lib/${PN}/${lib} \
+				"${ED}"/usr/lib/${PN}/${lib}
+			eend $?
+		done
+		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do
+			ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}"
+			install_name_tool \
+				-change "@executable_path/../lib/libLLVM-${PV}.dylib" \
+					"${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \
+				"${f}"
+			eend $?
+		done
+	fi
+}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 2d567c186d72..171369e9b8b6 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.15 2011/10/04 11:43:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.16 2011/11/09 15:11:05 voyageur Exp $
 
 EAPI="3"
 inherit subversion eutils flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk"
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax"
+IUSE="debug +libffi multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
@@ -30,8 +30,6 @@ RDEPEND="dev-lang/perl
 	libffi? ( virtual/libffi )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-S=${WORKDIR}/${PN}-${PV/_pre*}
-
 pkg_setup() {
 	# need to check if the active compiler is ok
 
@@ -103,32 +101,6 @@ src_configure() {
 		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
 	fi
 
-	# things would be built differently depending on whether llvm-gcc is
-	# used or not.
-	local LLVM_GCC_DIR=/dev/null
-	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
-	if use llvm-gcc ; then
-		if has_version sys-devel/llvm-gcc; then
-			LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null)
-			LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
-			if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
-				die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
-			fi
-			einfo "Using $LLVM_GCC_DRIVER"
-			LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
-		else
-			eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found"
-			eerror "Building with standard gcc, re-merge this package after installing"
-			eerror "llvm-gcc to build with it"
-			eerror "This is normal behavior on first LLVM merge"
-		fi
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} \
-		--with-llvmgccdir=${LLVM_GCC_DIR} \
-		--with-llvmgcc=${LLVM_GCC_DRIVER} \
-		--with-llvmgxx=${LLVM_GPP_DRIVER}"
-
 	if use ocaml; then
 		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
 	else
diff --git a/sys-fs/udev/udev-175.ebuild b/sys-fs/udev/udev-175.ebuild
index 9287b781a92d..f1eeaf100aff 100644
--- a/sys-fs/udev/udev-175.ebuild
+++ b/sys-fs/udev/udev-175.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175.ebuild,v 1.2 2011/11/08 16:49:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175.ebuild,v 1.5 2011/11/09 22:53:09 williamh Exp $
 
 EAPI=4
 
@@ -35,9 +35,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
 	keymap floppy edd doc"
-[[ ${PV} == "9999" ]] && IUSE="${IUSE} test"
-
-RESTRICT="test? ( userpriv )"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl dev-libs/glib:2 )
@@ -54,15 +51,14 @@ DEPEND="${COMMON_DEPEND}
 
 if [[ $PV == "9999" ]]
 then
+	RESTRICT="test? ( userpriv )"
+	IUSE="${IUSE} test"
 	DEPEND="${DEPEND}
+		dev-util/gtk-doc
 		test? ( app-text/tree )"
-fi
-
-if [[ ${PV} == "9999" ]] || use doc
-then
-	# for documentation processing with xsltproc
+else
 	DEPEND="${DEPEND}
-		dev-util/gtk-doc"
+		doc? ( dev-util/gtk-doc )"
 fi
 
 RDEPEND="${COMMON_DEPEND}
@@ -352,6 +348,16 @@ postinst_init_scripts()
 	fi
 }
 
+# This function determines if a directory is a mount point.
+# It was lifted from dracut.
+ismounted()
+{
+	while read a m a; do
+		[ "$m" = "$1" ] && return 0
+	done < "${EROOT}"/proc/mounts
+    return 1
+}
+
 pkg_postinst()
 {
 	fix_old_persistent_net_rules
@@ -434,6 +440,18 @@ pkg_postinst()
 	ewarn "action_modeswitch has been removed by upstream."
 	ewarn "Please use sys-apps/usb_modeswitch."
 
+	if ismounted /usr
+	then
+		ewarn
+		ewarn "Your system has /usr on a separate partition. This means"
+		ewarn "you will need to use an initramfs to pre-mount /usr before"
+		ewarn "udev runs."
+		ewarn "This must be set up before your next reboot, or you may"
+		ewarn "experience failures which are very difficult to troubleshoot."
+		ewarn "For a more detailed explanation, see the following URL:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
+	fi
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 1cd000fcb7c9..1c6415cbf721 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.58 2011/11/08 16:49:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.61 2011/11/09 22:53:09 williamh Exp $
 
 EAPI=4
 
@@ -35,9 +35,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
 	keymap floppy edd doc"
-[[ ${PV} == "9999" ]] && IUSE="${IUSE} test"
-
-RESTRICT="test? ( userpriv )"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl dev-libs/glib:2 )
@@ -54,15 +51,14 @@ DEPEND="${COMMON_DEPEND}
 
 if [[ $PV == "9999" ]]
 then
+	RESTRICT="test? ( userpriv )"
+	IUSE="${IUSE} test"
 	DEPEND="${DEPEND}
+		dev-util/gtk-doc
 		test? ( app-text/tree )"
-fi
-
-if [[ ${PV} == "9999" ]] || use doc
-then
-	# for documentation processing with xsltproc
+else
 	DEPEND="${DEPEND}
-		dev-util/gtk-doc"
+		doc? ( dev-util/gtk-doc )"
 fi
 
 RDEPEND="${COMMON_DEPEND}
@@ -352,6 +348,16 @@ postinst_init_scripts()
 	fi
 }
 
+# This function determines if a directory is a mount point.
+# It was lifted from dracut.
+ismounted()
+{
+	while read a m a; do
+		[ "$m" = "$1" ] && return 0
+	done < "${EROOT}"/proc/mounts
+    return 1
+}
+
 pkg_postinst()
 {
 	fix_old_persistent_net_rules
@@ -434,6 +440,18 @@ pkg_postinst()
 	ewarn "action_modeswitch has been removed by upstream."
 	ewarn "Please use sys-apps/usb_modeswitch."
 
+	if ismounted /usr
+	then
+		ewarn
+		ewarn "Your system has /usr on a separate partition. This means"
+		ewarn "you will need to use an initramfs to pre-mount /usr before"
+		ewarn "udev runs."
+		ewarn "This must be set up before your next reboot, or you may"
+		ewarn "experience failures which are very difficult to troubleshoot."
+		ewarn "For a more detailed explanation, see the following URL:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
+	fi
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index c1c46b30dbfa..99e9d5ff36b8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-2.6.32-36.base.tar.bz2 848775 RMD160 15102eded74ee4ae5c980526285
 DIST genpatches-2.6.32-36.extras.tar.bz2 24934 RMD160 e3e1d60fb45a3e3c818ddda36b9180d4fc46679e SHA1 d16a34dfa35d163ea4042058b3865c389f3802e9 SHA256 50b70c76461aa52f7f2ad88175e7f08eb555f7f1dfd274759ec0c2a9748bde5e
 DIST genpatches-2.6.32-43.base.tar.bz2 979911 RMD160 d221c448adb8116fa328304f7cde9ce92f6c5432 SHA1 6038e46e09e8dccbf80563998fc9ebd14718d0e3 SHA256 92f71a7ac87fd7117ce28e1666e8c95473cd4b4701a78984c2ba4b87d0a8c705
 DIST genpatches-2.6.32-43.extras.tar.bz2 24897 RMD160 fac4ce9c15953ad811b2c500b0145f2eebea5e2d SHA1 8f9cdf4bc06dc5e806698d93c002798faa53fda1 SHA256 309841a94e96d7076bca7fb547caae9786e24258e032da242f64768a413ddbf0
+DIST genpatches-2.6.32-44.base.tar.bz2 1012021 RMD160 37aae12613e8d5e0f3cb0ad5f6057a83846e5bdc SHA1 3f4a864c30fd445eff30b480b0b5654c5758b219 SHA256 f00a36ff4e30785eca0816bf1a698b358213e59c5786799b5bddd8322da1c633
+DIST genpatches-2.6.32-44.extras.tar.bz2 24902 RMD160 9e8d686ce4e2bb36e6f6310835b96f64ad8d0f08 SHA1 29ed146cfcfb4470b0f2cea9b4dad07b359c31df SHA256 e105210bca94660f3292751fea0db38c7dea50ea2c5a729faa1dbc9fb348442f
 DIST genpatches-2.6.38-7.base.tar.bz2 155312 RMD160 54caab0025f9669e4dc1e0e0cae549bf1306feb1 SHA1 ff3dcbed69695ce83ac3b692725628a0816c3749 SHA256 a01d37219dc2b2311a0994a4d0fd3a9148bfeb31ea78c64cc78cbb900de432da
 DIST genpatches-2.6.38-7.extras.tar.bz2 15675 RMD160 3d40e9fcad874591de0cc7497a52795ea04a9b9b SHA1 ca1b5f319e87960fa97ea6302dd0146901cacd9e SHA256 6d4c134be67714382efc8aec208c5a73d6c0f84d96acc76640b9ed3be93877a4
 DIST genpatches-2.6.38-8.base.tar.bz2 194001 RMD160 6abc3131bc8094131ab647a31f0297e58c7d2975 SHA1 a6fbe866c22003098c84e892c019867a09fbafc8 SHA256 99719da897d8f1371815ef5d0f486bfae18829c75d617d95602104805e390ac3
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.6.32-r37.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.6.32-r37.ebuild
new file mode 100644
index 000000000000..11ecc3e7c1e3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.6.32-r37.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.32-r37.ebuild,v 1.1 2011/11/09 17:10:06 mpagano Exp $
+
+EAPI="2"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="44"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="deblob"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 2de6fe625850..14d1ab0429a0 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -4,4 +4,5 @@ DIST genpatches-3.0-4.base.tar.bz2 102113 RMD160 178fc759f4d4ee9760eab4345c9dd7e
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
 DIST patch-3.0.3-rt12.patch.bz2 135075 RMD160 d608bfbeda496d8a3043500532c6468e79bd6b74 SHA1 8e07a11aa2e521d5059874f99cf86696e7b50eec SHA256 60018da232151f676f00f9189eeede2e03c3d5318fc7d53b9547a9825d0a7300
 DIST patch-3.0.8-rt22.patch.gz 184280 RMD160 ac3b0d73e49347762c6a10860645f7652f2ba45a SHA1 ef9f229874e2c3e5edca808bab5728fc0fb60a5c SHA256 fed3f18a5040a9b40cfec0fb6dfd38875d5ac32860d06219b747ffa81d782626
+DIST patch-3.0.8-rt23.patch.gz 185084 RMD160 b716e48b5d6c8c3991ffeceb9ff506fbe33f0665 SHA1 dec87bf1da85e3cc92b6db1b6139683e7aa1eaf0 SHA256 3fe14aab8e0b276e8b608f01814319d4940d80f748ae0d7babd93da38a5b44a7
 DIST patch-3.0.8.bz2 203084 RMD160 6ed0c10747c228a32036329a88dc1712eca8800e SHA1 80c2561fb4c8dca5b5eebdc2877f89b0ef5a2c60 SHA256 d09ed2d01fbe4bdab21e726ef2d681d9513308dcb65cf512bc9e100c53c86762
diff --git a/sys-kernel/rt-sources/rt-sources-3.0.8_p23.ebuild b/sys-kernel/rt-sources/rt-sources-3.0.8_p23.ebuild
new file mode 100644
index 000000000000..dcf904256141
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.0.8_p23.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+EAPI="2"
+
+inherit versionator
+
+COMPRESSTYPE=".gz"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE="1"
+
+CKV="$(get_version_component_range 1-3)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+RT_PATCHSET="${PV/*_p}"
+RT_KERNEL="${PV/_p[0-9]*}"
+RT_KERNEL="${RT_KERNEL/_/-}"
+RT_FILE="patch-${RT_KERNEL}-rt${RT_PATCHSET}.patch${COMPRESSTYPE}"
+RT_URI="http://dev.gentoo.org/~psomas/${RT_FILE}"
+
+DESCRIPTION="Real-time patchset for the Linux Kernel"
+HOMEPAGE="https://tglx.de/~tglx/rt/"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="deblob"
+
+KV_FULL="${PVR/_p/-rt}"
+EXTRAVERSION="-rt${RT_PATCHSET}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare(){
+	epatch "${DISTDIR}"/"${RT_FILE}"
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.12.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.12.ebuild
index bee7500b89bb..f151e2ca2f35 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.12.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.12.ebuild,v 1.11 2011/06/29 20:45:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.12.ebuild,v 1.12 2011/11/09 04:30:53 vapier Exp $
 
 EAPI="2"
 
@@ -13,10 +13,9 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls elibc_glibc"
+IUSE="nls"
 
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.6 )
-	!sys-libs/com_err
+RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
 	!<sys-fs/e2fsprogs-1.41.8"
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild
index 9cd2b73c8660..8d63f2e7119e 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild,v 1.6 2011/11/06 13:24:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild,v 1.7 2011/11/09 04:30:53 vapier Exp $
 
 EAPI="2"
 
@@ -13,10 +13,9 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls elibc_glibc"
+IUSE="nls"
 
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.6 )
-	!sys-libs/com_err
+RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
 	!<sys-fs/e2fsprogs-1.41.8"
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild
index a30bc565c292..e2cd2d639b21 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild,v 1.4 2010/12/04 21:51:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.7.ebuild,v 1.5 2011/11/09 04:30:53 vapier Exp $
 
 EAPI="2"
 
@@ -13,10 +13,9 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls elibc_glibc"
+IUSE="nls"
 
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.6 )
-	!sys-libs/com_err
+RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
 	!<sys-fs/e2fsprogs-1.41"
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild
index ceabf9413c7c..e11067612d59 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild,v 1.1 2011/09/01 19:32:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild,v 1.2 2011/11/09 04:30:53 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -18,10 +18,9 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls elibc_glibc"
+IUSE="nls"
 
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.6 )
-	!sys-libs/com_err
+RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
 	!<sys-fs/e2fsprogs-1.41.8"
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5db3df0f5e7a..03ebdabc4a4e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
 DIST chromium-15.0.874.102.tar.bz2 151371123 RMD160 dfca6a43e773666334c5a40d50fc86c5ee3c335b SHA1 961392fbde1f99a40b860454565e8be3b752a3cf SHA256 63c94003a2152d9b7ec51e9126d6848c3d1ec7088ba6879f47f4b594b00ad878
 DIST chromium-15.0.874.106.tar.bz2 151367039 RMD160 853dc23730a821d51e32e19fd9fc2173dbd2d038 SHA1 424a6b76a93dfdf1cf2fb153041ecdf9f9533c2c SHA256 07d216782b20513d3550e6a2388d31784740264ba6977d66617058687885becf
-DIST chromium-16.0.912.15.tar.bz2 154090158 RMD160 f630f6602fe18f873edc8a5c957ff720d81814c7 SHA1 67f973ac0088d40803ebd8c47fff432e2adcf818 SHA256 c95b7edf5eea8ad5fa0d9a648a1d3eb63f290e91c9508bb3f6be4186f2e8bc02
 DIST chromium-16.0.912.21.tar.bz2 154072311 RMD160 d212ca36c9aabd622276e53777b93316f900c175 SHA1 809a1a6e0d2c8b036b8f7eb97c3fdf18e8af68cd SHA256 09417a33e9e620331f93c5e0904e3dbd8c4ca76a2766556702533b38aa4bd577
+DIST chromium-16.0.912.32.tar.bz2 154126364 RMD160 be1928af8c0095f76a58a618f66b3b06f7e1ca6e SHA1 8d1fe0ab8bf8fa2d6332ef4ad0c2a3f255367f0c SHA256 e2cdff16e68a6b60e54c3f519e8af3256497192fe6d98400369906c915d06713
 DIST chromium-17.0.928.0.tar.bz2 150539755 RMD160 306d46186a497c81461f539500f3c88e67fc5c85 SHA1 129b14bcd60121f32d5264e224535a867384a524 SHA256 471e7b96aa37aba4121f34db2a77de87fa3a6774e1376cc42ce7403cdb2f59ea
 DIST chromium-17.0.932.0.tar.bz2 156649015 RMD160 5ad608f601cec211343595b68f34ccc8dbe181b7 SHA1 d7414b0666aaf55cfa096e739bf539c4de3cf392 SHA256 61dabec8f17559de3b2ee6a537265850ccfaa8c36eb41e9cc4f135461e3f5b78
diff --git a/www-client/chromium/chromium-16.0.912.15.ebuild b/www-client/chromium/chromium-16.0.912.32.ebuild
similarity index 98%
rename from www-client/chromium/chromium-16.0.912.15.ebuild
rename to www-client/chromium/chromium-16.0.912.32.ebuild
index 29a2b036f9f3..822b27c67ec2 100644
--- a/www-client/chromium/chromium-16.0.912.15.ebuild
+++ b/www-client/chromium/chromium-16.0.912.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.15.ebuild,v 1.3 2011/11/08 00:37:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.32.ebuild,v 1.1 2011/11/09 02:59:23 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -98,17 +98,6 @@ get_installed_v8_version() {
 	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
 }
 
-pkg_pretend() {
-	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
-		# Fail if the kernel doesn't support features needed for sandboxing,
-		# bug #363907.
-		ERROR_PID_NS="PID_NS is required for sandbox to work"
-		ERROR_NET_NS="NET_NS is required for sandbox to work"
-		CONFIG_CHECK="~PID_NS ~NET_NS"
-		check_extra_config
-	fi
-}
-
 if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium-pkg_die";
 fi
@@ -160,6 +149,15 @@ pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 
+	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
+		# Fail if the kernel doesn't support features needed for sandboxing,
+		# bug #363907.
+		ERROR_PID_NS="PID_NS is required for sandbox to work"
+		ERROR_NET_NS="NET_NS is required for sandbox to work"
+		CONFIG_CHECK="~PID_NS ~NET_NS"
+		check_extra_config
+	fi
+
 	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
 	else
@@ -374,10 +372,12 @@ src_install() {
 	insinto "${CHROMIUM_HOME}"
 	case "$(tc-arch)" in
 		amd64)
+			doexe out/Release/nacl_helper{,_bootstrap} || die
 			doins out/Release/nacl_irt_x86_64.nexe || die
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 		x86)
+			doexe out/Release/nacl_helper{,_bootstrap} || die
 			doins out/Release/nacl_irt_x86_32.nexe || die
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 8e6064248dea..ad69e19ea0fe 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.72 2011/11/08 16:16:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.73 2011/11/09 18:56:01 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="bindist gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -31,7 +31,6 @@ RDEPEND="app-arch/bzip2
 	dev-libs/elfutils
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
-	dev-libs/libgcrypt
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
 	>=dev-libs/nss-3.12.3
@@ -43,8 +42,11 @@ RDEPEND="app-arch/bzip2
 	media-libs/libpng
 	>=media-libs/libwebp-0.1.2
 	media-libs/speex
-	>=net-print/cups-1.3.11
 	pulseaudio? ( media-sound/pulseaudio )
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
 	sys-libs/zlib
 	x11-libs/gtk+:2
 	x11-libs/libXinerama
@@ -324,6 +326,7 @@ src_configure() {
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
+		$(gyp_use cups use_cups)
 		$(gyp_use gnome use_gconf)
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 000c64d6df73..b9befa357adf 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_16.0.912.21-r108057_amd64.deb 24927582 RMD160 f61ebace6f5c035b8bbb3c5c1aae093ac1660f07 SHA1 44a3be803d859e888ab3c65c9b54d2c34fc2ef15 SHA256 85e3368e6be16ad7af39c89ffa31b159c17a51da4ff78963646aa0ce885b2fb0
-DIST google-chrome-beta_16.0.912.21-r108057_i386.deb 29051054 RMD160 9507d2bc3257cd929df4b4011df8b9bc86d33c87 SHA1 7f44377652860e002547a43f19de9a4583db0ac5 SHA256 2c5472035c255f48ce2e7011d63600d2670f195cf4d74f601534da94eca675fe
+DIST google-chrome-beta_16.0.912.32-r108990_amd64.deb 24935648 RMD160 fb2c1d42a036ec0dad866ea85153cba069e53ce0 SHA1 4e6b150a476314fcb070151af00524b38d45bdbb SHA256 b7ab14b42f3888b02f2572414881315ce8269cbee265cb94a1167f0f5dddea0a
+DIST google-chrome-beta_16.0.912.32-r108990_i386.deb 29090384 RMD160 98c9f41784929f0c8f4e2cd4bbd89d0b7d5d500e SHA1 ae6cdb44985077260dad1cd41a9830bb7d17c2cb SHA256 6a85d599e539f2db6e076822ad3f9a527075ea8bbe20238bad15d72de64a8364
 DIST google-chrome-stable_15.0.874.106-r107270_amd64.deb 24685342 RMD160 a93c79a3a4b27becaab8f744683a937522c86122 SHA1 3de26a2e0b819c0b670432ff0efe0ee2ab90c452 SHA256 378142e6c6ce81193fbeda1f4ca1d920655a911bcd5f82d840d8bad20e8957fd
 DIST google-chrome-stable_15.0.874.106-r107270_i386.deb 28790496 RMD160 d96acb5961cad447c074da300d12250f305dc88a SHA1 b7c97bf34a5f9d38dad82907b9f891b7c1c85c72 SHA256 c0e7f21fdb5b76cb4d0aa6070e991b7a0cafeba7500ccf5c840140b2afb32e76
 DIST google-chrome-unstable_17.0.932.0-r108826_amd64.deb 25210966 RMD160 37fb6f5a09753177a7169a2479629bbe83fc96e6 SHA1 31c020bc8bf7752d96993ef320a509bf0c96739d SHA256 ab543c1ae1b452e4f1e7bcb962985fb4fc5fc1776c5a747b0d76ab503ec7d36d
diff --git a/www-client/google-chrome/google-chrome-16.0.912.21_beta108057.ebuild b/www-client/google-chrome/google-chrome-16.0.912.32_beta108990.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-16.0.912.21_beta108057.ebuild
rename to www-client/google-chrome/google-chrome-16.0.912.32_beta108990.ebuild
index 06beda6bfd4f..e0e2db6824d5 100644
--- a/www-client/google-chrome/google-chrome-16.0.912.21_beta108057.ebuild
+++ b/www-client/google-chrome/google-chrome-16.0.912.32_beta108990.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-16.0.912.21_beta108057.ebuild,v 1.1 2011/11/03 16:18:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-16.0.912.32_beta108990.ebuild,v 1.1 2011/11/09 02:34:23 floppym Exp $
 
 EAPI="4"
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 987a88212b06..b56c54b9172a 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -13,3 +13,6 @@ DIST opera-11.60-1144.x86_64.linux.tar.xz 12460648 RMD160 2da55f12b5d80d69b3a1c1
 DIST opera-11.60-1145.i386.freebsd.tar.xz 11514436 RMD160 be5a9134fc8d69ecfdec9bca83024d0baf6b7eb1 SHA1 1dbcaeda0b6addc6bb3e180484ef2d6d28f6caf6 SHA256 29be75ce825141cc6733961cf85af155a74d61327d2c6020f83d107038900289
 DIST opera-11.60-1145.i386.linux.tar.xz 11470368 RMD160 d9781ea2660acc3abaa81b3cfc75b606413bda67 SHA1 28fba00aea39efeb81ee0b61e56303902df84cfc SHA256 1ad8c2ae3f4b949307d61a94ad68d0c92e820938f84818571193f6db6802dbbb
 DIST opera-11.60-1145.x86_64.linux.tar.xz 12320788 RMD160 443954b35acdb95b31afd6866e95f73b6d4f3c62 SHA1 966005e971b2f2258e68ffa93f2f2ad151633a79 SHA256 1898097aa8dc247eefb909489eb36d03ff8bd514ffd2ee652eb816ec62f63ae0
+DIST opera-11.60-1147.i386.freebsd.tar.xz 11514556 RMD160 b5aeb9a2ba2f33d8c3d81351fbdd6e766c78950d SHA1 57271e201a2672fd0dec07e5dd52148274bb28d3 SHA256 f43343b184cfafa8c6347bad68a62b1fcd28775fce44a6304f78554cd3e24167
+DIST opera-11.60-1147.i386.linux.tar.xz 11486472 RMD160 b8aa8f83398dbbf9df2a9d260d807e7500a6e966 SHA1 781abf2c1ae78ebd7f92af9cb4c0ee2b4b43a216 SHA256 62c9ff4ee7849c93b850e2456a2e7707af18a8f9943e8f873f48ca3812702e58
+DIST opera-11.60-1147.x86_64.linux.tar.xz 12324564 RMD160 67c9627b18af59d16752464351224ea31de526ac SHA1 f75e87da34af426b0bc1c9fd5fcb6f9b89a09691 SHA256 1496d07cc58eec1b6209f01c2df6e315e45a1d755e54f2cd877eac89e79c48bc
diff --git a/www-client/opera/opera-11.60.1147.ebuild b/www-client/opera/opera-11.60.1147.ebuild
new file mode 100644
index 000000000000..20d0ed84191c
--- /dev/null
+++ b/www-client/opera/opera-11.60.1147.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1147.ebuild,v 1.1 2011/11/09 16:09:35 jer Exp $
+
+EAPI="4"
+
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-11 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+
+O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
+O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
+
+O_D="betarc1_${O_V}-${O_B}"
+O_P="${PN}-${O_V}-${O_B}"
+O_U="http://snapshot.opera.com/unix/"
+
+SRC_URI="
+	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
+hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
+th tl tr uk uz vi zh-CN zh-TW zu"
+
+for O_LINGUA in ${O_LINGUAS}; do
+	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+	>=sys-apps/sed-4
+	app-arch/xz-utils
+"
+GTKRDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/pango
+	x11-libs/pixman
+"
+KDERDEPEND="
+	kde-base/kdelibs
+	x11-libs/qt-core
+	x11-libs/qt-gui
+"
+GSTRDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+	media-plugins/gst-plugins-meta
+"
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXt
+	gtk? ( ${GTKRDEPEND} )
+	gtk3? ( ${GTKRDEPEND} )
+	kde? ( ${KDERDEPEND} )
+	gstreamer? ( ${GSTRDEPEND} )
+"
+
+pkg_setup() {
+	echo -e \
+		" ${GOOD}****************************************************${NORMAL}"
+	elog "If you seek support, please file a bug report at"
+	elog "https://bugs.gentoo.org and post the output of"
+	elog " \`emerge --info =${CATEGORY}/${P}'"
+	echo -e \
+		" ${GOOD}****************************************************${NORMAL}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+	local LNGDIR="share/${PN}/locale"
+
+	# Count linguas
+	count() { echo ${#}; }
+	local lingua_count=$(count ${O_LINGUAS} en)
+	local locale_count=$(count ${LNGDIR}/*)
+	[[ ${lingua_count} = ${locale_count} ]] \
+		|| die "Number of LINGUAS does not match number of locales"
+	unset count
+
+	# Remove unwanted linguas
+	einfo "Keeping these locales (linguas): ${LINGUAS}."
+	for LINGUA in ${O_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+		fi
+	done
+
+	# Remove doc directory but keep the LICENSE under another name (bug #315473)
+	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+	rm -rf share/doc
+	for locale in share/${PN}/locale/*; do
+		rm -f "${locale}/license.txt"
+		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+			|| die
+	done
+
+	# Remove package directory
+	rm -rf share/${PN}/package
+
+	# Optional libraries
+	if ! use gtk; then
+		rm lib/${PN}/liboperagtk2.so || die
+	fi
+	if ! use gtk3; then
+		rm lib/${PN}/liboperagtk3.so || die
+	fi
+	if ! use kde; then
+		rm lib/${PN}/liboperakde4.so || die
+	fi
+	if ! use gstreamer; then
+		rm -r lib/${PN}/gstreamer || die
+	fi
+
+	# Unzip the man pages before sedding
+	gunzip share/man/man1/* || die
+
+	# Replace PREFIX, SUFFIX and PN in various files
+	sed -i \
+		-e "s:@@{PREFIX}:/usr:g" \
+		-e "s:@@{SUFFIX}::g" \
+		-e "s:@@{_SUFFIX}::g" \
+		-e "s:@@{USUFFIX}::g" \
+		-e "s:opera:${PN}:g" \
+		share/man/man1/* \
+		share/applications/${PN}-*.desktop \
+		|| die
+
+	# Replace "Opera" with "Opera Next"
+	if [[ ${PN} = opera-next ]]; then
+		sed -i share/applications/${PN}-*.desktop \
+			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
+	fi
+
+	# Create /usr/bin/opera wrapper
+	echo '#!/bin/sh' > ${PN}
+	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+		>> ${PN}
+	echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN}
+	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	if use elibc_FreeBSD; then
+		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+		while read i; do
+			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+			then
+				export SANITY_CHECK_LIBZ_FAILED=1
+				break
+			fi
+			sed -i \
+				"$i" \
+				-e 's/libz\.so\.3/libz.so.1/g'
+		done
+		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+	fi
+}
+
+src_install() {
+	# We install into usr instead of opt as Opera does not support the latter
+	dodir /usr
+	mv lib/ "${D}/${OPREFIX}" || die
+	mv share/ "${D}/usr/" || die
+
+	# Install startup scripts
+	dobin ${PN}
+
+	# Stop revdep-rebuild from checking opera binaries
+	dodir /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+		> "${D}"/etc/revdep-rebuild/90${PN}
+
+	# Set PaX markings for hardened/PaX (bug #344267)
+	pax-mark m \
+		"${D}/${OPREFIX}/${PN}/${PN}" \
+		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
+		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/surfraw/surfraw-2.2.8.ebuild b/www-client/surfraw/surfraw-2.2.8.ebuild
index 699881da0776..3e1b32f01fcf 100644
--- a/www-client/surfraw/surfraw-2.2.8.ebuild
+++ b/www-client/surfraw/surfraw-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.8.ebuild,v 1.4 2011/11/03 15:22:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.8.ebuild,v 1.5 2011/11/09 16:17:17 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest
new file mode 100644
index 000000000000..86a5081efcb7
--- /dev/null
+++ b/x11-misc/screen-message/Manifest
@@ -0,0 +1 @@
+DIST screen-message_0.19.orig.tar.gz 89838 RMD160 19d3edf8a1f179f7838e98208258030f9e94ed3d SHA1 ebfe432bd95d1d5d2cacb1d0c317414ec5ffad21 SHA256 496741e63a0ee87c645ca0e2d5f5608c2cacf81127a1af083f2dc61721994bf9
diff --git a/x11-misc/screen-message/metadata.xml b/x11-misc/screen-message/metadata.xml
new file mode 100644
index 000000000000..16bcc9f800a2
--- /dev/null
+++ b/x11-misc/screen-message/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/screen-message/screen-message-0.19.ebuild b/x11-misc/screen-message/screen-message-0.19.ebuild
new file mode 100644
index 000000000000..a0bb89c5f10d
--- /dev/null
+++ b/x11-misc/screen-message/screen-message-0.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/screen-message/screen-message-0.19.ebuild,v 1.1 2011/11/09 16:45:41 sping Exp $
+
+EAPI="2"
+
+DESCRIPTION="Display a multi-line message large, fullscreen, black on white"
+HOMEPAGE="http://www.joachim-breitner.de/blog/archives/249-screen-message-uploaded-to-Debian.html"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2.10:2
+	>=x11-libs/pango-1.16"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodir /usr/bin || die
+	mv "${D}"/usr/{games,bin}/sm || die
+	sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die
+}
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..c090d65ab05e
--- /dev/null
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4-r1.ebuild,v 1.1 2011/11/09 18:42:49 ssuominen Exp $
+
+EAPI=4
+inherit xfconf
+
+DESCRIPTION="A weather plug-in for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/0.7/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
+	>=dev-libs/libxml2-2.4"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	# http://bugzilla.xfce.org/show_bug.cgi?id=8105#c9
+	sed -i \
+		-e '/PARTNER_ID/s:1121946239:1003666583:' \
+		-e '/LICENSE_KEY/s:3c4cd39ee5dec84f:4128909340a9b2fc:' \
+		panel-plugin/weather.h || die
+
+	xfconf_src_prepare
+}