diff --git a/app-admin/radmind/radmind-1.13.0.ebuild b/app-admin/radmind/radmind-1.13.0.ebuild
index 97b8f223e156..66755a0e29e7 100644
--- a/app-admin/radmind/radmind-1.13.0.ebuild
+++ b/app-admin/radmind/radmind-1.13.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.13.0.ebuild,v 1.2 2012/12/07 19:06:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.13.0.ebuild,v 1.3 2013/11/07 02:29:46 patrick Exp $
 
 EAPI=2
 
 inherit eutils
 
-DESCRIPTION="A suite of Unix command-line tools and a server designed to remotely administer the file systems of multiple Unix machines."
+DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
 HOMEPAGE="http://rsug.itd.umich.edu/software/radmind/"
 SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
 
diff --git a/app-admin/radmind/radmind-1.7.1-r1.ebuild b/app-admin/radmind/radmind-1.7.1-r1.ebuild
index b5181878371e..a6910294cf65 100644
--- a/app-admin/radmind/radmind-1.7.1-r1.ebuild
+++ b/app-admin/radmind/radmind-1.7.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.7.1-r1.ebuild,v 1.6 2012/12/07 19:06:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/radmind/radmind-1.7.1-r1.ebuild,v 1.7 2013/11/07 02:29:46 patrick Exp $
 
 inherit eutils
 
-DESCRIPTION="A suite of Unix command-line tools and a server designed to remotely administer the file systems of multiple Unix machines."
+DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
 HOMEPAGE="http://rsug.itd.umich.edu/software/radmind/"
 SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
 
diff --git a/app-arch/zopfli/zopfli-1.0.0.ebuild b/app-arch/zopfli/zopfli-1.0.0.ebuild
index 8f515669d252..88636bd2774e 100644
--- a/app-arch/zopfli/zopfli-1.0.0.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0.ebuild,v 1.1 2013/09/18 20:43:23 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0.ebuild,v 1.2 2013/11/06 18:43:39 pinkbyte Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip"
 
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20130508-r1.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20130508-r1.ebuild
index 0eba823c1065..0252d5be0da3 100644
--- a/app-arch/zopfli/zopfli-1.0.0_p20130508-r1.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.0_p20130508-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0_p20130508-r1.ebuild,v 1.1 2013/09/23 00:50:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0_p20130508-r1.ebuild,v 1.2 2013/11/06 18:43:39 pinkbyte Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0/${SONAME}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip"
 
diff --git a/app-backup/backuppc/backuppc-2.1.2-r1.ebuild b/app-backup/backuppc/backuppc-2.1.2-r1.ebuild
index 1cf89ee5a4cd..1210c5544735 100644
--- a/app-backup/backuppc/backuppc-2.1.2-r1.ebuild
+++ b/app-backup/backuppc/backuppc-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/backuppc-2.1.2-r1.ebuild,v 1.5 2012/05/24 04:37:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backuppc/backuppc-2.1.2-r1.ebuild,v 1.6 2013/11/07 02:33:23 patrick Exp $
 
 inherit eutils webapp user
 
@@ -9,9 +9,7 @@ IUSE="samba doc"
 MY_P=BackupPC-${PV}
 PATCH_VER=0.1
 S="${WORKDIR}"/${MY_P}
-DESCRIPTION="A high performance, enterprise grade backup system for backing up
-Linux, Windows, Mac OS X desktops and laptops to a server's disk.  No client
-side software needed."
+DESCRIPTION="A high-performance system for backing up computers to a server's disk."
 HOMEPAGE="http://backuppc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2"
diff --git a/app-crypt/pinentry/pinentry-0.8.2.ebuild b/app-crypt/pinentry/pinentry-0.8.2.ebuild
index b40d1a36ebb7..0bffa43660c7 100644
--- a/app-crypt/pinentry/pinentry-0.8.2.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.17 2013/06/15 22:27:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.2.ebuild,v 1.18 2013/11/06 21:45:32 alonbl Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@ RDEPEND="
 	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	gtk? ( virtual/pkgconfig )
 	qt4? ( virtual/pkgconfig )
 "
diff --git a/app-crypt/pinentry/pinentry-0.8.3.ebuild b/app-crypt/pinentry/pinentry-0.8.3.ebuild
index 5c2cf8ef24c6..b4320ce55f70 100644
--- a/app-crypt/pinentry/pinentry-0.8.3.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.3.ebuild,v 1.1 2013/10/07 18:24:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.3.ebuild,v 1.2 2013/11/06 21:45:32 alonbl Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@ RDEPEND="
 	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	gtk? ( virtual/pkgconfig )
 	qt4? ( virtual/pkgconfig )
 "
diff --git a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
index 0ba8829f3d13..08d9705a4a0e 100644
--- a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
+++ b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild,v 1.1 2008/05/13 21:28:23 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild,v 1.2 2013/11/07 02:39:50 patrick Exp $
 
 SWORD_MODULE="HunUj"
 
 inherit sword-module
 
-DESCRIPTION="The New Translation Bible of the Hungarian Bible Society (Magyar Bibliatarsulat Ujforditasu Bibliaja)"
+DESCRIPTION="New Translation Bible of the Hungarian Bible Society (Magyar Bibliatarsulat Ujforditasu Bibliaja)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
 LICENSE="freedist"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-doc/phrack-all/phrack-all-66.ebuild b/app-doc/phrack-all/phrack-all-66.ebuild
index 7986c6138eae..cfea1a3d943c 100644
--- a/app-doc/phrack-all/phrack-all-66.ebuild
+++ b/app-doc/phrack-all/phrack-all-66.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/phrack-all/phrack-all-66.ebuild,v 1.3 2010/10/19 06:54:52 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/phrack-all/phrack-all-66.ebuild,v 1.4 2013/11/07 02:46:23 patrick Exp $
 
 MY_P=${PN}${PV}
-DESCRIPTION="...a Hacker magazine by the community, for the community... (this will install *all* issues of phrack)"
+DESCRIPTION="Hacker magazine by the community, for the community (this will install *all* issues of phrack)"
 HOMEPAGE="http://www.phrack.org/"
 SRC_URI=""
 
diff --git a/app-doc/phrack-all/phrack-all-67.ebuild b/app-doc/phrack-all/phrack-all-67.ebuild
index 82eb6780b7e3..130e7c84376c 100644
--- a/app-doc/phrack-all/phrack-all-67.ebuild
+++ b/app-doc/phrack-all/phrack-all-67.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/phrack-all/phrack-all-67.ebuild,v 1.1 2011/08/18 21:54:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/phrack-all/phrack-all-67.ebuild,v 1.2 2013/11/07 02:46:23 patrick Exp $
 
 MY_P=${PN}${PV}
-DESCRIPTION="...a Hacker magazine by the community, for the community... (this will install *all* issues of phrack)"
+DESCRIPTION="Hacker magazine by the community, for the community (this will install *all* issues of phrack)"
 HOMEPAGE="http://www.phrack.org/"
 SRC_URI=""
 
diff --git a/app-doc/phrack-all/phrack-all-68.ebuild b/app-doc/phrack-all/phrack-all-68.ebuild
index 5bad92acb9db..202aa3a0ae2c 100644
--- a/app-doc/phrack-all/phrack-all-68.ebuild
+++ b/app-doc/phrack-all/phrack-all-68.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/phrack-all/phrack-all-68.ebuild,v 1.1 2012/06/28 16:04:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/phrack-all/phrack-all-68.ebuild,v 1.2 2013/11/07 02:46:23 patrick Exp $
 
 MY_P=${PN}${PV}
-DESCRIPTION="...a Hacker magazine by the community, for the community... (this will install *all* issues of phrack)"
+DESCRIPTION="Hacker magazine by the community, for the community (this will install *all* issues of phrack)"
 HOMEPAGE="http://www.phrack.org/"
 SRC_URI=""
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 292059482602..c92ea87e4c8a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,4 +1,5 @@
 DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
 DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
+DIST libvirt-1.1.3.1.tar.gz 26595900 SHA256 00383e0beef1854610d8d47fd9347564b3654ce0e4a263e06b0de364a118c93e SHA512 59f79d0fc52ae0c9ae97bcc8fd90f799d6daf63c9a36d38738ec7d7392e630e39347f0c472b02434e83888b3ee0ab62d2b0b4eaa92eed3102ff36ca30f2598aa WHIRLPOOL 92be678e7ef84f9437bb91b1a621e6b35f9ce1383b945e466b4b864c0df1cfb95900da6267263bb1984663ea8e2b5b358bd516748a934835a87be822f5d27e90
 DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
 DIST libvirt-1.1.4.tar.gz 26799019 SHA256 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f SHA512 64455585b8d7e5c0f701e9803ae00d277ee27f9bec92b9890e487cd0298f5f8ff9075d0b2bc81be67e8d8e03bfe58eb2e4fd6292439acd9d22a3f3e7f5b87efc WHIRLPOOL c8de6024b51988415847463064ccf2bcc9d7cb42be8765fbfcf901b594d963351f312d962ca4fb2a5ecce7c2247a60b6201e57a41ba44caa6211148585d65352
diff --git a/app-emulation/libvirt/libvirt-1.1.3.1.ebuild b/app-emulation/libvirt/libvirt-1.1.3.1.ebuild
new file mode 100644
index 000000000000..8b98f3daa1d0
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.1.3.1.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3.1.ebuild,v 1.1 2013/11/06 19:06:35 cardoe Exp $
+
+EAPI=5
+
+#BACKPORTS=062ad8b2
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+	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="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
+	systemd"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( sys-power/pm-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	python? ( ${PYTHON_DEPS} )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-misc/radvd
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt"
+
+DOC_CONTENTS="For the basic networking support (bridged and routed networks)
+you don't need any extra software. For more complex network modes
+including but not limited to NATed network, you can enable the
+'virt-network' USE flag.\n\n
+If you are using dnsmasq on your system, you will have
+to configure /etc/dnsmasq.conf to enable the following settings:\n\n
+ bind-interfaces\n
+ interface or except-interface\n\n
+Otherwise you might have issues with your existing DNS server."
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~NETPRIO_CGROUP
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~USER_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~SECURITYFS
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~BRIDGE_EBT_MARK_T
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MARK
+"
+
+MACVTAP_CONFIG_CHECK=" ~MACVTAP"
+
+LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	python-single-r1_pkg_setup
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+
+	# Tweak the init script
+	local avahi_init=
+	local iscsi_init=
+	local rbd_init=
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
+	use avahi && avahi_init='avahi-daemon'
+	use iscsi && iscsi_init='iscsid'
+	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
+
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+}
+
+src_configure() {
+	local myconf=""
+
+	## 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)"
+	myconf+=" --without-xenapi"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
+	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)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+	myconf="${myconf} --with-vmware"
+
+	## 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 rbd storage-rbd)"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} $(use_with numa numad)"
+	myconf="${myconf} $(use_with selinux)"
+	myconf="${myconf} $(use_with fuse)"
+
+	# 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)"
+	myconf="${myconf} $(use_with vepa virtualport)"
+	myconf="${myconf} $(use_with firewalld)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf="${myconf} --with-qemu-user=qemu"
+		myconf="${myconf} --with-qemu-group=qemu"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf="${myconf} $(use_with audit)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# systemd unit files
+	use systemd && myconf="${myconf} --with-init-script=systemd"
+
+	# 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
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	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} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
+
+	keepdir /var/lib/libvirt/images
+
+	use python && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+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
+
+	# Only sysctl files ending in .conf work
+	dodir /etc/sysctl.d
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# support for dropped privileges
+	if use qemu; then
+		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
+		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if use caps && use qemu; then
+		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
+	elif use qemu; then
+		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if ! use policykit; then
+		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!
+
+	readme.gentoo_print_elog
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+}
diff --git a/app-emulation/vmware-modules/vmware-modules-279.1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1.ebuild
new file mode 100644
index 000000000000..bef2d4c23aaf
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-279.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1.ebuild,v 1.1 2013/11/06 23:08:20 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE=660
+		KERNEL=="vmmon", GROUP="vmware", MODE=660
+		KERNEL=="vsock", GROUP="vmware", MODE=660
+	EOF
+	udev_dorules "${udevrules}"
+}
diff --git a/app-emulation/vmware-player/vmware-player-6.0.0.1295980.ebuild b/app-emulation/vmware-player/vmware-player-6.0.0.1295980.ebuild
index 3020f452102a..dbfbae20b5ec 100644
--- a/app-emulation/vmware-player/vmware-player-6.0.0.1295980.ebuild
+++ b/app-emulation/vmware-player/vmware-player-6.0.0.1295980.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-6.0.0.1295980.ebuild,v 1.1 2013/10/19 15:42:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-6.0.0.1295980.ebuild,v 1.2 2013/11/06 23:19:57 dilfridge Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="vmware GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc +vmware-tools"
 RESTRICT="strip"
 
diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest
index 4ba600ec934d..b0cc30c10149 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -8,6 +8,8 @@ DIST vmware-tools-freebsd-9.2.3-1031769.i386.component.tar 15216640 SHA256 a54e3
 DIST vmware-tools-freebsd-9.2.3-1031769.x86_64.component.tar 15216640 SHA256 4d4047a0ffaa13aa546f065a50e345d23128746fefa4e6f7ad7b54dc947b1276 SHA512 741b55b32a04957efe42684288447faf346c6a13cbb67819984c8efcf18995f75979f7db2ce7e37f4bfcc9b2a3c867c851e2d5e4db9ddf81209ea296813a8e44 WHIRLPOOL b44274d75a76214e1b4581143825f246a0345da4199d4692a3a0d6bceb360c8402bb0d6fc6594d2e20c0532cc40a27a03f1e1e98071be7ec67c4640b504936b8
 DIST vmware-tools-freebsd-9.6.0-1295980.i386.component.tar 15155200 SHA256 ee52a15283a7b563af50227c25869a2c1802237c202b2b270e5706937d54cc60 SHA512 ab3daf19d0164d6b64273255be9bc1270c5714919dd483e2f46dcdc0aee55be6a34656a1b28e77ff441daa69ebded262a7ff566c1a4520da78b4ecbda3b93e21 WHIRLPOOL 762b6ec4d925e0804d52cb625da910792efed627c2c7d4f5167342d4454715ee8b057076876576d066c4bfc01acdaaac6c4a2ada4682aae5af54d7a13aed4ff5
 DIST vmware-tools-freebsd-9.6.0-1295980.x86_64.component.tar 15155200 SHA256 de2b6ae67f2c5319cf818cea99ed8b99a5d8ee8fa3e62e3887941f2a0835451a SHA512 6bcfdf3925d95d7a009470256e4f87e2b6a802f007329e51549199162d22313d1ffb8835f74c6327a912855fd53f1d7f0437b1e3206eb9881b7cff0cf5a827f6 WHIRLPOOL 280d0e4c76db83433f6cb4935c1af8b49f50a9725a4e55b2f3e44d4ac9693a7cb378fafd4ba952b430bedc8e145e30c33449799f3a68ebd79170e95e6c0d7cd3
+DIST vmware-tools-freebsd-9.6.1-1379776.i386.component.tar 15155200 SHA256 a3be78504eff68c089599ff4989bb4fc3cbc829495ef6dca8f9d2c86437bd355 SHA512 d6f62180756df7f7aedbbbd7cd828ed417446f90f718216d5b113c9bbb069486ec0fc8e9a8d7856f6dc2e81bae28650992513380994f4fcce95c130b92c558f0 WHIRLPOOL c4ee83d9227771494cb2c651ddf77b6cf39321209886741e14528a6f333c55bb2f499d01ed7168adfeb0fcb1bd55a4b7e597e8b3330dd014914945d6ef6eab6e
+DIST vmware-tools-freebsd-9.6.1-1379776.x86_64.component.tar 15155200 SHA256 941e58d81e00a11b4f611475e5ecb4257c78380ceef42bd9a3f2341b6bbad43e SHA512 3a1d3e49c6ccbb174868925b5d980e9676e61c61b6df67352cad6f96a004902466ba26e18ef4919ae5afdfd0e7b213ce9754fd97e39bd0873a0da695f11f046e WHIRLPOOL b37985ac5017d3bf306a10b5414d04c206b6f657b012609b0278aa79ab238535782913e5f31918e6906e6b48a95e26bd0cabe3433b380f4c472fd57c58308942
 DIST vmware-tools-linux-8.4.9-744570.i386.component.tar 107786240 SHA256 eb623c34b03dd271e68dc61bf1c02b0a8be6066b2304327f071e06879b9dc8d3 SHA512 dcd6f72de69cb0483b4f03dca7ad7370101eb08edb1ceac2c0eba294d5a17ec9a7c34a64d0de9cbb35203ea07830590f811d8c370e044b1f967c6d444250320a WHIRLPOOL fe2ae28a47c86277447c31a0a1420b1039f50eb1f716661d4acbe4e62bb63101251921e7d9a7e2d93cd83f5229f94ea8c06dbc40336b003fccee0f3ca8fde59a
 DIST vmware-tools-linux-8.4.9-744570.x86_64.component.tar 107786240 SHA256 30c9eec5ebf13d224cf01b321f858d8ef8ee16c823f42c96f94e63eaec1b9566 SHA512 53e82445551d21a283f2521440046c5d0187b0a6b721de588fd1082ea425a853ff7f22067c1f9121c1a48e16cdf25f3c16de027d1f06aabedb3d3df37495c27c WHIRLPOOL 64dbe421a0ac257597f85591a3b33c8f4e09c5825459afbcdb0eb3c7fafceb815ed4aac29f36bc9f940a6304e8ab7046977b4192fc3c23f4e7e0020c23f43e28
 DIST vmware-tools-linux-8.8.4-744019.i386.component.tar 60129280 SHA256 1abac226110078a8fa373f1c8b12efbf2a1438badb2dbe570103b83b8a245641 SHA512 177ac6f66d992551364e243ca5de1dcd742c67b7d848ce11e126017085c22e4f0dbb23f4b3881c0f5eb742f8c5d506f8db00039e6e86a0eadb9a7f0807342f57 WHIRLPOOL 137185d451953656a7677ee645152dd2ce6e6a473eed9eda19756b8ae5500edb2cb8a282853d406e8433d10346dbe2e144bf784097e30a7df2a1b110c6c55156
@@ -18,6 +20,8 @@ DIST vmware-tools-linux-9.2.3-1031769.i386.component.tar 66211840 SHA256 0383d63
 DIST vmware-tools-linux-9.2.3-1031769.x86_64.component.tar 66211840 SHA256 be5fa35af317058bffe98979b3b1f77eed416f17c7f6ee265a4717bbe3c9e718 SHA512 1f26d724e8e50df9d34333e44831d002ecd1a8af43cfed575c092316c4328ef3f34ac52b32c81ad6eb01dd362947ed462b09af080ee5e19cfd8aa89fbf83cd1d WHIRLPOOL 7292d3d69a46ad97b6decd5dff6c9c5dc19f76545965c6b95a904a14755072bc061742c458eecf974e8ca910af5d6464ccc6708c00c647095c3e98856ab628b0
 DIST vmware-tools-linux-9.6.0-1295980.i386.component.tar 60549120 SHA256 e4449faab4bd24b2db643d131b16089e98f48970530042470ed54e85e3a06ca7 SHA512 706858f32780981a01999fba805013c3d305382842143327f4d391796c5ecefaccd555ec3d90cae69b78130b8f761b36b7ed0346387e6d11f60caa3c68cb69b7 WHIRLPOOL 6121e26e31b1d3bb8c6e29d1daa28b87a4f252bdc63f0a43046fc1a22e9624bc4dbcb78a9adb38554235ed7ea3ed2d426cf63a92114425a78c368ebffbd8e7be
 DIST vmware-tools-linux-9.6.0-1295980.x86_64.component.tar 60549120 SHA256 0f230ffd93d0aa77a70f0c025d98ca9c5f6bf5ba34271e4eb07f4beb2bc50375 SHA512 19406c695ec80ff48663d5dc30dcecb16f7e5032433ac20778b62f900f7439742073c3b3c238f9693c1edf9e14a9318986ffcdcc21184217d606413d25c735fd WHIRLPOOL cef85a359cabbac3cb922f4fd34615b58de087cdca511e54d1b0b5d48328edf28ef97e7f5045d4f76c1060bc4a27f41dc40fba7311e5ce2fc67646390a053a74
+DIST vmware-tools-linux-9.6.1-1379776.i386.component.tar 60518400 SHA256 88ef45021e7dcc2197bbbb2021703000065c7aee0df35706b6c0927e06b9a8eb SHA512 1047b481d20fc3ab2818bb540ba0af16e8bc0f703af95e7f78449a688324d73f32af8650a6325400c38dace5ce582c71e1079c08605db69c45c0476dbe98997e WHIRLPOOL 70ab1d8730f95c2c628d397951f922e3022fc938676e330446ba3bc357eba9c1b0157c319bbd3857d46694e0296e280f88f5334af4ed6acde98207c260cad4eb
+DIST vmware-tools-linux-9.6.1-1379776.x86_64.component.tar 60518400 SHA256 b9d453f210891c1f76d70a45c6e463465940af27826006ebba090bd71e7d9590 SHA512 99b941fc7ce87d122f9b66d19d0d9406ba6d479f7b4ee782f261939694768c42bc31fb60974e4e854fe86964ff24f4a9ea7dfa1f8ed42ae697640d19834b89c6 WHIRLPOOL ab6892d084be06d753b1e452316ac30c38cfd1fc2607181159fe5d3ef5f2c9b2466145cae5f2f93c95be1010bc5484d1a39b4ececc9e9fdb3439a4fe64229521
 DIST vmware-tools-netware-8.4.9-744570.i386.component.tar 81920 SHA256 97c7acbca92b27084326bab7598534552f8d4537924b0cf7633425f61c306519 SHA512 0452d8b216b8c4b9541d9a02611871dd9523fca1d5c741b0d6f7532cea7b0a8e7238b46254a65ccf8c1b99b72b109f8d13b5c4678cb81f5d0b19d4a9ea5f8c6f WHIRLPOOL dceb43d44bb66bab69700b739a580396459656d937ea6d25e6bdde790644dca161f444469ba16eba91754ad3a2a443375134996a3effef9161c45e1c5d12c2a2
 DIST vmware-tools-netware-8.4.9-744570.x86_64.component.tar 81920 SHA256 a3256cc804c0f73e5e01a1b0e81827a7dfbc42d4cda701e1b19bf6961a617af0 SHA512 c2c8207efb2549aee64f6b55944b750076f801599e06d3459bafc7703f3b3d0bb366239d4d4d53a277db23b156a7cd71abb7ae4190fccc83b39da4c86010084f WHIRLPOOL 04dbec8f78ce8bc0fff960dd015a511000ee519e76c0c23c27150b98b9942de67010ac4c050e8be9b2937569be4705214e3a4b7907be46e7bd24d45af01c0bb8
 DIST vmware-tools-netware-8.8.4-744019.i386.component.tar 81920 SHA256 bc77ece95283d4986c753f7696575d2bfac520a68f150de314cee9ac00877e2a SHA512 704c1d86fad22da21061a8a9d8aea8a10e6f100c06bf2f0de7c4f4c97cc563a60ed47f8c15753f6460801dc2d23e27abbe348379730cfc4ca188df5fe67cd5b5 WHIRLPOOL 41e9b7247fedb9f6d2c53895b3a31449c613191dc115beb6f48b00c0c260885514ea3d094953ada92ddbdb8a8a496274d36492143826d45a9b9a35a55d69df84
@@ -28,6 +32,8 @@ DIST vmware-tools-netware-9.2.3-1031769.i386.component.tar 81920 SHA256 906680d0
 DIST vmware-tools-netware-9.2.3-1031769.x86_64.component.tar 81920 SHA256 e1279aeb2d402fa87c643fb5bcdda695fa39c93495b9a2b75b4e80a713176817 SHA512 542c350d1052a9bad0930138042424a0c91f55f861511e10ce4b81327a40dc1c8a339606b9118ae1e37a3d4171b0617d0205f74e03c2e28b398b2663575206cc WHIRLPOOL 5b146c80e1537f30c8051266994e44d366cd5964539ab1f2d51e82e0e9c10802f78de38bfdcfd83a0f0f91299381aada5f77dc3a19a759bf69b932a9718a0900
 DIST vmware-tools-netware-9.6.0-1295980.i386.component.tar 81920 SHA256 250120c9300b557c7e08fe1b70c5b058305950fb7855ddbad2226615202a80d9 SHA512 8b0b84e640db7a6fda3f6d0525f4890df6fafb01caf9a0ae606d67f1435ad7938ec044914a4036e01a9ad79e09e45cb9bc58b6acafdc9a58a91bd685428b0e89 WHIRLPOOL deaa5f269180657f93c774b8c93248ddbd795f5b58bf5e0c9cd478611de508741f4d6a1abaa6f41dbe218a8089806cb4a3d2b6255915d4b7468d06750d85eba8
 DIST vmware-tools-netware-9.6.0-1295980.x86_64.component.tar 81920 SHA256 be95e297f990ca6edb49398d11a1369db84b562127bd4895251ab1ca474d75d8 SHA512 8e38516ec36ec72a48a7e12806e28ecc01260383ae408b35e625f1aeb6c6663a205006b85437682418a8dc92766315b65243c1d83db4d3e352d9b21f2b7ff8bf WHIRLPOOL 76fa1754eff7a66bc3470377d43f941be228747d8405ac2eda2daf40c82f2be2e5ff2fcbb5e1a8b8aae7cf59ee8d379ece16e15da2e5e532613e11dcc46b2082
+DIST vmware-tools-netware-9.6.1-1379776.i386.component.tar 81920 SHA256 c5c2e4870bf8e9b36a997018b2b40b736ee445b23ac0ee6cf21983cddf67747c SHA512 33e94dbe2c7817703219a00a8dc14af97cd827ab1602c2a17c959dbed072185a2f8c3ede2e075318b67d457f35599054d88e78bf0af190c97e8b5e9039a9c9a1 WHIRLPOOL 96ac4f31879489d9615e5dcaeee876b471a30b7caf54cddc8291143dec66ec9a23664ea527e42249ae44dc46d631b376ea32518335d55e615cde6cd0022640c6
+DIST vmware-tools-netware-9.6.1-1379776.x86_64.component.tar 81920 SHA256 4dbc8ebfecceb0d281db4f75a535e7648f6fbb921202dd5d9dace8e6e8e3db8f SHA512 2497bfc1d1c31a2e7cc787bbf11254aa5d953e19e16f9fa99548a1b05424a6713106f63e3e1981d46d8c5045ca095ab6070b7e03fc934a064f91323b5b224a44 WHIRLPOOL c628730b5a8e1750babdd3d8bd97d25869fc01751cb2f9532d0024865455b7d89b334f5b34894ffa2262838a740d6c51e61e6000b673532a1014e5ad9028f7f7
 DIST vmware-tools-solaris-8.4.9-744570.i386.component.tar 20049920 SHA256 12f868ff8015de412edd98e51f2bb6d4c016de87244916d207203003c44450fa SHA512 f2b7d5c8a8b25ccbdf6616e7383bbfebb302485040e2aba88f03afaf21761ec87360f64b3d88381e0d3668eb58986ea33fc635e076a2a85a7939fa380267933d WHIRLPOOL 9cdc91ab8f96d5dd5810deebe7b881aadd15b0c190779b3213e8a8b4ee5ff5fe2a097bb3479238010d733e350dc83f0ca38b5739f5cf438b22d95089574ad75c
 DIST vmware-tools-solaris-8.4.9-744570.x86_64.component.tar 20049920 SHA256 d0946fc5d4d798c237b4f8f38a154e288fb8215e1910a0818a18913814e69b59 SHA512 e5d927ea3e54912396914199f83dbe18e400e6fbc4e109341055972944cfdfafaeead0d792f660d0695ce8f02f0ba70260dbe1a4dedc0cf234e1f288bc0280bf WHIRLPOOL a559282842a8da2ddf9a92a44f5e33e2beb31ec58ef36bdaec688b42b44832dada1c15dec71ecf5677cc9fff68290a6a14d298babe8625555766b2c9d5acd953
 DIST vmware-tools-solaris-8.8.4-744019.i386.component.tar 12779520 SHA256 c11c549fff28288f0402169fb23967ced04209511603959e3da434ae293deb9b SHA512 f84ea504a4c2cdfd50c845355e1c94ce77c3c3b47f38bb8c1cd15c7b7aee0ebb233794e1033d14421ea4951e385522e2889e919dc5f691436e313f473048d386 WHIRLPOOL 87a77b407d26c5856fc392b0d9e6e8ee14dd709c8f335567ed5af63590789a1b8de1e98214897496bb42e9f15baaa8acef23ada0aa1eaf0b984483fe861c8b45
@@ -38,6 +44,8 @@ DIST vmware-tools-solaris-9.2.3-1031769.i386.component.tar 13096960 SHA256 bb38d
 DIST vmware-tools-solaris-9.2.3-1031769.x86_64.component.tar 13096960 SHA256 94ed550543096d9e03326a5adea93928f24f69349e5bc6a995e1fefead7112d9 SHA512 04724855a497aefcbd1ccf6ddd1e793eb6fd4bc65960f59f0e0dc95096434d8fa1a5a12b49a20f7e293427a794e4c16df06e4a844042fd21537b2513992bae41 WHIRLPOOL 223977e8ff88601f58752b7a2fda99a15212858d8045504aefe181b18ca29ca4b09dd2b07ddc4091533fd07da5062777000dcbd1e557a789688dbec70fae9069
 DIST vmware-tools-solaris-9.6.0-1295980.i386.component.tar 13096960 SHA256 e68ff904b6afd4eae036f3e0cce81345ca8a987e4b6ff8263a6b4440c880a68a SHA512 25e577990e76b29267b5c61012c656a12bc3ccea54e7df07092c4ceeaefe4404d3f27aad042d3a72eea7e615ea944e8f4ec6b5387377c3a11962e0d69e4aae1b WHIRLPOOL 268c5d89b497c554d77f4adcd16748f28ac77e4aedbd132c4ac2b15131727e237ce8b792bbe8e67c41a5739b29675104055fcd8bb9dcbfe95ebcba83cdcf4030
 DIST vmware-tools-solaris-9.6.0-1295980.x86_64.component.tar 13096960 SHA256 53c2df472a53270c4811aa5e9341065cb51922cc4112a7f4aacdf35ddce5213c SHA512 8166d7ab1d89370f679e89cac336841985450459f583bf281e92ede7ce6639ff72ba1443f61098b8a9820456fc3808a08aa1760d3832f5e475ceaae4f1033494 WHIRLPOOL 42d0e9ff39b75298d9c099813cd5afccff4e30c407707e7a862a825f0232119694cde880ab6b83e9f135f7ffab8bf36ee3db1ac7f22bffea4014eff5ee7b029f
+DIST vmware-tools-solaris-9.6.1-1379776.i386.component.tar 13096960 SHA256 f6057b82bfc070e506b51503c4c7e3dd66565dcc06a2f7fbddeaaa87d76283d6 SHA512 aee20ebff38ac19f7d4512fde2cac6b152af61b5b669eedb152530a9bbbad32136aba9747e4f8c57e78c27b6a24b08c026503b6e7f86fcb427f03e4d5ef28b00 WHIRLPOOL 97c5aed51529a8a38f75ce602cdf88821241388d1ff1a3abeaa7ebad041c047233645b020f2ba6719bc5a3cdda24bdf06ffbd43672dc17ae22fc794a8dfa3b10
+DIST vmware-tools-solaris-9.6.1-1379776.x86_64.component.tar 13096960 SHA256 96ad456174dd66acf25dee3fd4f8ecae718120b0d21296fe21bf22d0fd24ec17 SHA512 c41a707e8c68c8e1fff32cd962e9f8d0d30044346e823e2171bf3dc8392c536de97a8b8466af5088869625dfb96c8746e74f1d6080c62183b51c5e0f94fd885a WHIRLPOOL ec4900bfc58325bf4719c4783f42e590a83032529dd8694d912ee586584a49cbec68f8945a25666d8dee94ea7fb50d8e28c33fca454ab68e501cde0c6fb8e497
 DIST vmware-tools-winPre2k-8.4.9-744570.i386.component.tar 11059200 SHA256 7e203ff59853450256389b4d7540a6ec30feb9f8fff238d579b1a2057418a94c SHA512 22d2d6b5d6c8abc9af89fc5a5afd1836322f1f9974a1e205873525989473682c5284f7bf959567ad083dfde1cd61d6b91c697564e845f5e0b3a5f01f59741b63 WHIRLPOOL eab49f5f482971b2cbaa6d5dfdfec1b1e73971fb37e08373601b2d2e04b55b0a9e7f3d89bd46e0aba2a3262ef89e41a835a7d547b803d871125f797edfaf7b90
 DIST vmware-tools-winPre2k-8.4.9-744570.x86_64.component.tar 11059200 SHA256 6cc456e8162762f0d1ea8bf2f3595ab6943b9f0bb2954f60f91966c1dcd5dbf5 SHA512 b8976b16953b71b18a575b2dce25d184a0aabbe9408d9c01dc0a136d6339f7e26fd1440fbd08a1897cdb5568c21f9842f6b6a43105697a1f8d473955d5879e4c WHIRLPOOL ce4122f8d053a0ec5a831f3e0f0bafd01519cde9762aa039c4fbd74c653efc4524d99093402c7f59e97d93254576fac7065328d6acff5e4e2182d8fd3302f5df
 DIST vmware-tools-winPre2k-8.8.4-744019.i386.component.tar 11253760 SHA256 71c7c2be7ea2e2c344c6d9cae4883c6c14470ad7693c0228379a597519da8a83 SHA512 3c6196ef217053d8bc99597f8393ab3678b1991ce2d24838f67df6ce97ae884870637f1e043e6c8047006546624831d38a3038fb14b5a2f165117d6d2c3d8dc6 WHIRLPOOL 967b33c3fadd97eb11c2c673317423ea0bd617e03ec958a70e08c5526be9c5a5b95ad26feba2f1189ce5df81f8e3f85818c0e59b2079ee5ae4a5cdc1191b5a10
@@ -48,6 +56,8 @@ DIST vmware-tools-winPre2k-9.2.3-1031769.i386.component.tar 11253760 SHA256 a831
 DIST vmware-tools-winPre2k-9.2.3-1031769.x86_64.component.tar 11253760 SHA256 9b51d31ca911ccf95db641834ae79220db44df53c2fd5a91d6b6e382cffdd39e SHA512 60f99dcb92794d3b798334c91966658f8bbb5cd11a435672094e0a0ccd0b070c0be277d38a9dfac9df77db6d7b91da806fa50a13e67b30d19c33fe153ff63a2e WHIRLPOOL 8426b651f35902f1ac87d556b330100f68ca1c615011301e6ab0dffb160fb4dab4f205f293ffd83ad74c67e9776d54c354f9fe98d70c596cec165929c5a1ba5c
 DIST vmware-tools-winPre2k-9.6.0-1295980.i386.component.tar 11458560 SHA256 00410d818f1133f3eb8b6e8a4ebe0a5dc2b6a2b26a2f0932ca5bff02d2f09203 SHA512 18d26efdebcd7421ea14bd18714650dd590f7ff1aa2fec8e8d10f4fe0e4c649b73706537f649a3b7244e5a6ed6f57651553870c968a60d28c7751c939dd44dcf WHIRLPOOL 296f21983fb33bcec4b5a1d8f2dea8162c6c8ea9610acfd60a44d9948fd1d8b39fc3b32d4c6534890dd4a99544d37de5c0e1be94326c1fc1438849f4fe0799db
 DIST vmware-tools-winPre2k-9.6.0-1295980.x86_64.component.tar 11458560 SHA256 688895bea89035aee4cd3ae9b737ac3dc76e98675d82174383f5e9505e853dbf SHA512 735765fc4689b1d5da7d0bdf4c776159024fde4a83e12e846531b6028d9bfd25d6ba09372bf974d90249a4f3762b2d8faf6a76f31d61e1d7498cfc4652f9750b WHIRLPOOL 120f18ee409c6bdfdc03247cbaf8f3bbe056f2f9cc56f539529be781391defdb71f35e96b01493940c65623d9049a01925493170d6afaa4073c877538f57f64e
+DIST vmware-tools-winPre2k-9.6.1-1379776.i386.component.tar 11458560 SHA256 9d46fa6842684d099f8eaf3459aac8973644193ebb4c663164c04b3f69536872 SHA512 6ecb3726235d1cb156898f6887508f7540a5e93437bde43e86740bce15cb8db4a9c9bb4e2d89ef1f5670f37ac11a457410551ff70d8e096d881b51630fd0b40a WHIRLPOOL ed4a441ceb6eac141ea009d871e4a2315e63a1f4f086fb93055b6c2de97e2d06fa98a772a4fda4582cd2e2511a0ace85b2ed52127f1c7343e3e46e122808602d
+DIST vmware-tools-winPre2k-9.6.1-1379776.x86_64.component.tar 11458560 SHA256 99d603372e69bea2e57e62c3c78dff5ac8119de3e89b438a8cf83a22b0f9774a SHA512 0f4ef0bb79cac357cbdb62d918d22f63a6f1ced51a3d15c10c32dd25dc97474858c85ce9dd080210e07e0b5f7c40741fb7695f1cacf84f5c29c8f8abae15f2c8 WHIRLPOOL f523815ad06bca65719ab99bc54da850a9c67568aa9e6e3ac567ec9669a81d6b554b91ddefe774387cadb014e418b33bb47cc3651caa897bca330a9ec1f22df8
 DIST vmware-tools-windows-8.4.9-744570.i386.component.tar 38246400 SHA256 27a25495b0028745093968f771d66f186071df3e91760b3c2ca7be56a3acd805 SHA512 a51f9fb2010910948c91a3bd51c1883faff94e71ef89c7446f71f0fa63a49b423033e96e1b9361ddb496fbb3fe46fb36d86c2f58c0950aba61c3c0057c1afa47 WHIRLPOOL c4e428cf0e8888e7f19b76b30b554d6b6ba9f25c272e50eeff6613631e6edabeb530bc0f2da2e212bd32b8fd9778eab32ea690428b6de02000b56c2b3f43e139
 DIST vmware-tools-windows-8.4.9-744570.x86_64.component.tar 38246400 SHA256 424ddb54ea3cd0b3f04af128023a9a7600f753ff46e8bca72294d5c3cbbab90f SHA512 be77a33ca9541d45ed0806742b9745db0bfd743bcd618c7f030e24b9f09b91df3748f6cb60268183671a6277e20dd29e2f4cc61c5c68aab0079d860e94dd73f6 WHIRLPOOL e34f9fcc13a6a7a90681cb41305a31d87dd26edf83fca1c43306aa1be207a86992897a0e01840d4a4052d40147609878b390236ed18a3ffdf8d428b348263227
 DIST vmware-tools-windows-8.8.4-744019.i386.component.tar 52254720 SHA256 60272cfb2ee1df444a29a4ed740ab6fb8f82baec7f2327452046fe2e8bbe92b0 SHA512 23b524e60271771c51cbfb0b369b5f2040d0993d1f7c32e2eba29fd9f82b444d649fad59f028e57bac31f00e5ade33c16a65b94d45379fe944b55d8a91b40fcd WHIRLPOOL a7abb96f97fb16139e3396541a3edb3b4840c3a395ace681a933e5349cba8eac0f7d105512bd56e809ced8c46936b4578129f7ed60d67fedfb556cf3325e922a
@@ -58,3 +68,5 @@ DIST vmware-tools-windows-9.2.3-1031769.i386.component.tar 61777920 SHA256 0fa4f
 DIST vmware-tools-windows-9.2.3-1031769.x86_64.component.tar 61777920 SHA256 dbb7f6dbbcf9e44263193e40ad89944a45ef860f4f3b4b51d00ae1602f863f8c SHA512 818e2895c57be6792e82362c9616e2e6e8638997bde65ecea1416f71ccfa9681fc5cd44cd3356780ab35345e6b19ac8054a05eb8424dff1bcd779c9b686455a9 WHIRLPOOL ab847bddd07b029ba7a75fb6ae96133211d5a412fbe2059f851ae249854357dd0e25ab28df98fc2a3ee33f5aae08587a8b4bbfd6a60a2313f77fe6f98a1a3a3d
 DIST vmware-tools-windows-9.6.0-1295980.i386.component.tar 69222400 SHA256 2ff96d57f8cc201107f6d647cde8d54f55f8abb31370a2bd45bc7b3fbed78862 SHA512 7d2824cd7e78803a88d0341a96e7fda4280bc8482f7bc56872bd7770ab2f611a748ea1aebdb0190d562cd5f771905e2acddd95609593cb8cc2d6ee34abb295ef WHIRLPOOL 0050003743c880a97998ebdbb2c7039aac702d0cf3ca53bcc884e200777a638d35a75717117ea0925f513da1d9b725d1dd35931d6e69efd7708dd3c7fcb2d197
 DIST vmware-tools-windows-9.6.0-1295980.x86_64.component.tar 69222400 SHA256 c6c8d9fca5f609074c0c5cffb6704e03e7adf90db2bb8b148782b576d2447e60 SHA512 b5d1e08e7acd050a6efe6888b9a0b85292d8c5a5045d38c5bb4be7664f99ded5ca1cb6be70188449e331f14b3c40d3ff4a64f4a2d188a2d94e16cd8ab6c2421f WHIRLPOOL 27051b91853343a04a14df3d014459bb61cac259389975936473b39e19b604008d5a5473c047c2416ca7cd6894e2e6911893153ac7d5afabcb755322125a6998
+DIST vmware-tools-windows-9.6.1-1379776.i386.component.tar 69232640 SHA256 cb09c083adec2bd6a10f9cb75e4570fc19019ddd98320e7cf1ddf311737f75bd SHA512 a1caf8095e8ec56cf15c55e6c0081e16dc3b25e035f1a50eb9f6636a5879b5bbadb4dd079d822b6b1c27f2279c4214eefe004e460f1c1ae70f28242d0aafd400 WHIRLPOOL e61f9df173f83e8844dafd9e226d4b8cd0530df18b4104d1229d18a8c4e8757adc35ac1085602baeb35ba4896273070739c4d783679f18085583124bd856a715
+DIST vmware-tools-windows-9.6.1-1379776.x86_64.component.tar 69232640 SHA256 4034d5f0fe06a7fb4d2dcd7159f59223f0886d2be5ea4dd1ae685cf5ff0c535d SHA512 8a1be0aae39bf7abe5c76d74f26f7f936dda2d6d169d3e5256479251cb961753abcb519647fcc6a026da11d57f45fa626d1c4a7d91a985ffd2361b2468ab601c WHIRLPOOL 2faccc4a8c04fb52bc0749dd69e887b3ad6f8e9776623f7e583590c5e1612de50bb3355372a60e850104f13f8c9ecd613e5f43ebccffe86661838b757110b57c
diff --git a/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild b/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild
new file mode 100644
index 000000000000..5e64fcd98349
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-tools/vmware-tools-9.6.1.1379776.ebuild,v 1.1 2013/11/06 23:14:49 dilfridge Exp $
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
+
+VM_INSTALL_DIR="/opt/vmware"
+
+for guest in ${IUSE_VMWARE_GUEST} ; do
+	SRC_URI+=" vmware_guest_${guest}? (
+		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
+		x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar )
+		)"
+	IUSE+=" vmware_guest_${guest}"
+done ; unset guest
+
+src_unpack() {
+	local arch
+	if use x86 ; then arch='i386'
+	elif use amd64 ; then arch='x86_64'
+	fi
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
+			unpack "${component}.tar"
+			vmware-bundle_extract-component "${component}"
+		fi
+	done
+}
+
+src_install() {
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+		fi
+	done
+}
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index a9cd3253a23a..bce317655a64 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,5 +1,7 @@
 DIST VMware-Workstation-10.0.0-1295980.i386.bundle.tar 282490880 SHA256 51a085502cf8c2afda111fca0d01465939d1f3e56139465baa62c60fe7411198 SHA512 33d3cc5990bc403829129a6730efbef4427fb0da92e4b6161dae7f408892f9282c79fa694a24e9179a7fcf687d2fbd8278f8176ff43eba15c22647a3352466fe WHIRLPOOL b70e361113a35725d9e9fad1379bbba012941ea2ba8ee568954192d3a90a3486ad8de97d4cc483b5a46d64bc8bf9b3dd75ef314b01bdc45c99af3d18381ff1f1
 DIST VMware-Workstation-10.0.0-1295980.x86_64.bundle.tar 253061120 SHA256 adcd30b81f7825ac41a10246105c38953177ad98195589c47f46b4313ed625e3 SHA512 5fa16700d02899821cd2533e4032dfaaf7b0066bd87af2a4c219eb72afa45833785054112d589b90e7e5665d24ae08cc484380966fa687cc5517fcf830e29d09 WHIRLPOOL 40bc90959022b8251828e6fb05093c601bb5a1afaed79ac54c5e2a4dfb061f49fc88dd3f885c1063ac2e8f7790e164ab146dea71a4f05d7a19556f4ce3dd218b
+DIST VMware-Workstation-10.0.1-1379776.i386.bundle.tar 282562560 SHA256 14482ce63270b16cd0ffaa176fc84b0d2e82d7f49f082c4c277a4552156ac351 SHA512 f53eaf70b905e235fe16fc642303def43155ece6847179b48c95cdb9aa4ea2bc2d16d0126178ab021a25101c955b061f2572a6e55e53a10cf89383bec1a6016f WHIRLPOOL 250490facd8559fe1e920c1bfe61dcbf2c493b99504d65c1b2b961ffee837342d923c9858585893bebf9657dee058db2d6cbee5ced957405b802e13cbd37891a
+DIST VMware-Workstation-10.0.1-1379776.x86_64.bundle.tar 253132800 SHA256 4fef8984cb30ea04f204ef4dcdc9c5740fe31d196bb89c9af4f05187f749ba06 SHA512 e92a17bc6c21a365bf402fcfb07ffbc7c0c6adf61a040f148a81dafb9634c8c01db81479e48ff37f0ee43f72e90cca9aa54d59d0985006b1f9d0b2f1b6313eb5 WHIRLPOOL ba6b3f9ba03d4933010ecd37a41034c327943ae0e6aa2110b603d4d9cfa844ba0b2c1973eb8099fbbc3deefb82525ea0329d28cb871583812440a901713941bc
 DIST VMware-Workstation-8.0.5-893925.i386.bundle.tar 188180480 SHA256 79033aa837a1b2fcf1229c407b159586152d41f3c624ae1745264443bad06a90 SHA512 2ea55d6ba1b64ee33ca73af46ce4ba58be441ecb973e4f9e3711b7d516b1d6233ee8e125c0d90226169258a5bbccf73f67ea593a1eaa48e7368275f545db3306 WHIRLPOOL 270b37814ee4c19bbe3e1d573016cf1899a90dc1c3500181eeb336220eebde276fb11bb4e46d3121a8e1517f749fe9a127eb76f642938d7b8e8f22ae3fbed556
 DIST VMware-Workstation-8.0.5-893925.x86_64.bundle.tar 187729920 SHA256 39010a8b712c9e9ea86f0bf32b1ad86a7788748f00292f344b1bdea899a6ac0d SHA512 010cbe7a6ffa6cd07b6daab8534c4da260aae17a6c7988e74792aa450f266bea306cca49820a65dfb3e0b76e912a5430fe98f4f0446f750fe26b867cfe2ed48d WHIRLPOOL dbf6994fbf87b3eca0fe882075dbdd68de599c7b699e609a43d3bade5e23704158ef11a13dea12b41c2c3c7d57ba493e324b4ebf2b138c9cf5835699ba76ae55
 DIST VMware-Workstation-9.0.2-1031769.i386.bundle.tar 264898560 SHA256 f23efa3db418790cffa38a90639edd0f5e0834fa98c69a3146489cc3774a71c7 SHA512 ea38c747e236e3a5ae3da809f22a997044c3306239afbc2cc28dfd04f3589dc23e35295bcb5dfb7f5ea687a908b790fb56afa062b7a5cea523c8645d94d652b0 WHIRLPOOL 18aaed121c973911d00a89790b98c8b22b942d29a3580181e7937fe27882d4cd30b2e0a7c13d22129c2e72c7cbce87cff0c80f32e6726d25cf67ec159506db46
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776.ebuild
new file mode 100644
index 000000000000..b8de98846b5e
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776.ebuild
@@ -0,0 +1,491 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776.ebuild,v 1.1 2013/11/06 23:07:41 dilfridge Exp $
+
+EAPI="4"
+
+inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-01"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
+	"
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups doc ovftool server vix vmware-tools"
+RESTRICT="mirror strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/expat
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	media-libs/libpng
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	!app-emulation/vmware-player"
+PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+src_unpack() {
+	default
+	local bundle
+	use amd64 && bundle=${MY_P}.x86_64.bundle
+	use x86 && bundle=${MY_P}.i386.bundle
+	local component; for component in \
+		vmware-vmx \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-workstation \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator \
+		vmware-vprobe
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
+	fi
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+}
+
+src_prepare() {
+	rm -f  bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	find "${S}" -name '*.a' -delete
+
+#	clean_bundled_libs
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	ldconfig -p | \
+		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+		fgrep -vx 'libcrypto.so.0.9.8
+libssl.so.0.9.8i
+libgcr.so.0
+libglib-2.0.so.0' |
+		xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# Bug 432918
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	insinto /etc/xdg
+	doins -r etc/xdg/*
+
+	# install documentation
+	doman man/man1/vmware.1.gz
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doins vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in  vmware-{hostd,wssc-adminTool} ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	fi
+
+	# install vmware-vix
+	if use vix; then
+		cd "${S}"/vmware-vix
+
+		# install the binary
+		into "${VM_INSTALL_DIR}"
+		dobin bin/*
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+		doins -r lib/*
+
+		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}"
+
+	# create the configuration
+	dodir /etc/vmware
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${major_minor_revision}"
+	EOF
+
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+			vix.config.version = "1"
+		EOF
+	fi
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/${PN}.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware workstation, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4369-XSA-68.patch b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4369-XSA-68.patch
new file mode 100644
index 000000000000..cad655be258e
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4369-XSA-68.patch
@@ -0,0 +1,69 @@
+libxl: fix vif rate parsing
+
+strtok can return NULL here. We don't need to use strtok anyway, so just
+use a simple strchr method.
+
+Coverity-ID: 1055642
+
+This is CVE-2013-4369 / XSA-68
+
+Signed-off-by: Matthew Daley <mattjd@gmail.com>
+
+Fix type. Add test case
+
+Signed-off-by: Ian Campbell <Ian.campbell@citrix.com>
+
+diff --git a/tools/libxl/check-xl-vif-parse b/tools/libxl/check-xl-vif-parse
+index 0473182..02c6dba 100755
+--- a/tools/libxl/check-xl-vif-parse
++++ b/tools/libxl/check-xl-vif-parse
+@@ -206,4 +206,8 @@ expected </dev/null
+ one $e rate=4294967295GB/s@5us
+ one $e rate=4296MB/s@4294s
+ 
++# test include of single '@'
++expected </dev/null
++one $e rate=@
++
+ complete
+diff --git a/tools/libxl/libxlu_vif.c b/tools/libxl/libxlu_vif.c
+index 3b3de0f..0665e62 100644
+--- a/tools/libxl/libxlu_vif.c
++++ b/tools/libxl/libxlu_vif.c
+@@ -95,23 +95,30 @@ int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, libxl_device_nic *nic)
+     uint64_t bytes_per_sec = 0;
+     uint64_t bytes_per_interval = 0;
+     uint32_t interval_usecs = 50000UL; /* Default to 50ms */
+-    char *ratetok, *tmprate;
++    char *p, *tmprate;
+     int rc = 0;
+ 
+     tmprate = strdup(rate);
++    if (tmprate == NULL) {
++        rc = ENOMEM;
++        goto out;
++    }
++
++    p = strchr(tmprate, '@');
++    if (p != NULL)
++        *p++ = 0;
++
+     if (!strcmp(tmprate,"")) {
+         xlu__vif_err(cfg, "no rate specified", rate);
+         rc = EINVAL;
+         goto out;
+     }
+ 
+-    ratetok = strtok(tmprate, "@");
+-    rc = vif_parse_rate_bytes_per_sec(cfg, ratetok, &bytes_per_sec);
++    rc = vif_parse_rate_bytes_per_sec(cfg, tmprate, &bytes_per_sec);
+     if (rc) goto out;
+ 
+-    ratetok = strtok(NULL, "@");
+-    if (ratetok != NULL) {
+-        rc = vif_parse_rate_interval_usecs(cfg, ratetok, &interval_usecs);
++    if (p != NULL) {
++        rc = vif_parse_rate_interval_usecs(cfg, p, &interval_usecs);
+         if (rc) goto out;
+     }
+ 
diff --git a/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4370-XSA-69.patch b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4370-XSA-69.patch
new file mode 100644
index 000000000000..ede124b2258f
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4370-XSA-69.patch
@@ -0,0 +1,34 @@
+From 067c122873c67bd1d9620f8340f9c9c209135388 Mon Sep 17 00:00:00 2001
+From: Matthew Daley <mattjd@gmail.com>
+Date: Tue, 10 Sep 2013 23:12:45 +1200
+Subject: [PATCH] tools/ocaml: fix erroneous free of cpumap in
+ stub_xc_vcpu_getaffinity
+
+Not sure how it got there...
+
+Coverity-ID: 1056196
+
+This is CVE-2013-4370 / XSA-69
+
+Signed-off-by: Matthew Daley <mattjd@gmail.com>
+Acked-by: Ian Campbell <ian.campbell@citrix.com>
+---
+ tools/ocaml/libs/xc/xenctrl_stubs.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c
+index df756ad..f5cf0ed 100644
+--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
++++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
+@@ -461,8 +461,6 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid,
+ 
+ 	retval = xc_vcpu_getaffinity(_H(xch), _D(domid),
+ 	                             Int_val(vcpu), c_cpumap);
+-	free(c_cpumap);
+-
+ 	if (retval < 0) {
+ 		free(c_cpumap);
+ 		failwith_xc(_H(xch));
+-- 
+1.7.10.4
+
diff --git a/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4371-XSA-70.patch b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4371-XSA-70.patch
new file mode 100644
index 000000000000..f19dd96ed966
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4371-XSA-70.patch
@@ -0,0 +1,34 @@
+From 94db3e1cb356a0d2de1753888ceb0eb767404ec4 Mon Sep 17 00:00:00 2001
+From: Matthew Daley <mattjd@gmail.com>
+Date: Tue, 10 Sep 2013 22:18:46 +1200
+Subject: [PATCH] libxl: fix out-of-memory error handling in
+ libxl_list_cpupool
+
+...otherwise it will return freed memory. All the current users of this
+function check already for a NULL return, so use that.
+
+Coverity-ID: 1056194
+
+This is CVE-2013-4371 / XSA-70
+
+Signed-off-by: Matthew Daley <mattjd@gmail.com>
+Acked-by: Ian Campbell <ian.campbell@citrix.com>
+---
+ tools/libxl/libxl.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
+index 0879f23..17653ef 100644
+--- a/tools/libxl/libxl.c
++++ b/tools/libxl/libxl.c
+@@ -651,6 +651,7 @@ libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool_out)
+         if (!tmp) {
+             LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpupool info");
+             libxl_cpupoolinfo_list_free(ptr, i);
++            ptr = NULL;
+             goto out;
+         }
+         ptr = tmp;
+-- 
+1.7.10.4
+
diff --git a/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4416-XSA-72.patch b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4416-XSA-72.patch
new file mode 100644
index 000000000000..f170b4e505b4
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-CVE-2013-4416-XSA-72.patch
@@ -0,0 +1,74 @@
+tools: xenstored: if the reply is too big then send E2BIG error
+
+This fixes the issue for both C and ocaml xenstored, however only the ocaml
+xenstored is vulnerable in its default configuration.
+
+Adding a new error appears to be safe, since bit libxenstore and the Linux
+driver at least treat an unknown error code as EINVAL.
+
+This is XSA-72
+
+Original ocaml patch by Jerome Maloberti <jerome.maloberti@citrix.com>
+Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
+Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
+
+diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml
+index 273fe4d..47695f8 100644
+--- a/tools/ocaml/xenstored/connection.ml
++++ b/tools/ocaml/xenstored/connection.ml
+@@ -18,6 +18,8 @@ exception End_of_file
+ 
+ open Stdext
+ 
++let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
++
+ type watch = {
+ 	con: t;
+ 	token: string;
+@@ -112,8 +114,15 @@ let restrict con domid =
+ let set_target con target_domid =
+ 	con.perm <- Perms.Connection.set_target (get_perm con) ~perms:[Perms.READ; Perms.WRITE] target_domid
+ 
++let is_backend_mmap con = match con.xb.Xenbus.Xb.backend with
++	| Xenbus.Xb.Xenmmap _ -> true
++	| _ -> false
++
+ let send_reply con tid rid ty data =
+-	Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid ty data)
++	if (String.length data) > xenstore_payload_max && (is_backend_mmap con) then
++		Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid Xenbus.Xb.Op.Error "E2BIG\000")
++	else
++		Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid ty data)
+ 
+ let send_error con tid rid err = send_reply con tid rid Xenbus.Xb.Op.Error (err ^ "\000")
+ let send_ack con tid rid ty = send_reply con tid rid ty "OK\000"
+diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
+index 0f8ba64..ccfdaa3 100644
+--- a/tools/xenstore/xenstored_core.c
++++ b/tools/xenstore/xenstored_core.c
+@@ -629,6 +629,11 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type,
+ {
+ 	struct buffered_data *bdata;
+ 
++	if ( len > XENSTORE_PAYLOAD_MAX ) {
++		send_error(conn, E2BIG);
++		return;
++	}
++
+ 	/* Message is a child of the connection context for auto-cleanup. */
+ 	bdata = new_buffer(conn);
+ 	bdata->buffer = talloc_array(bdata, char, len);
+diff --git a/xen/include/public/io/xs_wire.h b/xen/include/public/io/xs_wire.h
+index 99d24e3..585f0c8 100644
+--- a/xen/include/public/io/xs_wire.h
++++ b/xen/include/public/io/xs_wire.h
+@@ -83,7 +83,8 @@ __attribute__((unused))
+     XSD_ERROR(EROFS),
+     XSD_ERROR(EBUSY),
+     XSD_ERROR(EAGAIN),
+-    XSD_ERROR(EISCONN)
++    XSD_ERROR(EISCONN),
++    XSD_ERROR(E2BIG)
+ };
+ #endif
+ 
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r5.ebuild
similarity index 97%
rename from app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
rename to app-emulation/xen-tools/xen-tools-4.2.2-r5.ebuild
index 3824166adf3c..9fb25769b771 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.8 2013/11/04 12:58:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r5.ebuild,v 1.1 2013/11/07 00:46:42 idella4 Exp $
 
 EAPI=5
 
@@ -224,7 +224,11 @@ src_prepare() {
 		"${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \
 		"${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-2072-XSA-56.patch \
-		"${FILESDIR}"/xen-4.2-CVE-XSA-57.patch
+		"${FILESDIR}"/xen-4.2-CVE-XSA-57.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-4369-XSA-68.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-4370-XSA-69.patch \
+                "${FILESDIR}"/${PN}-4-CVE-2013-4371-XSA-70.patch \
+                "${FILESDIR}"/${PN}-4-CVE-2013-4416-XSA-72.patch
 
 	# Bug 472438
 	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
diff --git a/app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.3.0-r3.ebuild
similarity index 97%
rename from app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild
rename to app-emulation/xen-tools/xen-tools-4.3.0-r3.ebuild
index b6984bed7560..777ffe32dd0d 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild,v 1.1 2013/11/04 16:12:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0-r3.ebuild,v 1.1 2013/11/07 00:46:42 idella4 Exp $
 
 EAPI=5
 
@@ -205,7 +205,11 @@ src_prepare() {
 
 	#Security patches, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
-		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch
+		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-4369-XSA-68.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-4370-XSA-69.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-4371-XSA-70.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-4416-XSA-72.patch
 
 	# Bug 472438
 	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
new file mode 100644
index 000000000000..b5a25356f511
--- /dev/null
+++ b/app-misc/elasticsearch/Manifest
@@ -0,0 +1 @@
+DIST elasticsearch-0.90.6.tar.gz 17854568 SHA256 2ff87847e993d52723b4e789db3cbba887f414b85bf04fd897032bc52fe0ad3a SHA512 8c1d3003ac1e75389d8fec78bd281f21738f18e4f2dd5518c7568173eb527c1d0cbb21344012bd4806c51027717ed8de0b2275703e876c7bd0028369507c9838 WHIRLPOOL 652b563edb80c3126cd230cd3b78f38b65af9ddfe966ab940f8d0850672156e17378ba8a75c6a0e2d9a7b154165bb47cfac1f619fd3092b40372e89125ccabd9
diff --git a/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild b/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild
new file mode 100644
index 000000000000..2b39753d300e
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild,v 1.1 2013/11/07 09:19:22 chainsaw Exp $
+
+EAPI=5
+
+inherit eutils systemd
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="http://www.elasticsearch.org/"
+SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
+
+RDEPEND="virtual/jre"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
+	rm lib/sigar/libsigar-ia64-linux.so
+	rm LICENSE.txt
+
+	mv bin/${MY_PN}.in.sh bin/${MY_PN}.in.sh.sample
+	for file in config/* ; do
+		mv ${file} ${file}.sample
+	done
+
+	use amd64 && {
+		rm lib/sigar/libsigar-x86-linux.so
+	}
+
+	use x86 && {
+		rm lib/sigar/libsigar-amd64-linux.so
+	}
+}
+
+src_install() {
+	dodir /etc/${MY_PN}
+	insinto /etc/${MY_PN}
+	doins bin/${MY_PN}.in.sh.sample
+	doins config/*
+	rm bin/${MY_PN}.in.sh.sample
+	rm -rf config
+
+	insinto /usr/share/${MY_PN}
+	doins -r ./*
+	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+
+	keepdir /var/{lib,log}/${MY_PN}
+
+	local rcscript=elasticsearch.init
+	local eshome="/usr/share/${MY_PN}"
+	local jarfile="${MY_PN}-${PV}.jar"
+	local esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@ES_CLASS_PATH@|${esclasspath}|" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${MY_PN} by"
+	elog "symlinking the init script ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+	elog
+	elog "Each of the *.sample files in /etc/${MY_PN} should be copied"
+	elog "to the proper configuration directory:"
+	elog "/etc/${MY_PN} (for standard init)"
+	elog "/etc/${MY_PN}/instance (for symlinked init)"
+	elog
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf b/app-misc/elasticsearch/files/elasticsearch.conf
new file mode 100644
index 000000000000..54e3df9a82dc
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.conf
@@ -0,0 +1,20 @@
+# please modify/copy
+# /etc/elasticsearch/elasticsearch.in.sh.sample
+# to 
+# /etc/elasticsearch/[instance/]elasticsearch.in.sh
+#
+# many variables/options are available in this file
+
+# ES_USER="elasticsearch:elasticsearch"
+## set max fds (ulimit -n X)
+# ES_MAX_FD=""
+
+## override elasticsearch.in.sh
+#
+# ES_CLASSPATH=""
+# JAVA_OPTS=""
+# ES_JAVA_OPTS=""
+# ES_HEAP_SIZE=""
+# ES_HEAP_NEWSIZE=""
+# ES_DIRECT_SIZE=""
+# ES_USE_IPV4=""
diff --git a/app-misc/elasticsearch/files/elasticsearch.init b/app-misc/elasticsearch/files/elasticsearch.init
new file mode 100644
index 000000000000..deadce0ee869
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init
@@ -0,0 +1,86 @@
+#!/sbin/runscript
+
+name="ElasticSearch"
+description=""
+
+ES_USER=${ES_USER:="elasticsearch"}
+ES_INSTANCE=${SVCNAME#*.}
+export ES_CLASSPATH="@ES_CLASS_PATH@"
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
+	ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	PIDFILE="/run/elasticsearch/elasticsearch.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	ES_CONF_PATH="/etc/elasticsearch"
+	ES_LOG_PATH="/var/log/elasticsearch/_default"
+fi
+
+ES_DATA_PATH="${ES_BASE_PATH}/data"
+ES_WORK_PATH="${ES_BASE_PATH}/work"
+
+export ES_INCLUDE="${ES_CONF_PATH}/elasticsearch.in.sh"
+export JAVA_OPTS
+export ES_JAVA_OPTS
+export ES_HEAP_SIZE
+export ES_HEAP_NEWSIZE
+export ES_DIRECT_SIZE
+export ES_USE_IPV4
+
+server_command="/usr/share/elasticsearch/bin/elasticsearch"
+server_args=" -p ${PIDFILE} -Des.path.conf=\"${ES_CONF_PATH}\" -Des.path.data=\"${ES_DATA_PATH}\" -Des.path.work=\"${ES_WORK_PATH}\" -Des.path.logs=\"${ES_LOG_PATH}\""
+
+depend() {
+	use net
+}
+
+start() {
+	# elasticsearch -f -Des.config=/path/to/config/file
+	# elasticsearch -f -Des.network.host=10.0.0.4
+	
+	[ ! -f "${ES_INCLUDE}" ] && {
+		eerror "${ES_INCLUDE} must be copied into place"
+		return 1
+	}
+
+	local conf
+	local conf_file
+	for conf in elasticsearch.yml logging.yml; do
+		conf_file="${ES_CONF_PATH}/${conf}"
+		if [ ! -f "${conf_file}" ]; then
+			eerror "${conf_file} must be copied into place"
+			return 1
+		fi
+	done
+
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -n "${ES_MAX_FD}" ]; then
+		ulimit -n ${ES_MAX_FD}
+		einfo "Max open filedescriptors  : ${ES_MAX_FD}"
+	fi
+
+
+	checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
+	checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
+	
+	start-stop-daemon --start \
+		--chdir "${ES_BASE_PATH}" \
+		--user="${ES_USER}" \
+		--pidfile="${PIDFILE}" \
+		--exec ${server_command} -- ${server_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop \
+		--pidfile=${PIDFILE}
+	eend $?
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.service b/app-misc/elasticsearch/files/elasticsearch.service
new file mode 100644
index 000000000000..13f4b3f8bd43
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Environment=ES_INCLUDE=/etc/elasticsearch/elasticsearch.in.sh
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch -f -Des.path.conf=/etc/elasticsearch
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
new file mode 100644
index 000000000000..3ed4669f55a4
--- /dev/null
+++ b/app-misc/elasticsearch/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>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-mobilephone/lightblue/lightblue-0.4.ebuild b/app-mobilephone/lightblue/lightblue-0.4.ebuild
index 9ad2a4c6c549..13b447d7556d 100644
--- a/app-mobilephone/lightblue/lightblue-0.4.ebuild
+++ b/app-mobilephone/lightblue/lightblue-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/lightblue/lightblue-0.4.ebuild,v 1.3 2010/03/27 17:57:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/lightblue/lightblue-0.4.ebuild,v 1.4 2013/11/07 02:50:27 patrick Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
-DESCRIPTION="LightBlue is a cross-platform Bluetooth API for Python which provides simple access to Bluetooth operations"
+DESCRIPTION="Cross-platform Bluetooth API for Python which provides simple access to Bluetooth operations"
 HOMEPAGE="http://lightblue.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/app-text/cook/cook-1.0.2-r1.ebuild b/app-text/cook/cook-1.0.2-r1.ebuild
index b2d73d768871..d05dbc6b71a5 100644
--- a/app-text/cook/cook-1.0.2-r1.ebuild
+++ b/app-text/cook/cook-1.0.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cook/cook-1.0.2-r1.ebuild,v 1.12 2012/10/17 16:58:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cook/cook-1.0.2-r1.ebuild,v 1.13 2013/11/07 02:57:50 patrick Exp $
 
 inherit toolchain-funcs
 
-DESCRIPTION="COOK is an embedded language which can be used as a macro preprocessor and for similar text processing."
+DESCRIPTION="Embedded language which can be used as a macro preprocessor and for similar text processing."
 HOMEPAGE="http://cook.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cook/${P}.tar.gz"
 
diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
index 4d1e1657ff8c..e26520eac17a 100644
--- a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
+++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild,v 1.1 2010/07/20 23:20:53 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild,v 1.2 2013/11/07 03:07:20 patrick Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils toolchain-funcs
 
 MY_P="mbtPdfAsm-${PV}"
 
-DESCRIPTION="mbtPdfAsm can assemble/merge PDF files, extract information from PDF files, and update the metadata in PDF files."
+DESCRIPTION="Tool to assemble/merge PDF files, extract information from, and update the metadata in PDF files."
 HOMEPAGE="http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html"
 SRC_URI="http://thierry.schmit.free.fr/spip/IMG/gz/${MY_P}.tar.gz
 	http://sbriesen.de/gentoo/distfiles/${P}-manual.pdf.bz2"
diff --git a/app-text/pelican/pelican-3.3.ebuild b/app-text/pelican/pelican-3.3.ebuild
index 47beabdde4a3..544880c0c86d 100644
--- a/app-text/pelican/pelican-3.3.ebuild
+++ b/app-text/pelican/pelican-3.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.3.ebuild,v 1.1 2013/10/29 03:44:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.3.ebuild,v 1.2 2013/11/07 08:56:10 yac Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples markdown"
 
 DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild b/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
index ced8b66dab7e..74cf38b29606 100644
--- a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
+++ b/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.114_p1.ebuild,v 1.10 2012/05/21 23:37:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.114_p1.ebuild,v 1.11 2013/11/07 03:15:25 patrick Exp $
 
 EAPI="2"
 
 inherit autotools rpm eutils
 
-DESCRIPTION="Cluster implementation of the TDB database used by Samba and other projects to store temporary data."
+DESCRIPTION="A cluster implementation of the TDB database used to store temporary data."
 HOMEPAGE="http://ctdb.samba.org/"
 SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P/_p/-}.src.rpm
 	http://ctdb.samba.org/packages/redhat/RHEL5/old/${P/_p/-}.src.rpm"
diff --git a/dev-db/ctdb/ctdb-1.0.73.ebuild b/dev-db/ctdb/ctdb-1.0.73.ebuild
index fecf3362a17a..886157299898 100644
--- a/dev-db/ctdb/ctdb-1.0.73.ebuild
+++ b/dev-db/ctdb/ctdb-1.0.73.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.73.ebuild,v 1.6 2009/11/16 21:33:53 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.73.ebuild,v 1.7 2013/11/07 03:15:25 patrick Exp $
 
 EAPI="2"
 
 inherit autotools
 
-DESCRIPTION="A cluster implementation of the TDB database used by Samba and other projects to store temporary data."
+DESCRIPTION="A cluster implementation of the TDB database used to store temporary data."
 HOMEPAGE="http://ctdb.samba.org/"
 SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P}.tgz"
 LICENSE="GPL-3"
diff --git a/dev-db/ctdb/ctdb-1.0.88.ebuild b/dev-db/ctdb/ctdb-1.0.88.ebuild
index a323553a392f..d39d0985569f 100644
--- a/dev-db/ctdb/ctdb-1.0.88.ebuild
+++ b/dev-db/ctdb/ctdb-1.0.88.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.88.ebuild,v 1.10 2012/05/21 18:45:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.88.ebuild,v 1.11 2013/11/07 03:15:25 patrick Exp $
 
 EAPI="2"
 
 inherit autotools eutils
 
-DESCRIPTION="A cluster implementation of the TDB database used by Samba and other projects to store temporary data."
+DESCRIPTION="A cluster implementation of the TDB database used to store temporary data."
 HOMEPAGE="http://ctdb.samba.org/"
 SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P}.tgz"
 LICENSE="GPL-3"
diff --git a/dev-db/libdbi/libdbi-0.8.3.ebuild b/dev-db/libdbi/libdbi-0.8.3.ebuild
index 48660dd93eee..d63d15353af8 100644
--- a/dev-db/libdbi/libdbi-0.8.3.ebuild
+++ b/dev-db/libdbi/libdbi-0.8.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.21 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.22 2013/11/07 03:18:43 patrick Exp $
 
 inherit eutils autotools multilib
 
-DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
+DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libdbi.sourceforge.net/"
 LICENSE="LGPL-2.1"
diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild
index 3781fe7369d2..bc084269f9e6 100644
--- a/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild,v 1.1 2010/02/19 21:55:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild,v 1.2 2013/11/07 03:20:33 patrick Exp $
 
 EAPI=2
 inherit eutils flag-o-matic
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
 
-DESCRIPTION="Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
+DESCRIPTION="C++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
 SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.bz2"
 HOMEPAGE="http://libodbcxx.sourceforge.net/"
 LICENSE="LGPL-2.1"
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild
index 138bf4c95798..506cef1ea523 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild,v 1.10 2010/06/17 21:28:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild,v 1.11 2013/11/07 03:25:47 patrick Exp $
 
 WANT_AUTOMAKE="1.4"
 
@@ -8,7 +8,7 @@ inherit eutils autotools
 
 MY_PN="super-smack"
 MY_P="${MY_PN}-${PV}"
-DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL."
+DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL."
 HOMEPAGE="http://jeremy.zawodny.com/mysql/${MY_PN}/"
 SRC_URI="http://jeremy.zawodny.com/mysql/${MY_PN}/${MY_P}.tar.gz"
 
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
index 7a7978a90a6d..f7c0cf7ae5d2 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.5 2012/04/13 18:01:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.6 2013/11/07 03:25:47 patrick Exp $
 
 EAPI=2
 WANT_AUTOMAKE="1.4"
@@ -9,7 +9,7 @@ inherit eutils autotools
 
 MY_PN="super-smack"
 MY_P="${MY_PN}-${PV}"
-DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL."
+DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL."
 HOMEPAGE="http://vegan.net/tony/supersmack/"
 SRC_URI="http://vegan.net/tony/supersmack/${MY_P}.tar.gz"
 
diff --git a/dev-db/odbtp/odbtp-1.1.4.ebuild b/dev-db/odbtp/odbtp-1.1.4.ebuild
index 7cdc34803abc..28f9ff6062c4 100644
--- a/dev-db/odbtp/odbtp-1.1.4.ebuild
+++ b/dev-db/odbtp/odbtp-1.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/odbtp/odbtp-1.1.4.ebuild,v 1.5 2011/07/08 10:18:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/odbtp/odbtp-1.1.4.ebuild,v 1.6 2013/11/07 03:29:13 patrick Exp $
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="ODBTP is a fast, efficient TCP/IP protocol for connecting to Win32-based databases from any platform."
+DESCRIPTION="Fast, efficient TCP/IP protocol for connecting to Win32-based databases from any platform."
 HOMEPAGE="http://odbtp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/odbtp/${P}.tar.gz"
 
diff --git a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
index 46c148ae3340..8ad1d2835b50 100644
--- a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
+++ b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1-r1.ebuild,v 1.6 2013/02/05 23:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1-r1.ebuild,v 1.7 2013/11/07 03:35:42 patrick Exp $
 
 EAPI="4"
 
 inherit eutils
 
-DESCRIPTION="software package for working with JTAG-aware (IEEE 1149.1) hardware devices (parts) and boards through JTAG adapter"
+DESCRIPTION="Software for working with JTAG-aware (IEEE 1149.1) devices (parts) and boards through JTAG adapter"
 HOMEPAGE="http://openwince.sourceforge.net/jtag/"
 SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
 
diff --git a/dev-java/colt/colt-1.2.0-r1.ebuild b/dev-java/colt/colt-1.2.0-r1.ebuild
index 8fe450664721..661cf468ff27 100644
--- a/dev-java/colt/colt-1.2.0-r1.ebuild
+++ b/dev-java/colt/colt-1.2.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0-r1.ebuild,v 1.6 2009/12/29 02:28:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0-r1.ebuild,v 1.7 2013/11/07 03:44:01 patrick Exp $
 
 JAVA_PKG_IUSE="source doc"
 
 inherit java-pkg-2 java-ant-2 eutils
 
-DESCRIPTION="Colt provides a set of Open Source Libraries for High Performance Scientific and Technical Computing in Java."
+DESCRIPTION="A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java."
 SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz"
 HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
 LICENSE="colt"
@@ -22,7 +22,7 @@ RDEPEND=">=virtual/jre-1.4
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
diff --git a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild b/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
index f400fdccf4a9..fb537d869678 100644
--- a/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
+++ b/dev-java/fastutil/fastutil-4.3.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.3.1-r1.ebuild,v 1.5 2007/11/02 00:38:25 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.3.1-r1.ebuild,v 1.6 2013/11/07 03:50:24 patrick Exp $
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion."
+DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint."
 SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
 HOMEPAGE="http://fastutil.dsi.unimi.it"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild b/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
index 0edcb032dcdb..3a2d5efa6cb3 100644
--- a/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
+++ b/dev-java/fastutil/fastutil-4.4.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.4.2-r1.ebuild,v 1.6 2007/06/27 09:49:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-4.4.2-r1.ebuild,v 1.7 2013/11/07 03:50:24 patrick Exp $
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion."
+DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint."
 SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
 HOMEPAGE="http://fastutil.dsi.unimi.it"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/fastutil/fastutil-5.0.9.ebuild b/dev-java/fastutil/fastutil-5.0.9.ebuild
index 83890acfd754..72fd8a1313bb 100644
--- a/dev-java/fastutil/fastutil-5.0.9.ebuild
+++ b/dev-java/fastutil/fastutil-5.0.9.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-5.0.9.ebuild,v 1.4 2007/11/25 15:15:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fastutil/fastutil-5.0.9.ebuild,v 1.5 2013/11/07 03:50:24 patrick Exp $
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion."
+DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint."
 SRC_URI="http://fastutil.dsi.unimi.it/${P}-src.tar.gz"
 HOMEPAGE="http://fastutil.dsi.unimi.it"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/jsr173/jsr173-1.0-r1.ebuild b/dev-java/jsr173/jsr173-1.0-r1.ebuild
index 6503bf07e0ec..43ee5edfbe05 100644
--- a/dev-java/jsr173/jsr173-1.0-r1.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/jsr173-1.0-r1.ebuild,v 1.14 2012/04/15 18:36:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/jsr173-1.0-r1.ebuild,v 1.15 2013/11/07 03:58:48 patrick Exp $
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="The Streaming API for XML (StAX) is a groundbreaking new Java API for parsing and writing XML easily and efficiently"
+DESCRIPTION="The Streaming API for XML (StAX) is a Java API for parsing and writing XML easily and efficiently"
 HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
 SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 
diff --git a/dev-java/jvmstat/Manifest b/dev-java/jvmstat/Manifest
index 1dc9803096a0..3833ec68f358 100644
--- a/dev-java/jvmstat/Manifest
+++ b/dev-java/jvmstat/Manifest
@@ -1 +1 @@
-DIST jvmstat-3_0.zip 153629 RMD160 cde842c4365be658fbcd06eb840bad268719e5e6 SHA1 e537c53fa9629742a0569643fd45e489a93b6a2f SHA256 3d3fad22aa65f356f6ecca050216f814fcdf20c0611a1f689969991d7a1ccb79
+DIST jvmstat-3_0.zip 153629 SHA256 3d3fad22aa65f356f6ecca050216f814fcdf20c0611a1f689969991d7a1ccb79
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
index 6b9498b318e7..fc78f7a9950b 100644
--- a/dev-java/jvmstat/jvmstat-3.0.ebuild
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvmstat/jvmstat-3.0.ebuild,v 1.6 2008/04/02 19:49:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvmstat/jvmstat-3.0.ebuild,v 1.7 2013/11/07 04:01:20 patrick Exp $
 
 inherit java-pkg-2 versionator
 
 MY_PV=$(replace_version_separator 1 '_')
-DESCRIPTION="A set of monitoring APIs and tools for monitoring the performance of the JVM in production environments."
+DESCRIPTION="Monitoring APIs and tools for monitoring the performance of the JVM in production environments."
 HOMEPAGE="http://java.sun.com/performance/jvmstat/"
 SRC_URI="jvmstat-${MY_PV}.zip"
 
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 309e315d2e91..5568f9fa3175 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,6 +1,2 @@
-DIST Maude-2.3.tar.gz 1441239 SHA256 67e88d8440fafc67e1121139de496c70844279291e37ba9bee369d113a92fddb SHA512 ceab62c4faa87760af0cb6f7c5a3e024b48b92e3a7071afa0f7838a2885ada6de94d5c055c78278cbb86887e516b761b0852dde0c2c239a83d609069b8d3e00c WHIRLPOOL c7834fc1d5e28ba474e7995db4dea4e15ea78790bed11097a1e362e41e3b36055bf2a65befca553bc2d1668fa06b6ab36aed7ad6559ee96660ba79d30aa4d84d
-DIST Maude-2.5.tar.gz 1574038 SHA256 dc5d4a6426b48a2b9810335a69a14064843f457f89cf9fd941ff1411fdb27b99 SHA512 e2463917ab4568d57dbcb45554dc22d1964d447b0fd53b2f2a759f5bec1880910c4dd1f6c25768d776bbbc697deb4c8fe61aecdd74f0f24b13bd50d0833a6a9c WHIRLPOOL e1dcb63c7267dc683bfa287ff9e9de2ebea91be756cd08a7314c04fecd3a1f471280a5be261e2cd98437ed13bbe1fbe64030789dfcf1f8bc2132f008a982ea61
 DIST Maude-2.6.tar.gz 1600026 SHA256 a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 SHA512 3931a540f72acdf2de532eff7b55ba4c9496b38a4b036f4e37d16b860f87728d6df5b9e377fd3489e55f7c369bca5eb9cded9b7a75032c410eff9a6e85da3fab WHIRLPOOL 9bc2011cb167ac5a451fc043fcaccbbfbfb5cb71bbb804021c7286a6f315d8c6778b6a385c5c6e5566db18051e8c817f93f099f39e3077bd414b83cc8e78be9b
-DIST maude-2.3.0-extras.tar.bz2 2871587 SHA256 0dd0d71cb5a1463c9888303c1ed74c6d373d6aa60a9a45660e92f3308730a54d SHA512 c0bc49a6e13c91c99c5884a7627c368188ee5e245ae0aec7ef1105903e3c935341439139bf144a666a0f6ae709933db70bf72dc502344c4e6e299d47be236b5b WHIRLPOOL 2fa267156a375496bb846befbe47acbe824f2961a29beb3d9bddc8969ae0c5215f66048b6286c045a03a11edde35c10c2da060efebf840c3736659660b7f92a0
-DIST maude-2.5.0-extras.tar.bz2 3202095 SHA256 4eaa9c7ddea3742aef90e5de16aec193e2f2821d9d3b28759b889d219add54c4 SHA512 363b27d513c8a0ab669254abdb513df6c08a7c1dc86966c8210aa9e7031e1ee58d8c269a5ae3669fc3a4e11d1a599fb2aade78700a7a977ea11e375d07f2bdc4 WHIRLPOOL 888f5db57b9d09769b4f61b918a4bb526f67543a893aee89857d8c1a8e572aa57c099daa31c83cfd81eca72aa9af225cf0d86b22e87697b7f16892d357fc4153
 DIST maude-2.6-extras.tar.xz 3157004 SHA256 64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd WHIRLPOOL 7a5ea0bf49132ecb3b88f26432c8aedb7ce2f9632f4e9cbb5fa08ab36b65c9a165d58e4a880e8ea97eff91280e28fb01e224a61539b73b898f3e9b4cba34ce44
diff --git a/dev-lang/maude/files/2.1.1-gcc3.4.patch b/dev-lang/maude/files/2.1.1-gcc3.4.patch
deleted file mode 100644
index d4c7ed6fbfb8..000000000000
--- a/dev-lang/maude/files/2.1.1-gcc3.4.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -ru maude-2.1.1/src/Core/argVec.hh maude-2.1.1-new/src/Core/argVec.hh
---- maude-2.1.1/src/Core/argVec.hh	2003-06-01 06:50:02.000000000 +0200
-+++ maude-2.1.1-new/src/Core/argVec.hh	2004-10-09 01:12:28.000000000 +0200
-@@ -41,6 +41,7 @@
- //
- #ifndef _argVec_hh_
- #define _argVec_hh_
-+#include <dagNode.hh>
- 
- template<class T>
- class ArgVec
-diff -ru maude-2.1.1/src/Core/checkedArgVecConstIterator.hh maude-2.1.1-new/src/Core/checkedArgVecConstIterator.hh
---- maude-2.1.1/src/Core/checkedArgVecConstIterator.hh	2003-06-01 06:50:02.000000000 +0200
-+++ maude-2.1.1-new/src/Core/checkedArgVecConstIterator.hh	2004-10-09 01:10:37.000000000 +0200
-@@ -205,7 +205,7 @@
- inline typename ArgVec<T>::const_iterator
- ArgVec<T>::const_iterator::operator++(int)
- {
--  ArgVec::const_iterator tmp(*this);
-+  typename ArgVec::const_iterator tmp(*this);
-   operator++();
-   return tmp;
- }
-@@ -225,7 +225,7 @@
- inline typename ArgVec<T>::const_iterator
- ArgVec<T>::const_iterator::operator--(int)
- {
--  ArgVec::const_iterator tmp(*this);
-+  typename ArgVec::const_iterator tmp(*this);
-   operator--();
-   return tmp;
- }
-@@ -245,7 +245,7 @@
- inline typename ArgVec<T>::const_iterator
- ArgVec<T>::const_iterator::operator+(difference_type delta) const
- {
--  ArgVec::const_iterator tmp(*this);
-+  typename ArgVec::const_iterator tmp(*this);
-   return tmp += delta;
- }
- 
-@@ -264,7 +264,7 @@
- inline typename ArgVec<T>::const_iterator
- ArgVec<T>::const_iterator::operator-(difference_type delta) const
- {
--  ArgVec::const_iterator tmp(*this);
-+  typename ArgVec::const_iterator tmp(*this);
-   return tmp -= delta;
- }
- 
-diff -ru maude-2.1.1/src/Core/checkedArgVecIterator.hh maude-2.1.1-new/src/Core/checkedArgVecIterator.hh
---- maude-2.1.1/src/Core/checkedArgVecIterator.hh	2003-06-01 06:50:02.000000000 +0200
-+++ maude-2.1.1-new/src/Core/checkedArgVecIterator.hh	2004-10-09 01:10:37.000000000 +0200
-@@ -194,7 +194,7 @@
- inline typename ArgVec<T>::iterator
- ArgVec<T>::iterator::operator++(int)
- {
--  ArgVec::iterator tmp(*this);
-+  typename ArgVec::iterator tmp(*this);
-   operator++();
-   return tmp;
- }
-@@ -214,7 +214,7 @@
- inline typename ArgVec<T>::iterator
- ArgVec<T>::iterator::operator--(int)
- {
--  ArgVec::iterator tmp(*this);
-+  typename ArgVec::iterator tmp(*this);
-   operator--();
-   return tmp;
- }
-@@ -234,7 +234,7 @@
- inline typename ArgVec<T>::iterator
- ArgVec<T>::iterator::operator+(difference_type delta) const
- {
--  ArgVec::iterator tmp(*this);
-+  typename ArgVec::iterator tmp(*this);
-   return tmp += delta;
- }
- 
-@@ -253,7 +253,7 @@
- inline typename ArgVec<T>::iterator
- ArgVec<T>::iterator::operator-(difference_type delta) const
- {
--  ArgVec::iterator tmp(*this);
-+  typename ArgVec::iterator tmp(*this);
-   return tmp -= delta;
- }
- 
-diff -ru maude-2.1.1/src/FreeTheory/freeDagNode.hh maude-2.1.1-new/src/FreeTheory/freeDagNode.hh
---- maude-2.1.1/src/FreeTheory/freeDagNode.hh	2003-06-01 06:49:16.000000000 +0200
-+++ maude-2.1.1-new/src/FreeTheory/freeDagNode.hh	2004-10-09 01:11:44.000000000 +0200
-@@ -87,7 +87,7 @@
-   if (nrArgs > nrWords)
-     {
-       setCallDtor();  // need our dtor called when garbage collected so we can free arg array
--      external = new (DagNode*)[nrArgs];
-+      external = new DagNode*[nrArgs];
-     }
- }
- 
-diff -ru maude-2.1.1/src/Interface/dagNode.hh maude-2.1.1-new/src/Interface/dagNode.hh
---- maude-2.1.1/src/Interface/dagNode.hh	2004-02-06 02:13:02.000000000 +0100
-+++ maude-2.1.1-new/src/Interface/dagNode.hh	2004-10-09 01:13:10.000000000 +0200
-@@ -25,6 +25,7 @@
- //
- #ifndef _dagNode_hh_
- #define _dagNode_hh_
-+#include "symbol.hh"
- #include "redexPosition.hh"
- 
- class DagNode
-diff -ru maude-2.1.1/src/Mixfix/lexer.cc maude-2.1.1-new/src/Mixfix/lexer.cc
---- maude-2.1.1/src/Mixfix/lexer.cc	2004-05-26 04:04:40.000000000 +0200
-+++ maude-2.1.1-new/src/Mixfix/lexer.cc	2004-10-09 01:26:59.000000000 +0200
-@@ -9,6 +9,7 @@
- #define YY_FLEX_MINOR_VERSION 5
- 
- #include <stdio.h>
-+#include <unistd.h>
- 
- 
- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-@@ -22,7 +23,6 @@
- #ifdef __cplusplus
- 
- #include <stdlib.h>
--#include <unistd.h>
- 
- /* Use prototypes in function declarations. */
- #define YY_USE_PROTOS
-@@ -2000,7 +2000,7 @@
- YY_DECL
- 	{
- 	register yy_state_type yy_current_state;
--	register char *yy_cp, *yy_bp;
-+	register char *yy_cp = NULL, *yy_bp = NULL;
- 	register int yy_act;
- 
- #line 83 "../../../src/Mixfix/lexer.ll"
-@@ -3367,6 +3367,7 @@
- #endif	/* ifndef YY_NO_UNPUT */
- 
- 
-+#ifndef YY_NO_INPUT
- #ifdef __cplusplus
- static int yyinput()
- #else
-@@ -3438,7 +3439,7 @@
- 
- 	return c;
- 	}
--
-+#endif /* YY_NO_INPUT */
- 
- #ifdef YY_USE_PROTOS
- void yyrestart( FILE *input_file )
-@@ -3549,11 +3550,6 @@
- 	}
- 
- 
--#ifndef YY_ALWAYS_INTERACTIVE
--#ifndef YY_NEVER_INTERACTIVE
--extern int isatty YY_PROTO(( int ));
--#endif
--#endif
- 
- #ifdef YY_USE_PROTOS
- void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-
-diff -ru maude-2.1.1/src/Utility/checkedConstIterator.hh maude-2.1.1-new/src/Utility/checkedConstIterator.hh
---- maude-2.1.1/src/Utility/checkedConstIterator.hh	2003-06-01 06:29:22.000000000 +0200
-+++ maude-2.1.1-new/src/Utility/checkedConstIterator.hh	2004-10-09 01:08:34.000000000 +0200
-@@ -209,7 +209,7 @@
- inline typename Vector<T>::const_iterator
- Vector<T>::const_iterator::operator++(int)
- {
--  Vector::const_iterator tmp(*this);
-+  typename Vector::const_iterator tmp(*this);
-   operator++();
-   return tmp;
- }
-@@ -229,7 +229,7 @@
- inline typename Vector<T>::const_iterator
- Vector<T>::const_iterator::operator--(int)
- {
--  Vector::const_iterator tmp(*this);
-+  typename Vector::const_iterator tmp(*this);
-   operator--();
-   return tmp;
- }
-@@ -249,7 +249,7 @@
- inline typename Vector<T>::const_iterator
- Vector<T>::const_iterator::operator+(difference_type delta) const
- {
--  Vector::const_iterator tmp(*this);
-+  typename Vector::const_iterator tmp(*this);
-   return tmp += delta;
- }
- 
-@@ -268,7 +268,7 @@
- inline typename Vector<T>::const_iterator
- Vector<T>::const_iterator::operator-(difference_type delta) const
- {
--  Vector::const_iterator tmp(*this);
-+  typename Vector::const_iterator tmp(*this);
-   return tmp -= delta;
- }
- 
-diff -ru maude-2.1.1/src/Utility/checkedIterator.hh maude-2.1.1-new/src/Utility/checkedIterator.hh
---- maude-2.1.1/src/Utility/checkedIterator.hh	2003-06-01 06:29:22.000000000 +0200
-+++ maude-2.1.1-new/src/Utility/checkedIterator.hh	2004-10-09 01:08:34.000000000 +0200
-@@ -198,7 +198,7 @@
- inline typename Vector<T>::iterator
- Vector<T>::iterator::operator++(int)
- {
--  Vector::iterator tmp(*this);
-+  typename Vector::iterator tmp(*this);
-   operator++();
-   return tmp;
- }
-@@ -218,7 +218,7 @@
- inline typename Vector<T>::iterator
- Vector<T>::iterator::operator--(int)
- {
--  Vector::iterator tmp(*this);
-+  typename Vector::iterator tmp(*this);
-   operator--();
-   return tmp;
- }
-@@ -238,7 +238,7 @@
- inline typename Vector<T>::iterator
- Vector<T>::iterator::operator+(difference_type delta) const
- {
--  Vector::iterator tmp(*this);
-+  typename Vector::iterator tmp(*this);
-   return tmp += delta;
- }
- 
-@@ -257,7 +257,7 @@
- inline typename Vector<T>::iterator
- Vector<T>::iterator::operator-(difference_type delta) const
- {
--  Vector::iterator tmp(*this);
-+  typename Vector::iterator tmp(*this);
-   return tmp -= delta;
- }
- 
-diff -ru maude-2.1.1/src/Utility/indexedSet.hh maude-2.1.1-new/src/Utility/indexedSet.hh
---- maude-2.1.1/src/Utility/indexedSet.hh	2003-06-01 06:29:22.000000000 +0200
-+++ maude-2.1.1-new/src/Utility/indexedSet.hh	2004-10-09 01:08:34.000000000 +0200
-@@ -79,7 +79,7 @@
- IndexedSet<T>::insert(const T& element)
- {
-   pair<typename EltMap::iterator, bool> p =
--    eltMap.insert(EltMap::value_type(element, indexMap.size()));
-+    eltMap.insert(typename EltMap::value_type(element, indexMap.size()));
-   if (p.second)
-     indexMap.push_back(p.first);
-   return p.first->second;
diff --git a/dev-lang/maude/files/23maude b/dev-lang/maude/files/23maude
deleted file mode 100644
index 42b55fe98414..000000000000
--- a/dev-lang/maude/files/23maude
+++ /dev/null
@@ -1 +0,0 @@
-MAUDE_LIB=/usr/share/maude
diff --git a/dev-lang/maude/files/maude-2.3.0-gcc43.patch b/dev-lang/maude/files/maude-2.3.0-gcc43.patch
deleted file mode 100644
index 457359519b87..000000000000
--- a/dev-lang/maude/files/maude-2.3.0-gcc43.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- Maude-2.3/src/BuiltIn/stringOpSymbol.cc	2003-11-10 18:33:00.000000000 -0600
-+++ Maude-2.4/src/BuiltIn/stringOpSymbol.cc	2008-09-11 19:03:36.000000000 -0600
-@@ -220,7 +220,9 @@ StringOpSymbol::eqRewrite(DagNode* subje
- 	      case CODE('f', 'l'):
- 		{
- 		  bool error;
--		  //double fl = stringToDouble(left.c_str(), error);
-+#ifdef ROPE_C_STR_BROKEN
-+		  //
-+		  //	This kudge doesn't seem to be need nowadays, but copy() doesn't work.
- 		  //
- 		  //	This messing about is needed because Rope::c_str()
- 		  //	fails in libstdc++-v3
-@@ -231,7 +233,9 @@ StringOpSymbol::eqRewrite(DagNode* subje
- 		  t[len] = '\0';
- 		  double fl = stringToDouble(t, error);
- 		  delete [] t;
--		  //
-+#else
-+		  double fl = stringToDouble(left.c_str(), error);
-+#endif
- 		  if (error)
- 		    goto fail;
- 		  return floatSymbol->rewriteToFloat(subject, context, fl);
-@@ -282,6 +286,7 @@ StringOpSymbol::eqRewrite(DagNode* subje
- 		    break;
- 		  default:
- 		    CantHappen("bad string op");
-+		    r = false;  // avoid compiler warning
- 		  }
- 		Assert(trueTerm.getTerm() != 0 && falseTerm.getTerm() != 0,
- 		       "null true/false for relational op");
-@@ -358,6 +363,7 @@ StringOpSymbol::eqRewrite(DagNode* subje
- 			      break;
- 			    default:
- 			      CantHappen("bad string op");
-+			      r = 0;  // avoid compiler warning
- 			    }
- 			  Assert(notFoundTerm.getTerm() != 0, "null notFound for find op");
- 			  if (r == NONE)
-@@ -591,6 +597,13 @@ StringOpSymbol::ropeToNumber(const crope
- 		  if (!isalnum(subject[j]))
- 		    return false;
- 		}
-+	      //
-+	      //	We have detected a fraction form.
-+	      //
-+#ifdef ROPE_C_STR_BROKEN
-+	      //
-+	      //	This kudge doesn't seem to be need nowadays, but copy() doesn't work.
-+	      //
- 	      char* t = new char[len];  // longer than needed but who cares
- 	      int dLen = len - (i + 1);
- 	      subject.copy(i + 1, dLen, t);
-@@ -609,20 +622,34 @@ StringOpSymbol::ropeToNumber(const crope
- 		}
- 	      delete [] t;
- 	      return true;
-+#else
-+	      return mpz_set_str(denominator.get_mpz_t(), subject.substr(i + 1).c_str(), base) == 0 &&
-+		mpz_set_str(numerator.get_mpz_t(), subject.substr(0,i).c_str(), base) == 0;
-+#endif	      
- 	    }
- 	  else
- 	    return false;
- 	}
-     }
-+  //
-+  //	We have a regular integer form.
-+  //
-+  denominator = 0;
-+#ifdef ROPE_C_STR_BROKEN
-+  //
-+  //	This kudge doesn't seem to be need nowadays, but copy() doesn't work.
-+  //
-   char* t = new char[len + 1];
-   subject.copy(t);
-   t[len] = '\0';
-   if (mpz_set_str(numerator.get_mpz_t(), t, base) == 0)
-     {
-       delete [] t;
--      denominator = 0;
-       return true;
-     }
-   delete [] t;
--  return false;    
-+  return false;
-+#else
-+  return mpz_set_str(numerator.get_mpz_t(), subject.c_str(), base) == 0;
-+#endif
- }
---- Maude-2.3/src/Utility/macros.hh	2007-01-11 21:13:21.000000000 -0600
-+++ Maude-2.4/src/Utility/macros.hh	2008-09-04 13:52:55.000000000 -0600
-@@ -50,10 +50,10 @@
- #if HAVE_CTYPE_H
- #include <ctype.h>
- #endif
--#if HAVE_STRINGS_H
--#include <strings.h>
--#elif HAVE_STRING_H
-+#if HAVE_STRING_H
- #include <string.h>
-+#elif HAVE_STRINGS_H
-+#include <strings.h>
- #endif
- #if HAVE_UNISTD_H
- #include <unistd.h>  // needed by solaris
diff --git a/dev-lang/maude/files/maude-2.6-gcc47.patch b/dev-lang/maude/files/maude-2.6-gcc47.patch
new file mode 100644
index 000000000000..65dcc302ab33
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.6-gcc47.patch
@@ -0,0 +1,25 @@
+Get maude to compile on amd64 with g++ 4.7
+bicatali@gentoo.org nov 2013
+
+--- Maude-2.6.orig/src/Mixfix/lexerAux.cc	2013-11-06 09:41:00.821049550 -0800
++++ Maude-2.6/src/Mixfix/lexerAux.cc	2013-11-06 09:41:33.174247429 -0800
+@@ -35,7 +35,7 @@
+ bool fakeNewlineStack[MAX_IN_DEPTH];
+ 
+ void
+-getInput(char* buf, int& result, int max_size)
++getInput(char* buf, size_t& result, int max_size)
+ {
+   result = YY_NULL;
+   if (UserLevelRewritingContext::interrupted())
+--- Maude-2.6.orig/src/Mixfix/lexerAux.hh	2013-11-06 09:41:00.821049550 -0800
++++ Maude-2.6/src/Mixfix/lexerAux.hh	2013-11-06 09:41:23.466187406 -0800
+@@ -27,7 +27,7 @@
+ //extern int inStackPtr;
+ //extern YY_BUFFER_STATE inStack[];
+ 
+-void getInput(char* buf, int& result, int max_size);
++void getInput(char* buf, size_t& result, int max_size);
+ void lexerIdMode();
+ void lexerTokenTreeMode(int terminatingTokens);
+ void lexerCmdMode();
diff --git a/dev-lang/maude/files/maude-2.6-search-datadir.patch b/dev-lang/maude/files/maude-2.6-search-datadir.patch
new file mode 100644
index 000000000000..f5522eda2a05
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.6-search-datadir.patch
@@ -0,0 +1,37 @@
+Have maude search in datadir for its files.
+--- a/src/Main/main.cc
++++ b/src/Main/main.cc
+@@ -263,6 +263,11 @@
+ {
+   if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK))
+     return true;
++  if (directoryManager.checkAccess(DATADIR, fileName, R_OK))
++    {
++      directory = DATADIR;
++      return true;
++    }
+   if (!(executableDirectory.empty()) &&
+       directoryManager.checkAccess(executableDirectory, fileName, R_OK))
+     {
+--- a/src/Mixfix/global.cc
++++ b/src/Mixfix/global.cc
+@@ -83,6 +83,9 @@
+ 	return true;
+       if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK, ext))
+ 	return true;
++      directory = DATADIR;
++      if (directoryManager.checkAccess(directory, fileName, R_OK, ext))
++	return true;
+       if (!(executableDirectory.empty()) &&
+ 	  directoryManager.checkAccess(executableDirectory, fileName, R_OK, ext))
+ 	{
+--- a/src/Mixfix/global.hh
++++ b/src/Mixfix/global.hh
+@@ -36,6 +36,7 @@
+ 
+ #define PRELUDE_NAME	"prelude.maude"
+ #define MAUDE_LIB	"MAUDE_LIB"
++#define DATADIR         "/usr/share/maude"
+ 
+ bool
+ findPrelude(string& directory, string& fileName);
diff --git a/dev-lang/maude/maude-2.3.0.ebuild b/dev-lang/maude/maude-2.3.0.ebuild
deleted file mode 100644
index c0a455ae5bb0..000000000000
--- a/dev-lang/maude/maude-2.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.3.0.ebuild,v 1.4 2010/06/23 14:24:31 jlec Exp $
-
-inherit toolchain-funcs eutils versionator
-
-MY_PN="${PN/m/M}"
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Maude - A high-level specification language"
-HOMEPAGE="http://maude.cs.uiuc.edu/"
-SRC_URI="http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
-		mirror://gentoo/${P}-extras.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="doc"
-
-RDEPEND="sci-libs/buddy
-	dev-libs/libtecla
-	>=dev-libs/gmp-4.1.3"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	insinto /usr/share/${PN}
-	doins -r src/Main/*.maude \
-		|| die "failed to install data files"
-
-	# Sets the full maude library path.
-	doenvd "${FILESDIR}"/23maude
-
-	# install full maude
-	cd "${WORKDIR}"/${P}-extras
-	doins full-maude.maude
-
-	# install docs and examples
-	if use doc; then
-		insinto /usr/share/doc/${P}
-		doins -r pdfs/*  || die "failed to install pdf files"
-
-		insinto /usr/share/${PN}/
-		doins -r manual-examples primer-examples \
-			|| die "failed to install example files"
-	fi
-}
diff --git a/dev-lang/maude/maude-2.5.0.ebuild b/dev-lang/maude/maude-2.5.0.ebuild
deleted file mode 100644
index 13c628d526a9..000000000000
--- a/dev-lang/maude/maude-2.5.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.5.0.ebuild,v 1.2 2010/06/23 14:28:14 jlec Exp $
-
-EAPI="3"
-
-inherit autotools eutils toolchain-funcs versionator
-
-MY_PN="${PN/m/M}"
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Maude - A high-level specification language"
-HOMEPAGE="http://maude.cs.uiuc.edu/"
-SRC_URI="http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
-		mirror://gentoo/${P}-extras.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="doc"
-
-RDEPEND="
-	>=dev-libs/gmp-4.1.3
-	dev-libs/libsigsegv
-	dev-libs/libtecla
-	sci-libs/buddy"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-prll.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --datadir="${EPREFIX}/usr/share/${PN}"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-
-	insinto /usr/share/${PN}
-	doins -r src/Main/*.maude \
-		|| die "failed to install data files"
-
-	# Sets the full maude library path.
-	doenvd "${FILESDIR}"/23maude || die
-
-	# install full maude
-	cd "${WORKDIR}"/${P}-extras
-	doins full-maude.maude || die
-
-	# install docs and examples
-	if use doc; then
-		insinto /usr/share/doc/${P}
-		doins -r pdfs/*  || die "failed to install pdf files"
-
-		insinto /usr/share/${PN}/
-		doins -r manual-examples primer-examples \
-			|| die "failed to install example files"
-	fi
-}
diff --git a/dev-lang/maude/maude-2.6-r1.ebuild b/dev-lang/maude/maude-2.6-r1.ebuild
new file mode 100644
index 000000000000..6826443bb121
--- /dev/null
+++ b/dev-lang/maude/maude-2.6-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.6-r1.ebuild,v 1.1 2013/11/06 18:01:37 bicatali Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils versionator
+
+MYP="${PN/m/M}-$(get_version_component_range 1-2)"
+
+DESCRIPTION="High-level specification language for equational and logic programming"
+HOMEPAGE="http://maude.cs.uiuc.edu/"
+SRC_URI="
+	http://maude.cs.uiuc.edu/download/current/${MYP}.tar.gz
+	http://dev.gentoo.org/~jlec/distfiles/${P}-extras.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/gmp-4.1.3
+	dev-libs/libsigsegv
+	dev-libs/libtecla
+	sci-libs/buddy"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-prll.patch
+	"${FILESDIR}"/${PN}-2.6-search-datadir.patch
+	"${FILESDIR}"/${PN}-2.6-gcc47.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--datadir="${EPREFIX}/usr/share/${PN}"
+	)
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" src/Mixfix/global.hh || die
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# install data and full maude
+	insinto /usr/share/${PN}
+	doins -r src/Main/*.maude
+	doins "${WORKDIR}"/${P}-extras/full-maude.maude
+
+	# install docs and examples
+	use doc && doins -r "${WORKDIR}"/${P}-extras/pdfs/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${WORKDIR}"/${P}-extras/{manual,primer}-examples
+	fi
+}
diff --git a/dev-lang/maude/maude-2.6.ebuild b/dev-lang/maude/maude-2.6.ebuild
deleted file mode 100644
index 75226874aa44..000000000000
--- a/dev-lang/maude/maude-2.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.6.ebuild,v 1.1 2012/01/26 17:51:48 jlec Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils toolchain-funcs versionator
-
-MY_PN="${PN/m/M}"
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Maude - A high-level specification language"
-HOMEPAGE="http://maude.cs.uiuc.edu/"
-SRC_URI="
-	http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
-	http://dev.gentoo.org/~jlec/distfiles/${P}-extras.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-libs/gmp-4.1.3
-	dev-libs/libsigsegv
-	dev-libs/libtecla
-	sci-libs/buddy"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-prll.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--datadir="${EPREFIX}/usr/share/${PN}"
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /usr/share/${PN}
-	doins -r src/Main/*.maude \
-		|| die "failed to install data files"
-
-	# Sets the full maude library path.
-	doenvd "${FILESDIR}"/23maude || die
-
-	# install full maude
-	cd "${WORKDIR}"/${P}-extras
-	doins full-maude.maude || die
-
-	# install docs and examples
-	if use doc; then
-		insinto /usr/share/doc/${P}
-		doins -r pdfs/*  || die "failed to install pdf files"
-
-		insinto /usr/share/${PN}/
-		doins -r manual-examples primer-examples \
-			|| die "failed to install example files"
-	fi
-}
diff --git a/dev-lang/maude/metadata.xml b/dev-lang/maude/metadata.xml
index 875b27ae67eb..5884f5601dd3 100644
--- a/dev-lang/maude/metadata.xml
+++ b/dev-lang/maude/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
-		Maude is a high-performance reflective language and system supporting
-		both equational and rewriting logic specification and programming for a
-		wide range of applications. Maude has been influenced in important ways
-		by the OBJ3 language, which can be regarded as an equational logic
-		sublanguage. Besides supporting equational specification and
-		programming, Maude also supports rewriting logic computation.
-	</longdescription>
+<herd>sci</herd>
+<longdescription>
+  Maude is a high-performance reflective language and system supporting
+  both equational and rewriting logic specification and programming for a
+  wide range of applications. Maude has been influenced in important ways
+  by the OBJ3 language, which can be regarded as an equational logic
+  sublanguage. Besides supporting equational specification and
+  programming, Maude also supports rewriting logic computation.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-perl/Term-ReadLine-TTYtter/Manifest b/dev-perl/Term-ReadLine-TTYtter/Manifest
new file mode 100644
index 000000000000..f6ca132808ff
--- /dev/null
+++ b/dev-perl/Term-ReadLine-TTYtter/Manifest
@@ -0,0 +1 @@
+DIST Term-ReadLine-TTYtter-1.4.tar.gz 52093 SHA256 ac373133cee1b2122a8273fe7b4244613d0eecefe88b668bd98fe71d1ec4ac93 SHA512 6e49c78a935259e99cabe5c9750fd5e90e205c754955d23c50227bbfe3dcb40d56ccc447d3f516ff34195d3fb411b13ae61a6c32c776231f794d2fca9da8fd1a WHIRLPOOL 191b42388e319b6ee76f8ae01bfe4c18f395c5335c220b2d765252f59b0c858a1283bc1ea1e388cfcfa940a54615314e5c25e8c639e5ad01aca1379edf0d72ab
diff --git a/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild b/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild
new file mode 100644
index 000000000000..379135921301
--- /dev/null
+++ b/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ReadLine-TTYtter/Term-ReadLine-TTYtter-1.4.ebuild,v 1.1 2013/11/06 17:42:47 hwoarang Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=CKAISER
+MODULE_VERSION=1.4
+
+inherit perl-module
+
+DESCRIPTION="Quick implementation of readline utilities for ttytter."
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/TermReadKey"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Term-ReadLine-TTYtter/metadata.xml b/dev-perl/Term-ReadLine-TTYtter/metadata.xml
new file mode 100644
index 000000000000..57741a6fd639
--- /dev/null
+++ b/dev-perl/Term-ReadLine-TTYtter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>gentoo@nephros.org</email>
+<name>Peter Gantner</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/mozrunner/Manifest b/dev-python/mozrunner/Manifest
index ef831fb3b108..f1669c0d8c71 100644
--- a/dev-python/mozrunner/Manifest
+++ b/dev-python/mozrunner/Manifest
@@ -4,3 +4,4 @@ DIST mozrunner-5.17.tar.gz 6515 SHA256 b21bf436586fb9b7bec045794e907fb0e69ba097b
 DIST mozrunner-5.18.tar.gz 39538 SHA256 195e6c4a4bb8b921912be2b88357367d800d54ff579042a274bf228e3d113462 SHA512 9b49aefa383f5c4b49d3b6d4c10c287fc41f929a621d5bfd33505d2ab3a12d06f85d3f7cfbfe7416d5391d4211944f793183afda6938d68f36a064485bf2b539 WHIRLPOOL 8d73a1a853370895a03a325f0a4570d64726329f3a6f4f1aef273dabee65513090c926bf1b68eee3a126b6462666eccd1e65996cdc728a29cc96eefbef046505
 DIST mozrunner-5.23.tar.gz 43389 SHA256 72baa6c96017680f5fc43149f05861ac19a5e750cff0a7f30c2acc022774a916 SHA512 0e06e478de594087b95cdc61f27d4dd8b641c31a320ccd722673b550570376860d040c32ad67a94ae568dff68e2462de9b616797a4fa1852db96649bbce31d21 WHIRLPOOL 1598482c812eb0c68055427a6766387c89e0b898b659bdec1ed3eff14016c727a09d9b81d76d7cd901da80e9c1d4b97ca08891d24655ce1be86564122b96a47e
 DIST mozrunner-5.24.tar.gz 44397 SHA256 4eb0b749f340ffbc1e753225dd569d77bf1d76230097d998ea5846f4ef80dd6a SHA512 15dc0b130a4164e6b5bda5716bc695ba06fe634259c2f75416f92f8049155915c12707ab9c5708bfceb556742607244b0b2054aa0b74de34295ab0ecdcdba8d7 WHIRLPOOL fb988edb3edbd1dd5c1a4fade6194d300019b65c710ee2d86b2ff31a4edb26cbb61749f667d9d891ad145297b6a0d0518add2a3058d49f762939296ccf215ced
+DIST mozrunner-5.26.tar.gz 11091 SHA256 c720c8fd9b339674fc3f4706731bbd211a5eebe08f180a313359db9fdda4f60b SHA512 a31c2eaee7912eb2e53b9e44cd92bd146d61c5a368e0c0d002ca7024698e0223d9f919838b430b14c1c6832e7c7ebcb0a64acd1562e4467cf19e30cc97b5e157 WHIRLPOOL 90ffef42e4149659b9057fbd39b5785ef487a40ba8af04a754e20673197662df045e184d5e66a15b4913e1002d7c40bda4398fd65df4aff373e44a240f59c339
diff --git a/dev-python/mozrunner/mozrunner-5.26.ebuild b/dev-python/mozrunner/mozrunner-5.26.ebuild
new file mode 100644
index 000000000000..df5ff8743ec8
--- /dev/null
+++ b/dev-python/mozrunner/mozrunner-5.26.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.26.ebuild,v 1.1 2013/11/07 06:11:56 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
+HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/mozinfo-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/mozprofile-0.10[${PYTHON_USEDEP}]
+	>=dev-python/mozprocess-0.10[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/mozfile[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 11e48e683a79..30ac7cf02534 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -4,3 +4,4 @@ DIST amqp-1.0.13.tar.gz 70458 SHA256 15fed1a2f0326f198a9d3d16ce1dc4296385d33859b
 DIST amqp-1.0.9.tar.gz 70180 SHA256 c31217630cbe2057b9f9c689820f950104ad1aea9cbb05df319d2bb7c916857b SHA512 4e3d38536d96cf4ac788c0a06f3a3a43d29b6b8837864d25d6b854a1d45e066935f4c465868467cc62da719c10b560c3d6170f80494328c1e408f3f1f0f5ea08 WHIRLPOOL 59637941ee2c6e4a600c9134b202e5568f2ae9fda3016f444b2a7afdee0bff2e515b8323be3ff0125d28c7d4418a13375907535a4437264c4894d62ca196b8aa
 DIST amqp-1.2.1.tar.gz 74050 SHA256 9d688b8da8051b0cbb97131c42a27923e3afd943c557cd30718b3d8f346dbeac SHA512 4ec9eae5c586808dae83c0409d1083da7df60898d6c5d5c999848c94b351a6fc0c0e89eacfc2c002dd153d6e6e0b9291357a608a3fdf508b06e20f85d793c962 WHIRLPOOL 65d7737540720708feacb2ef65450f978ad8c9b4c6667544e1a452d7421e81c9edac3714a819e8f49cd0a549ad9f0ebea1093239da4bc1db7d549d63b9e360d2
 DIST amqp-1.3.0.tar.gz 75201 SHA256 59912d9ea5dd41d5927b826b07aca5e447828db267783b91e5b4939077145d86 SHA512 4d273c8e9df06149b7855eef1a71529bd7f5777357f8c5b2176e8e9a4abea80468fbf1b79a04e98907bb358a144a0ac160d00db50de3575be65c9700e2b39d7c WHIRLPOOL 3dd94c66fd1c609dbd9d2e53a28f61f5fed74b39182376d55a6f60df0201a1eb7c1d2aebd4f03c8e693c1a2ccecd8031eed04dba364668bca690ad0035a3b6bd
+DIST amqp-1.3.2.tar.gz 75555 SHA256 9d321609f98f6742eeb2f7d22334749936a26047af5563818e175444ad1e2ba4 SHA512 20796621fd5687562ac4cbaca180e53a197fdd54a73cb13a746f0b701d0ceffc7dce6a18444ec1051c87be6858a3263502b7c56305cb11b613378ee00baf0aef WHIRLPOOL e7b70a85b7c240267f18ab33aa0a194198e2f2628caec1a14a41d184f97fa26af0153f9ea6f7e3fd9c480d3df1a831fc2becadb62954c4cbf0f580f06514b0f6
diff --git a/dev-python/py-amqp/py-amqp-1.3.2.ebuild b/dev-python/py-amqp/py-amqp-1.3.2.ebuild
new file mode 100644
index 000000000000..466e1ea43377
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.3.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.3.2.ebuild,v 1.1 2013/11/07 06:59:30 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+RESTRICT="test" # don't work, and fail quietly
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
+		# Notes:
+		#   -W is not supported by python3.1
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w funtests || die
+	fi
+	"${PYTHON}" funtests/run_all.py || ewarn "Tests fail with ${EPYTHON}"
+	rm -rf funtests/ || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 31e6af090766..9968276d4736 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,4 @@
 DIST pyopencl-2011.2.tar.gz 1293749 SHA256 44e63472cfd3783e60c4c5a7f0ae3537fb95ffd6034ca3db226f5ca5a726d9b9 SHA512 ca0b74ca4d5a85e5aae25183156784740d278d1c111d71f4d57cfefb36daa5971d60562ce10355f5b77dcaf7b916a1208ee1cc09c273b7287a8d10e42607793b WHIRLPOOL aa1e61de187ee709b63ab09c02edeea36b7df2a8509f0589ce7450bc5e86a70069c4da745e3e4b6ba2dc96449fb70b16cfd89254d73a869c05c11bdc98c43004
 DIST pyopencl-2012.1.tar.gz 1416097 SHA256 823c9af3540ab84221acf7978bf688d98c7635e19d6bdb4d6818c48235184297 SHA512 4f96703a3905049db5fa3217a053df7d37b7a875e71322ee8782862ec19631e6c93bd77bb281f26a66f4308bb951a7bca9eba6369e83321b9d19f67ce194e4c4 WHIRLPOOL 2542ce021a7df003fd6c01da9e94a64c50fe42c621b8ab92ffe12831d861e67f25b6149b475db0834225a1f4de2ef86f2a118686b83a52b3dc1160f23dd2c9a8
 DIST pyopencl-2013.1.tar.gz 1657749 SHA256 5c1360a27bdc12ca9868158cc8eb3daa93d0efb05ad6f27f47a8bb4e4c9c5403 SHA512 665550f4b4a50d3f42218b371b260bd50789be6e699edb96598c58589746f64b4191dbd1803443f6254fb906e513411c7a51cb846b37f2efedcc3c7df9c2bca6 WHIRLPOOL a8aaa15c30377e9105a5acff6195f9507cb50489f8ff600b7eeb58988ccde4048110d1e8ef108faa15be768598448fd9f88f16a5fe8fbf0cfa209d7de97eedca
+DIST pyopencl-2013.2.tar.gz 1637274 SHA256 f8e4218e4e47d397886f5dabde16a4d8dcc12caa0cb16ec68cae31f89c94d918 SHA512 1b5d1aa7421025dbbd06e7b58cac1e42eca24d55e3c24dc526a8b95f5b302c5d5553fcf615241abf6d9089c939980e912b5416a94290633704ef998509afddb7 WHIRLPOOL 8a868a72764b0b7d3fb8fa9d056f1be2329a70a4c5752bc4cc88ef6826b3349b15badfc3fce05a95dff62ce989297a51c5555bb892c08873c1c887f1e9b8dc23
diff --git a/dev-python/pyopencl/pyopencl-2013.2.ebuild b/dev-python/pyopencl/pyopencl-2013.2.ebuild
new file mode 100644
index 000000000000..3f01d17e2866
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2013.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopencl/pyopencl-2013.2.ebuild,v 1.1 2013/11/07 06:45:05 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="http://mathema.tician.de/software/pyopencl http://pypi.python.org/pypi/pyopencl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl"
+
+RDEPEND=">=dev-libs/boost-1.48[python]
+	dev-python/decorator
+	dev-python/numpy
+	dev-python/mako
+	dev-python/pytools
+	>=virtual/opencl-0-r1"
+DEPEND="${RDEPEND}"
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+src_configure()
+{
+	configuration() {
+		local myconf=()
+
+		if use opengl; then
+			myconf+=(--cl-enable-gl)
+		fi
+
+		"$(PYTHON)" configure.py \
+			--boost-compiler=gcc \
+			--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+			--no-use-shipped-boost \
+			"${myconf[@]}"
+	}
+	python_execute_function -s configuration
+}
+
+src_install()
+{
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst()
+{
+	distutils_pkg_postinst
+	if use examples; then
+		elog "Some of the examples provided by this package require dev-python/matplotlib."
+	fi
+}
diff --git a/dev-python/urllib3/urllib3-1.7.1.ebuild b/dev-python/urllib3/urllib3-1.7.1.ebuild
index f673e725afc3..58203d19f27f 100644
--- a/dev-python/urllib3/urllib3-1.7.1.ebuild
+++ b/dev-python/urllib3/urllib3-1.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.7.1.ebuild,v 1.2 2013/10/08 11:16:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.7.1.ebuild,v 1.3 2013/11/06 23:29:04 floppym Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-qt/assistant/assistant-4.8.5.ebuild b/dev-qt/assistant/assistant-4.8.5.ebuild
index 4173a3668c2d..bd77f716aa8c 100644
--- a/dev-qt/assistant/assistant-4.8.5.ebuild
+++ b/dev-qt/assistant/assistant-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.5.ebuild,v 1.5 2013/11/04 21:41:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.5.ebuild,v 1.6 2013/11/07 05:41:46 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-4.8.5.ebuild b/dev-qt/designer/designer-4.8.5.ebuild
index 28324f5acdd2..92fe051e0dd9 100644
--- a/dev-qt/designer/designer-4.8.5.ebuild
+++ b/dev-qt/designer/designer-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v 1.6 2013/11/04 21:41:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-4.8.5.ebuild,v 1.7 2013/11/07 06:00:38 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/linguist/linguist-4.8.5.ebuild b/dev-qt/linguist/linguist-4.8.5.ebuild
index 0e7dc0964dd5..4b2bdc0230a1 100644
--- a/dev-qt/linguist/linguist-4.8.5.ebuild
+++ b/dev-qt/linguist/linguist-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-4.8.5.ebuild,v 1.7 2013/11/04 21:41:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-4.8.5.ebuild,v 1.8 2013/11/07 06:00:41 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
index fee35d41db4a..e8be72f4badd 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-4.8.5.ebuild,v 1.7 2013/11/04 21:42:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-4.8.5.ebuild,v 1.8 2013/11/07 06:00:44 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
index 7f569a0265a5..85b29eaad472 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild,v 1.5 2013/11/04 21:42:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild,v 1.6 2013/11/07 06:00:47 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE=""
diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild
index 3d630a7c3296..266a9bc6f682 100644
--- a/dev-qt/qt3support/qt3support-4.8.5.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.5.ebuild,v 1.5 2013/11/04 21:42:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.5.ebuild,v 1.6 2013/11/07 06:00:51 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+accessibility"
 
diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
index f1cd19b071c5..c4c9c5b78b10 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/qtbearer-4.8.5.ebuild,v 1.6 2013/11/04 21:42:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/qtbearer-4.8.5.ebuild,v 1.7 2013/11/07 06:00:54 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 IUSE="connman networkmanager"
 
diff --git a/dev-qt/qtcore/qtcore-4.8.5.ebuild b/dev-qt/qtcore/qtcore-4.8.5.ebuild
index 7d12fb833253..f8c204943f31 100644
--- a/dev-qt/qtcore/qtcore-4.8.5.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.7 2013/11/04 21:42:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.8 2013/11/07 06:00:57 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+glib iconv icu qt3support ssl"
 
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
index 2a7c698731f4..e2163d6f2f9b 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.5.ebuild,v 1.5 2013/11/04 21:42:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.5.ebuild,v 1.6 2013/11/07 06:01:01 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
index f2d348590a70..2e3b941ab2fb 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild,v 1.6 2013/11/04 21:43:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild,v 1.7 2013/11/07 06:01:04 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 IUSE="+accessibility qt3support webkit"
 
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
index 013473fb97cc..c61602a325dd 100644
--- a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.6 2013/11/04 21:43:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.7 2013/11/07 06:01:07 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
index 6b4267640465..8cd608969e05 100644
--- a/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild,v 1.6 2013/11/04 21:43:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild,v 1.7 2013/11/07 06:01:11 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="compat doc"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
index b38c4b3fd811..84c8fbef5e1c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild,v 1.5 2013/11/04 21:43:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild,v 1.6 2013/11/07 06:01:15 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 IUSE="alsa"
 
diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
index 4e9854abf0e5..759f1fa575fb 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.5.ebuild,v 1.5 2013/11/04 21:43:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.5.ebuild,v 1.6 2013/11/07 06:01:19 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="egl qt3support"
 
diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
index 4c3317d16b6f..92e0cd6dcb32 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.5.ebuild,v 1.4 2013/11/05 14:10:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.5.ebuild,v 1.5 2013/11/07 06:01:22 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="dbus qt3support"
 
diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild
index e541c3aa1a84..da199e9c6b60 100644
--- a/dev-qt/qtscript/qtscript-4.8.5.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.5.ebuild,v 1.5 2013/11/04 21:44:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.5.ebuild,v 1.6 2013/11/07 06:01:25 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="iconv +jit"
 
diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild
index 6e78cf111a85..7fff0b3a825c 100644
--- a/dev-qt/qtsql/qtsql-4.8.5.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.5.ebuild,v 1.5 2013/11/04 21:44:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.5.ebuild,v 1.6 2013/11/07 06:01:28 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
 
diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
index 332f3633968d..8209bfede105 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-4.8.5.ebuild,v 1.5 2013/11/04 21:44:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-4.8.5.ebuild,v 1.6 2013/11/07 06:01:31 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+accessibility"
 
diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild
index ecf4070046d7..c830ccd447be 100644
--- a/dev-qt/qttest/qttest-4.8.5.ebuild
+++ b/dev-qt/qttest/qttest-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-4.8.5.ebuild,v 1.5 2013/11/04 21:44:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-4.8.5.ebuild,v 1.6 2013/11/07 06:01:34 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
index efcadb824387..ad63b1262330 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild,v 1.6 2013/11/04 21:44:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild,v 1.7 2013/11/07 06:01:37 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+gstreamer icu +jit"
 
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
index a8e079138995..ee2c5bd2c0c1 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild,v 1.5 2013/11/04 21:44:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild,v 1.6 2013/11/07 06:01:40 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 43f5b63d0595..2579489b01d5 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1 +1,2 @@
 DIST flog-4.1.2.gem 24064 SHA256 ba4c25662c5d7cfb94fbf1b7ed4c368440df7e5583d5fa66d8077f54552b24ef SHA512 3f7b95d4bbd946b257f404fb29df5c9abc1c0aa976fcd8cc4218450d6aa3deff123400c11b14810b3d8e3743add3ad7b5b6729a4d4ffae75ba368a3b2ac31969 WHIRLPOOL 659054bc2288a9a98aeff3a725b0efe9594fedb0b841bcaef2d2813985e0ebb766f246fd5d1ac34525c1220f78741a02338fc2155f33bd74e22f66c7c00677bc
+DIST flog-4.2.0.gem 23552 SHA256 e468f3c42a32389c6ee5fdbd339cf86b308a482dd45669024ebd31ef7fd82ada SHA512 4f819ae28b5480651fd04580fbcb5a47336767a4711837b8be17219f0e92bdc2d4602675f66b06fe0ed89b0d495cea55d38a9cddd92f8984cf14160c067280b6 WHIRLPOOL f15f0ac852e1376225339bfd469dc5a427e124db027b85b4cb06a12b5fd6cdb75a7775346fffead0562cae03735cee2919c29145bde862640834d774c0da3dc9
diff --git a/dev-ruby/flog/flog-4.2.0.ebuild b/dev-ruby/flog/flog-4.2.0.ebuild
new file mode 100644
index 000000000000..0406d0dac26d
--- /dev/null
+++ b/dev-ruby/flog/flog-4.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/flog-4.2.0.ebuild,v 1.1 2013/11/07 06:30:48 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Flog reports the most tortured code in an easy to read pain report."
+HOMEPAGE="http://ruby.sadi.st/"
+LICENSE="MIT"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend ">dev-ruby/ruby_parser-3.1.0:3
+	>=dev-ruby/sexp_processor-4.4:4"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_flog.rb || die
+}
diff --git a/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild b/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild
index 55e515f77818..b641c80a4bb1 100644
--- a/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild
+++ b/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild,v 1.1 2013/11/06 02:03:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.5.3.1.ebuild,v 1.2 2013/11/07 07:26:05 radhermit Exp $
 
 EAPI=5
 
-inherit perl-module user
+inherit perl-module user versionator
 
 DESCRIPTION="Highly flexible server for git directory version tracker"
 HOMEPAGE="http://github.com/sitaramc/gitolite"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index dbc69d9f542c..84c5cb37151f 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.602 2013/11/05 05:21:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.603 2013/11/07 03:19:00 dirtyepic Exp $
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1423,9 +1423,15 @@ gcc_do_filter_flags() {
 					# https://bugs.gentoo.org/454426
 					append-ldflags -Wl,--no-relax
 					;;
+				sparc)
+					# temporary workaround for random ICEs reproduced by multiple users
+					# https://bugs.gentoo.org/457062
+					[[ ${GCC_BRANCH_VER} == 4.6 || ${GCC_BRANCH_VER} == 4.7 ]] && \
+						MAKEOPTS+=" -j1"
+					;;
 				*-macos)
 					# http://gcc.gnu.org/PR25127
-					[[ ${GCC_BRANCH_VER} == 4.0 || ${GCC_BRANCH_VER}  == 4.1 ]] && \
+					[[ ${GCC_BRANCH_VER} == 4.0 || ${GCC_BRANCH_VER} == 4.1 ]] && \
 						filter-flags '-mcpu=*' '-march=*' '-mtune=*'
 					;;
 			esac
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.8.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.8.0.ebuild
index 9306e1666583..5f21f8dc6caa 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.8.0.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnome-nibbles/gnome-nibbles-3.8.0.ebuild,v 1.2 2013/08/31 15:30:09 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnome-nibbles/gnome-nibbles-3.8.0.ebuild,v 1.3 2013/11/06 20:56:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Nibbles"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/gnome-robots/gnome-robots-3.8.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.8.1.ebuild
index 1bfd5ca5683a..bade4ca972b8 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.8.1.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnome-robots/gnome-robots-3.8.1.ebuild,v 1.2 2013/08/31 08:05:52 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnome-robots/gnome-robots-3.8.1.ebuild,v 1.3 2013/11/06 20:56:52 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Robots"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/domination/Manifest b/games-board/domination/Manifest
index 7372d8be7338..107e160dbadb 100644
--- a/games-board/domination/Manifest
+++ b/games-board/domination/Manifest
@@ -1,2 +1,3 @@
 DIST Domination_1.1.1.2.zip 5998523 SHA256 edd8eab16d4d66f1365ba7aa1696b536458762962a61423a34b0e3a47b4f94bf SHA512 7058c17cef649e5149dd1a10e3cd3283d927998f07761a7f8078058d6776e0234ac798f47f1aa15f9980defbda006b3dbe7bd07e8633c9139aa7ce6cc152615e WHIRLPOOL 107e853d8063881cecc89b4a5a2712443f9d933fec1b28cf419267f93e05d2e9d46352bd2aeaf0fb25fefb497f0adab3a819241ba56eb0a92c470fc8db3d8201
 DIST Domination_1.1.1.4.zip 6333966 SHA256 22427a038a462184ee0f6533627a903423a5c1e3f3ce5da02cb77753f7ae441f SHA512 831b80a86a5e4f6559adb1b6f8549e851c989b6f42ecfbb8a0fd579827ce3d15725348a825bbcec083a62631b381d0b9b7913a22b0ed6b4bbfc4d8ff66987ff7 WHIRLPOOL d3bee221240ae043efc1e60f8d00d7569a6bb56375550b9ad30e1bd8fcb16055c874eef12da8656835dda402630d1574d3be1fb9619802de243293a6fa9ae21c
+DIST Domination_1.1.1.5.zip 6390032 SHA256 6e0dd1c869679cc80c7904d6512cf9f6fc858a985b60c5a33f3f3291d716f740 SHA512 116d96aded29f60e71eacc8069c6b9ad3b2e8b7e44ed06c730cdaf8e1de4b95650e928e1876feb6bcb08697cd6eaedf1529cf323855e2da652855d07e8337360 WHIRLPOOL cd3de0950075f6330931f0847bd048d9919afc6009bfe99b7f3f6bed09a1b7ade30ad918af23139db2b15baacfe79845d3ce75c42463c5aa59603d141639b251
diff --git a/games-board/domination/domination-1.1.1.5.ebuild b/games-board/domination/domination-1.1.1.5.ebuild
new file mode 100644
index 000000000000..fe6393982027
--- /dev/null
+++ b/games-board/domination/domination-1.1.1.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.5.ebuild,v 1.1 2013/11/07 03:49:03 mr_bones_ Exp $
+
+inherit eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="The well-known board game, written in java"
+HOMEPAGE="http://domination.sourceforge.net"
+SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+
+S=${WORKDIR}/Domination
+
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+EANT_BUILD_TARGET="game"
+
+src_compile() {
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	mkdir -p "${D}${GAMES_PREFIX}"/bin
+	cp "${S}"/FlashGUI.sh "${D}${GAMES_PREFIX}"/bin/${PN} || die
+	sed -i \
+		-e "s|cd.*|cd \"${GAMES_DATADIR}\"/${PN}|" \
+		"${D}${GAMES_PREFIX}"/bin/${PN} \
+		|| die
+	chmod +x "${D}${GAMES_PREFIX}"/bin/${PN} || die
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r "${S}"/* || die
+	rm -f "${D}${GAMES_DATADIR}"/${PN}/*.cmd || die
+	java-pkg_regjar "${D}/${GAMES_DATADIR}/${PN}"/*.jar
+
+	newicon resources/icon.png ${PN}.png
+	make_desktop_entry ${PN} "Domination"
+
+	prepgamesdirs
+}
diff --git a/games-board/four-in-a-row/four-in-a-row-3.8.1.ebuild b/games-board/four-in-a-row/four-in-a-row-3.8.1.ebuild
index 93ec314ebecb..81e966dd25de 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.8.1.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/four-in-a-row/four-in-a-row-3.8.1.ebuild,v 1.2 2013/08/31 07:25:56 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/four-in-a-row/four-in-a-row-3.8.1.ebuild,v 1.3 2013/11/06 20:57:41 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Four-in-a-row"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 1135a9ce57e8..d3cca715b1d7 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,2 +1 @@
-DIST gnome-chess-3.8.3.tar.xz 3279032 SHA256 c45493ca7de778029ea78bcf328410a6399dfd91f50241c6f6b4420115c2e786 SHA512 a1898532dc4ba01c0aba69a77566126852e5d27178e4d4b44fcce9f67cf6ea1c716ca56ceb5f53b5d6e9dff7dcc24f47cd32525e63df0cd9d335fce87cb46464 WHIRLPOOL 735107b126469a93f45a22455fff42bb79f0a21ade5ee65ac55d321a49cb5778ccd5603023e1dcb31ed6d21956e6c7a8d2e4638df9d54dd8acb912756a1d5374
 DIST gnome-chess-3.8.4.tar.xz 3271100 SHA256 4b7f20d875585e1d36bc0e4dda8c66ccd2e014f8ef829c4a6ec87275c4418d6a SHA512 e43068a4636cdf590c51c623bf7b737f9ed5bcc72d4505b09d4b42d2056658158242f8001c0130a45061b4564f4800c728ad74f23a2a6a11220f0905b3248235 WHIRLPOOL 3e87500f3c878a5213f346a06f1ac09c1fcd283047b60a9e4584d46f21788e14b8301ac05b2b4f54cf7b85dd8b18fd9366c1d133d780fae80b51bd7d9a31f832
diff --git a/games-board/gnome-chess/gnome-chess-3.8.3.ebuild b/games-board/gnome-chess/gnome-chess-3.8.3.ebuild
deleted file mode 100644
index 7c8d73be637c..000000000000
--- a/games-board/gnome-chess/gnome-chess-3.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-chess/gnome-chess-3.8.3.ebuild,v 1.1 2013/06/30 11:18:29 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome-games vala
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Chess"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0
-	virtual/glu
-	virtual/opengl
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-chess/gnome-chess-3.8.4.ebuild b/games-board/gnome-chess/gnome-chess-3.8.4.ebuild
index eea122c5b19f..857c257314fe 100644
--- a/games-board/gnome-chess/gnome-chess-3.8.4.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-chess/gnome-chess-3.8.4.ebuild,v 1.2 2013/08/31 07:37:07 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-chess/gnome-chess-3.8.4.ebuild,v 1.3 2013/11/06 20:58:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Chess"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index 851ccf814895..fc0228968242 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,2 +1 @@
-DIST gnome-mahjongg-3.8.0.tar.xz 4513464 SHA256 6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496 SHA512 0e869a05556d1fc0e4898971a31e38cb67a47a8e8086b519d3b9d91e83edf04658876ae71f313c1d8bccdb8285efc8ec9bfc29db6d8b847c681444799ce14ff1 WHIRLPOOL 68c42b9e2b06660cf3f7714a00f8b3a8818a63b17042163029c31aaa600b7d30c674958dedb0d6158a542ecdc239d387c5b4d8acffc32e732a759d8114e04656
 DIST gnome-mahjongg-3.8.1.tar.xz 4484400 SHA256 0b3ab0cce822feffcf7d50fd24a8a656b5b3013f0249c871d245c84e676c23c3 SHA512 b7f5c6fce2589da0e966d8cdf582b5d9d4f2e4bf563dcc7c85291bdcaab4fc50b836062d5b522f349f4ccceb9fe0e401462de73bd2121d6f4b94a278f86af6f4 WHIRLPOOL e3eca0b33ea39706bfcc716015b7a0d9526bc173340378b42d7383cd396bbd401918795cbb71d2fb1155acea365773ca35e95bdde0931df30cb5270de2d8037b
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.8.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.8.0.ebuild
deleted file mode 100644
index fc5e4d1b30d8..000000000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-mahjongg/gnome-mahjongg-3.8.0.ebuild,v 1.2 2013/08/31 10:39:47 pinkbyte Exp $
-
-EAPI=5
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome-games vala
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Mahjongg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0
-	>=x11-libs/gtk+-3.4.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.8.1.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.8.1.ebuild
index 227ed54cc1c7..1cbbf37bdf9c 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.8.1.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-mahjongg/gnome-mahjongg-3.8.1.ebuild,v 1.1 2013/09/28 19:54:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-mahjongg/gnome-mahjongg-3.8.1.ebuild,v 1.2 2013/11/06 20:58:54 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Mahjongg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 5f4376c79f55..9d64d247be11 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,2 +1 @@
-DIST gnome-mines-3.8.1.tar.xz 3366156 SHA256 81a47cf8eeb81f1d54ccd42b8eb04f5c8a1e6dcc8fd4f1bc714b147a934da633 SHA512 a183be18ea399d57b20c79a83cb63b0063d6ae491ab2dd3933aeb823b4c9409e504cba4653b46e057d07c0d5cabcc211b8942ce71ff979bba9340ee50af58f94 WHIRLPOOL de224822fd1800068caf6120e410fd80cef77397fa7d7319ac573e2f7dfd7d90925c1e51cc7d5fe095a5e5974f7b59af0cfc517e88c83b2f868d8fda2ececb79
 DIST gnome-mines-3.8.2.tar.xz 3329680 SHA256 e70f13056183f8d9a8aa3721516545364e10e9fde0a4b703de7cba1fe3af531d SHA512 2239e37e97db600e6575c62efe291608a8cdef51b965876efed0c86e679cee4aabbfb705687fdfb9c590faec780680c1963ee176d6de45a4c9be72e1c4647693 WHIRLPOOL 3ef31ec3cbc130f01287e93f78828eb326194aa6ed3f2dfd96e17c11d69e298e5fe5f0c2c43ed4575a2811547add8cfec5b9ecb921d405a16b87e5b0b034caeb
diff --git a/games-board/gnome-mines/gnome-mines-3.8.1.ebuild b/games-board/gnome-mines/gnome-mines-3.8.1.ebuild
deleted file mode 100644
index 31704c79b2d0..000000000000
--- a/games-board/gnome-mines/gnome-mines-3.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-mines/gnome-mines-3.8.1.ebuild,v 1.1 2013/06/30 11:32:17 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome-games vala
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Mines"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0
-	>=x11-libs/gtk+-3.4.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mines/gnome-mines-3.8.2.ebuild b/games-board/gnome-mines/gnome-mines-3.8.2.ebuild
index 341036c14af2..9de476c27ebb 100644
--- a/games-board/gnome-mines/gnome-mines-3.8.2.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-mines/gnome-mines-3.8.2.ebuild,v 1.2 2013/08/31 08:01:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnome-mines/gnome-mines-3.8.2.ebuild,v 1.3 2013/11/06 20:59:27 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Mines"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/hexxagon/Manifest b/games-board/hexxagon/Manifest
index 8ca764fc2986..5c98711fa257 100644
--- a/games-board/hexxagon/Manifest
+++ b/games-board/hexxagon/Manifest
@@ -1,2 +1 @@
-DIST hexxagon-1.0.1.tar.bz2 1278325 SHA256 a6a1579990797276132f5d0e26b5b70d60ef654cb35261e2b6c26220e7d40fd9 SHA512 528b754a36c681f24cf0b420620e9b1712aea9950ad066f0c8bbb87b2e7580745a63c373dd06e4db1d4630fbf2ff0fa399a073220e7cb6c1c93b0c4fa429e6c9 WHIRLPOOL f963ab5c2d48561382d874059426ba0a5f84ce39ca08b36f2555a711adec90b402b61a47a31a81cc3c3a6c24c752f447ab85434d9cb4876ba9251d618f4b3505
 DIST hexxagon-1.0.2.tar.bz2 1286713 SHA256 49b13516822fd32a9c58d62735b841a6e47e1714273e03ad20d8a9343a7623cc SHA512 8723534c4d260b1bac943609ca91ff224a120ad1f6e6362b1c515766f9ad3b339bbb9b0374cd71a482e127c47f6e1742b5189662f22e8eec07978417f5a6bda2 WHIRLPOOL ce1ae9d22b9f738dc33f944460d0d70d5f545287ce143dfb6baa530686ea4a6e1c849563a4b446a8d85d87c869f626b48d8b4d009651f6219e4f80bf63d72522
diff --git a/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch b/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch
deleted file mode 100644
index c3836cc5d5b2..000000000000
--- a/games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/gui/gtkhexxagonboard.cpp
-+++ src/gui/gtkhexxagonboard.cpp
-@@ -120,8 +120,8 @@
-             posx += width  * offset / 2;
-             posy += height * offset / 2;
- 
--            int x = (int) round(posx) + xoff;
--            int y = (int) round(posy) + yoff;
-+            int displayx = (int) round(posx) + xoff;
-+            int displayy = (int) round(posy) + yoff;
- 
-             int type;
-             LookUp lookup(bbMask);
-@@ -155,10 +155,10 @@
- 
-             Glib::RefPtr<Gdk::GC> gc = Gdk::GC::create(back);
-             gc->set_clip_mask(mask[type]);
--            gc->set_clip_origin(x, y);
-+            gc->set_clip_origin(displayx, displayy);
- 
-             if(back && map_board[type])
--                back->draw_drawable(gc, map_board[type], 0, 0, x, y, -1, -1);
-+                back->draw_drawable(gc, map_board[type], 0, 0, displayx, displayy, -1, -1);
- 
-             cellNo++;
-         }
-@@ -205,12 +205,12 @@
-             posx += width  * offset / 2;
-             posy += height * offset / 2;
-             
--            int x = (int) round(posx + w / 2) + xoff;
--            int y = (int) round(posy + h / 2) + yoff;
-+            int displayx = (int) round(posx + w / 2) + xoff;
-+            int displayy = (int) round(posy + h / 2) + yoff;
-         
-             // Now we got the place for cell cellNo
--            double dx = inx - x;
--            double dy = iny - y;
-+            double dx = inx - displayx;
-+            double dy = iny - displayy;
-             double a = (w/2)*(w/2);
-             double b  = (h/2)*(h/2);
-             
diff --git a/games-board/hexxagon/hexxagon-1.0.1.ebuild b/games-board/hexxagon/hexxagon-1.0.1.ebuild
deleted file mode 100644
index 8649abfd00cf..000000000000
--- a/games-board/hexxagon/hexxagon-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.1.ebuild,v 1.8 2012/07/07 23:10:25 tristan Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Clone of the original DOS game"
-HOMEPAGE="http://www.nesqi.se/"
-SRC_URI="http://www.nesqi.se/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newicon images/board_N_2.xpm ${PN}.xpm
-	make_desktop_entry ${PN} Hexxagon
-	dodoc README
-	prepgamesdirs
-}
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index a3cdf4d97b55..3ac996a44c2c 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1,2 +1 @@
-DIST iagno-3.8.2.tar.xz 2944212 SHA256 c4687214262c9fd838e40ea27fac8ed7c23db32690ef2d0f569373a8eaeb1de7 SHA512 3a417add3b2a197da73635fec1df2da7813f5419954e50ab0cb797b100441edc2738d9265fed1f2523540f816d6b7739d2fac2c876b922be011230aded9e4cc6 WHIRLPOOL 1777723c1b6c3e89adc009dec3534884a64a02a20bd3b1aeb30ada5de4a5bbcba713b74e6cabd57e39c6920ea6d460ec93acf51ffc8b24a0e248129449d87829
 DIST iagno-3.8.3.tar.xz 2949000 SHA256 fa64c5186006101cbfaaa77c164c68ae996471c8e1026f0b2757b375faa02a0e SHA512 cff895d657e2d618485a1c2aca6f0ecd549c7b0a11834f1954a8ab926079befbb0b70f2a7d2a59d39e46a00dfebb91c01e00f70827b410b49bba9bea8a1017be WHIRLPOOL 75b19226029ab0d9d7abd716c474a956bddc4cebd5d40281d1dc436dd9ccf2db31c740f148a5c75437179201aeed8952a51a0a3a4a66367e48a3474ca2bfb969
diff --git a/games-board/iagno/iagno-3.8.2.ebuild b/games-board/iagno/iagno-3.8.2.ebuild
deleted file mode 100644
index 5196edc0c8a9..000000000000
--- a/games-board/iagno/iagno-3.8.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/iagno/iagno-3.8.2.ebuild,v 1.1 2013/09/01 22:14:29 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome-games vala
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Iagno"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.4.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/iagno/iagno-3.8.3.ebuild b/games-board/iagno/iagno-3.8.3.ebuild
index 1f9ed53154d7..73922abf5c48 100644
--- a/games-board/iagno/iagno-3.8.3.ebuild
+++ b/games-board/iagno/iagno-3.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/iagno/iagno-3.8.3.ebuild,v 1.1 2013/10/04 18:54:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/iagno/iagno-3.8.3.ebuild,v 1.2 2013/11/06 21:00:07 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Iagno"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest
index fa65d54f6cdf..205fcddd5e04 100644
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@@ -1,2 +1 @@
 DIST PokerTH-1.0-src.tar.bz2 19125507 SHA256 5aaaf913a7696f12afe18f9b2da55c84f7343bf8afb45b25f7852a25fd1a6c10 SHA512 5209b37c946f32e7dc0107663bc6128f1e5becb293c4aec1bacd993f81f822450f8248d1dbad4096e0a93930f8d608499e98000f5af5ca0256dda23125059cae WHIRLPOOL 6fd2bb111cc612845f18dac50ffb518fbee96ae08c28b88052814019b9b26d3d8dd8088a4e29555cb78d35378534d784e08a13a1cf2827e9291ddfc7cd705cd8
-DIST PokerTH-1.0.1-src.tar.bz2 19201790 SHA256 29c359028a27fad0d30e11a9295e610593d23e34bffdb71de488f63f459e3d5d SHA512 b91fe3780eab3a7bd9ffe6f3629f514f87d9962978f42822850a826278febe2e06fbf3397df9d66d4d3d3d3f9d5688715308f4aae4bda5084b9d0b10a4af75d8 WHIRLPOOL cc7dba615a00c5a305abde3cae620ceff8557eb22040c436703bcbf0d3f54b95073573267f5a9326f1fd6fd872db9177d9371832646ce09658db12636e767f5b
diff --git a/games-board/pokerth/files/pokerth-1.0-underlinking.patch b/games-board/pokerth/files/pokerth-1.0-underlinking.patch
deleted file mode 100644
index 397fb7d6c1bc..000000000000
--- a/games-board/pokerth/files/pokerth-1.0-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Aug 16 22:25:12 UTC 2012
-Subject: build system
-
-fix compilation for linkers that don't permit underlinking
-reorder linker line to fix issues with as-needed
-
---- pokerth_server.pro
-+++ pokerth_server.pro
-@@ -114,8 +114,8 @@
- LIBS += -lpokerth_lib \
- 	-lpokerth_db \
- 	-lpokerth_protocol \
--	-lcurl \
--	-lircclient
-+	-lircclient \
-+	$$system(pkg-config --libs --static libcurl)
- 
- win32 {
- 	DEFINES += CURL_STATICLIB
diff --git a/games-board/pokerth/pokerth-1.0.1.ebuild b/games-board/pokerth/pokerth-1.0.1.ebuild
deleted file mode 100644
index 360116cd5fe8..000000000000
--- a/games-board/pokerth/pokerth-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-1.0.1.ebuild,v 1.4 2013/06/30 12:44:20 ago Exp $
-
-EAPI=5
-inherit flag-o-matic eutils qt4-r2 games
-
-MY_P="PokerTH-${PV}-src"
-DESCRIPTION="Texas Hold'em poker game"
-HOMEPAGE="http://www.pokerth.net/"
-SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2"
-
-LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dedicated"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/boost[threads(+)]
-	dev-libs/protobuf
-	dev-libs/libgcrypt
-	dev-libs/tinyxml[stl]
-	amd64? ( net-libs/libircclient )
-	ppc? ( >=net-libs/libircclient-1.6-r2 )
-	x86? ( net-libs/libircclient )
-	>=net-misc/curl-7.16
-	dev-qt/qtcore:4
-	virtual/gsasl
-	!dedicated? (
-		media-libs/libsdl:0
-		media-libs/sdl-mixer[mod,vorbis]
-		dev-qt/qtgui:4
-	)"
-DEPEND="${RDEPEND}
-	!dedicated? ( dev-qt/qtsql:4 )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if use dedicated ; then
-		sed -i \
-			-e 's/pokerth_game.pro//' \
-			pokerth.pro || die
-	fi
-
-	sed -i \
-		-e '/no_dead_strip_inits_and_terms/d' \
-		*pro || die
-
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dogamesbin bin/pokerth_server
-	if ! use dedicated ; then
-		dogamesbin ${PN}
-		insinto "${GAMES_DATADIR}/${PN}"
-		doins -r data
-		domenu ${PN}.desktop
-		doicon ${PN}.png
-	fi
-	doman docs/pokerth.1
-	dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt
-	prepgamesdirs
-}
diff --git a/games-board/spider/spider-1.2_p4.ebuild b/games-board/spider/spider-1.2_p4.ebuild
deleted file mode 100644
index d57b4feded92..000000000000
--- a/games-board/spider/spider-1.2_p4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/spider/spider-1.2_p4.ebuild,v 1.7 2013/01/24 00:01:58 hasufell Exp $
-
-EAPI=2
-inherit eutils games
-
-MY_P="${P%%_*}"
-MY_P="${MY_P/-/_}"
-DEB_V="${P##*_p}"
-
-DESCRIPTION="Spider Solitaire"
-HOMEPAGE="http://packages.debian.org/stable/games/spider"
-SRC_URI="mirror://debian/pool/main/s/spider/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/s/spider/${MY_P}-${DEB_V}.diff.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="athena"
-
-RDEPEND="x11-libs/libXext
-	athena? ( x11-libs/libXaw )
-	x11-libs/libXmu
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	x11-proto/xproto"
-
-S=${WORKDIR}/${MY_P/_/-}.orig
-
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-${DEB_V}.diff
-	sed -i \
-		-e '/MKDIRHIER/s:/X11::' \
-		*Imakefile \
-		|| die "sed failed"
-	rm Makefile
-}
-
-src_configure() {
-	imake \
-		-DUseInstalled \
-		-DSmallCards=NO \
-		-DRoundCards \
-		$(use athena && echo "-DCompileXAW=YES" || echo "-DCompileXlibOnly=YES") \
-		-I/usr/lib/X11/config \
-		|| die "imake failed"
-	sed -i \
-		-e '/CC = /d' \
-		-e '/CDEBUGFLAGS = /d' \
-		-e '/LDOPTIONS = /s/$/$(LDFLAGS)/' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		BINDIR="${GAMES_BINDIR}" \
-		MANSUFFIX="6" \
-		MANDIR="/usr/share/man/man6" \
-		HELPDIR="/usr/share/doc/${PF}" \
-		install install.doc install.man \
-		|| die "make install failed"
-
-	dodoc README* ChangeLog
-	newicon icons/Spider.png ${PN}.png
-	make_desktop_entry spider Spider
-	prepgamesdirs
-}
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index fd08927e7941..07a67c5161bc 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,2 +1 @@
-DIST tali-3.8.0.tar.xz 2931568 SHA256 77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5 SHA512 2270fa52cccfcda5d63f1d8a0d6f9aec62af716c378a60d47fc81effa549426d6db727c67718a9b2e98599ed05e4240e2811899bb209729c3b2727cf0227dd57 WHIRLPOOL 3856e471550ffe005a072abb7b2e74ef6f9d1864323e40209b5ad378e5a8f58baba779c4c008936ed0a9236c262633e4276d7bac515b0bc0cb368cc43886c64d
 DIST tali-3.8.1.tar.xz 3010660 SHA256 33a7a67a9ba2034cba916a033ee70285a334438a460fccd24373c7edcfc592c8 SHA512 c777c3188ea398fdbfda3526787f50e857df7bd96f9620f209c6ffda54bdf078d6688438f76f0e4c14bd9fbd71166b90fcc184d8884ab7306504e0caf773c810 WHIRLPOOL d8d4e9a26c50e67ba5a5397cff3d430ac787c02b0c577f886efb67a82a9e8f34332cfcf32a9f8371c357dfb29a57225e267a01e9f7ff57e3ccdb33e252d77054
diff --git a/games-board/tali/tali-3.8.0.ebuild b/games-board/tali/tali-3.8.0.ebuild
deleted file mode 100644
index 96520db4f71c..000000000000
--- a/games-board/tali/tali-3.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/tali/tali-3.8.0.ebuild,v 1.2 2013/08/31 10:46:55 pinkbyte Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Beat the odds in a poker-style dice game"
-HOMEPAGE="https://wiki.gnome.org/Tali"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.4:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-board/tali/tali-3.8.1.ebuild b/games-board/tali/tali-3.8.1.ebuild
index d6da665ce63f..4e57a28fe040 100644
--- a/games-board/tali/tali-3.8.1.ebuild
+++ b/games-board/tali/tali-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/tali/tali-3.8.1.ebuild,v 1.1 2013/09/15 21:40:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/tali/tali-3.8.1.ebuild,v 1.2 2013/11/06 21:00:38 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Tali"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/xmille/xmille-2.0-r1.ebuild b/games-board/xmille/xmille-2.0-r1.ebuild
deleted file mode 100644
index 5beb5ad51309..000000000000
--- a/games-board/xmille/xmille-2.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/xmille-2.0-r1.ebuild,v 1.13 2010/10/12 04:54:39 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils games
-
-DEB_PATCH_VER="12"
-DESCRIPTION="Mille Bournes card game"
-HOMEPAGE="http://www.milleborne.info/"
-SRC_URI="mirror://debian/pool/main/x/xmille/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/xmille/${PN}_${PV}-${DEB_PATCH_VER}.diff.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake"
-
-S=${WORKDIR}/${P}.orig
-
-PATCHES=( "${WORKDIR}"/${PN}_${PV}-${DEB_PATCH_VER}.diff )
-
-src_configure() {
-	xmkmf
-}
-
-src_compile() {
-	emake -j1 EXTRA_LDOPTIONS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dogamesbin xmille || die "dogamesbin failed"
-	dodoc CHANGES README
-	newman xmille.man xmille.6
-	prepgamesdirs
-}
diff --git a/games-misc/lolcat/lolcat-42.0.99-r1.ebuild b/games-misc/lolcat/lolcat-42.0.99-r1.ebuild
index 3dcf7c55a6e4..96ed32ed9c84 100644
--- a/games-misc/lolcat/lolcat-42.0.99-r1.ebuild
+++ b/games-misc/lolcat/lolcat-42.0.99-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.0.99-r1.ebuild,v 1.1 2012/10/03 20:37:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.0.99-r1.ebuild,v 1.3 2013/11/06 21:06:30 hasufell Exp $
 
-EAPI=4
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/games-puzzle/five-or-more/five-or-more-3.8.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.8.2.ebuild
index 224f57442ca9..feca52b5e9cd 100644
--- a/games-puzzle/five-or-more/five-or-more-3.8.2.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/five-or-more/five-or-more-3.8.2.ebuild,v 1.3 2013/08/31 07:21:03 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/five-or-more/five-or-more-3.8.2.ebuild,v 1.4 2013/11/06 21:01:08 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/Five%20or%20more"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.8.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.8.2.ebuild
index e3661a36274b..75f62c3348cb 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.8.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnome-klotski/gnome-klotski-3.8.2.ebuild,v 1.3 2013/08/31 07:59:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnome-klotski/gnome-klotski-3.8.2.ebuild,v 1.4 2013/11/06 21:01:29 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Klotski"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.8.1.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.8.1.ebuild
index ccb0a0c49463..2eaf53929f61 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.8.1.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnome-sudoku/gnome-sudoku-3.8.1.ebuild,v 1.5 2013/08/31 08:20:33 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnome-sudoku/gnome-sudoku-3.8.1.ebuild,v 1.6 2013/11/06 21:01:57 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/GnomeSudoku"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.8.1.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.8.1.ebuild
index 4f5f247a3982..d52bd5aeff54 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.8.1.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnome-tetravex/gnome-tetravex-3.8.1.ebuild,v 1.2 2013/08/31 08:10:19 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gnome-tetravex/gnome-tetravex-3.8.1.ebuild,v 1.3 2013/11/06 21:02:23 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Tetravex"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/lightsoff/lightsoff-3.8.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.8.0.ebuild
index 5a805f053a63..db27e248b481 100644
--- a/games-puzzle/lightsoff/lightsoff-3.8.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/lightsoff/lightsoff-3.8.0.ebuild,v 1.2 2013/08/31 15:29:17 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/lightsoff/lightsoff-3.8.0.ebuild,v 1.3 2013/11/06 21:02:45 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Lightsoff"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index cab9dddd178d..3960374fb6af 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,2 +1 @@
-DIST quadrapassel-3.8.1.tar.xz 1897592 SHA256 18935ab737c9a690104207758ba92223e8bfe6d5f1feeeadbbca3eb543ce5284 SHA512 7e364454c349ab04ea02c5850564d0cec5db86569c00f45024ce19549f0e7685dde4fee60a1c355f3f175a9020c3882c7ccee0692581dc3603347b145ebc0de5 WHIRLPOOL 3407516cf4d3a13ab76daeb0b8913386b2e69bd034ab80d36e6af42cf33db4828ccfe0f29d6973c42eb38897d1b37fd6215b7b678f1d16172823f16d8842636e
 DIST quadrapassel-3.8.2.tar.xz 1878620 SHA256 a2e861f65560345f697665434698e86a3df874ba2721ba1674dce26dcb0a6229 SHA512 b9cf220a233ffc16264757d426ec93509f1a21f27c8556fdc3ec5cdc58b96ffa473a37be37406248c37b79b9cdbf3763448a53066eca27745ac96ea1d1b4fc47 WHIRLPOOL 394fddcae2639654f00177632a5fba7c7619d132807338e3b75c13554923d2b0c7e7887d846d0aff4907c3c280acbfdba3c31d4e0303cdb917910e30c2983265
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.8.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.8.1.ebuild
deleted file mode 100644
index e14478a2df21..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadrapassel/quadrapassel-3.8.1.ebuild,v 1.2 2013/06/30 12:22:29 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome-games vala
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Quadrapassel"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0
-	>=media-libs/clutter-1.0.0
-	>=media-libs/clutter-gtk-0.91.6
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.4.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.8.2.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.8.2.ebuild
index 79ee18062b07..ed1c91408d2e 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.8.2.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadrapassel/quadrapassel-3.8.2.ebuild,v 1.3 2013/08/31 15:33:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadrapassel/quadrapassel-3.8.2.ebuild,v 1.4 2013/11/06 21:03:20 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Quadrapassel"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 37dbc4ca026c..b4383807b66f 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,2 +1 @@
-DIST swell-foop-3.8.1.tar.xz 2346124 SHA256 50d6b53d7507c1176ade9227f04d1c260143a5ebf8cf812c359c89eaeec9ee99 SHA512 dea97d8928337fb118480ae9fb20de17f107ec6a102256a455d4797a634e0cfb19e3c570d31ebdb716f019458604819a3748437d4475cc584cd13875f5610c6b WHIRLPOOL 1612ff58d33946f5b49e3fe41e597432b7bcec548df2390588342b1d85d618c2db82d46b719e3cedc84d73ff8b9c1aa7411339e6417b0e7d039a1134df3c6046
 DIST swell-foop-3.8.2.tar.xz 2327924 SHA256 33b72da1f5378801ae41cb13f3bc35ce44368c104327f68dd51f45653ca62cb9 SHA512 12be36e72084fe251a1b463ea26ce2c3ff0257815f4996ee84e5c86c6ea208f29610850c9f714b8cffdb61dc41cb319ee33f3c4e081731010e96fa1614d88606 WHIRLPOOL da295a899c1fbd589f27c583d7e71bb0c757a5670ba01a20478cbbe01c435bec7176c352c29d8f23eaddc05a3fa5d50370afc46df0d653dbc26b9ce9f8f2dafd
diff --git a/games-puzzle/swell-foop/swell-foop-3.8.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.8.1.ebuild
deleted file mode 100644
index 7d9b6deaa405..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.8.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/swell-foop/swell-foop-3.8.1.ebuild,v 1.2 2013/08/12 21:19:26 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome-games vala
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Swell%20Foop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	>=x11-libs/gtk+-3.4.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome-games_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/swell-foop/swell-foop-3.8.2.ebuild b/games-puzzle/swell-foop/swell-foop-3.8.2.ebuild
index 8a412e0e6ab0..0a54da56c81d 100644
--- a/games-puzzle/swell-foop/swell-foop-3.8.2.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/swell-foop/swell-foop-3.8.2.ebuild,v 1.2 2013/08/31 15:32:00 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/swell-foop/swell-foop-3.8.2.ebuild,v 1.3 2013/11/06 21:03:52 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Swell%20Foop"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 08dcbe15fc21..5122d59a4cdb 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,3 +1,2 @@
-DIST warzone2100-2.3.9.tar.gz 62509972 SHA256 9e843bb752c9c4798b8e6ea0edfb625f9aa2f2ba8cbfe42e31ab1c6aa9267adb SHA512 3af34969e701e089886a228f7e2c33b61d763adcfebe6f8f0ac3cdb24ed133173dbf051c544e12e74f278b7193f4cbc79bb1df2d1a974f8d03575557695a8662 WHIRLPOOL 0953c323c86f0771a69c652326cb72356eb9efe45ad787eee0341d8d10a0c92bd6721691d73bdcd07f24e708b6b14ffb046f643393399ac425fe6a040ad4ee4b
 DIST warzone2100-3.1.0.tar.xz 67316000 SHA256 c3e24b0a2703ffe5b171401e0eb9decbe9b130d6478e64300ccfb73a60f61c03 SHA512 bcd24d74bf5d9749897367fac1690a5d1abba162b3ecf87906b3674ef092f2a30c83961f5c3952545b7faa1c8970d43815db1e4effc7d87ca830e475e1654ff0 WHIRLPOOL 3955b1f35a422712b1c82cb378353554f49104f673ca18fcd7abe0b712ece213343c575fc8ae0d6e4b8303c0d4f7c6cec36d8d1eca5dd21d1caeb43b4afe1879
 DIST warzone2100-videos-2.2.wz 571937134 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6 WHIRLPOOL 167e39a896081d75415810cdaa9c00ce3fa4062db1ef2b4f6f164beb9c1a1d3fd34cd474880521b75e4580f4496b246586d9270219e1cfe8e7740d1f7af35ebe
diff --git a/games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch b/games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch
deleted file mode 100644
index 91d189575135..000000000000
--- a/games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=428494
-
-should be obsolete with >=dev-util/pkgconf-0.8.4
-
---- configure.ac
-+++ configure.ac
-@@ -76,7 +76,6 @@
- 
- # Check for pkg-config
- PKG_PROG_PKG_CONFIG
--AC_PROG_VERSION_CHECK([pkg-config], [0.9])
- 
- 
- # Check for compiler
diff --git a/games-strategy/warzone2100/warzone2100-2.3.9.ebuild b/games-strategy/warzone2100/warzone2100-2.3.9.ebuild
deleted file mode 100644
index e84e7fd3cc81..000000000000
--- a/games-strategy/warzone2100/warzone2100-2.3.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.3.9.ebuild,v 1.8 2013/02/07 22:19:34 ulm Exp $
-
-EAPI=2
-inherit autotools eutils versionator games
-
-MY_PV=$(get_version_component_range -2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.gz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-# upstream requested debug support
-IUSE="debug nls videos"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-games/physfs-2[zip]
-	dev-libs/popt
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libsdl[opengl,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl-net
-	media-libs/quesoglc
-	virtual/glu
-	virtual/opengl
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	app-arch/zip
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	media-fonts/dejavu"
-
-src_prepare() {
-	sed -i \
-		-e 's/#top_builddir/top_builddir/' \
-		po/Makevars || die
-
-	epatch "${FILESDIR}"/${P}-pkgconf.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-motif \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--localedir=/usr/share/locale \
-		--with-distributor="Gentoo ${PF}" \
-		--with-icondir=/usr/share/pixmaps \
-		--with-applicationdir=/usr/share/applications \
-		$(use_enable debug debug relaxed) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	if use videos ; then
-		insinto "${GAMES_DATADIR}"/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz || die
-	fi
-	doman doc/warzone2100.6
-	prepgamesdirs
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1b41930bfcfd..3365112dd1e7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 06 Nov 2013 17:36:59 +0000
+Thu, 07 Nov 2013 10:36:59 +0000
diff --git a/metadata/glsa/glsa-201311-03.xml b/metadata/glsa/glsa-201311-03.xml
new file mode 100644
index 000000000000..b11e5177dcd6
--- /dev/null
+++ b/metadata/glsa/glsa-201311-03.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-03">
+  <title>Quassel: Multiple Vulnerabilities</title>
+  <synopsis>Two vulnerabilities in Quassel may result in Denial of Service or
+    SQL injection.
+  </synopsis>
+  <product type="ebuild">quassel</product>
+  <announced>November 07, 2013</announced>
+  <revised>November 07, 2013: 1</revised>
+  <bug>338879</bug>
+  <bug>487632</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-irc/quassel" auto="yes" arch="*">
+      <unaffected range="ge">0.9.1</unaffected>
+      <vulnerable range="lt">0.9.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Quassel is a Qt4/KDE4 IRC client suppporting a remote daemon for 24/7
+      connectivity.
+    </p>
+  </background>
+  <description>
+    <p>Two vulnerabilities have been found in Quassel:</p>
+    
+    <ul>
+      <li>Quassel does not properly handle multiple CTCP requests
+        (CVE-2010-3443).
+      </li>
+      <li>Quassel, when used with certain versions of Qt and PostgreSQL, does
+        not sanitize user input (CVE-2013-4422).
+      </li>
+    </ul>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could send multiple CTCP requests in single private
+      message, possibly resulting in a Denial of Service condition. Futhermore,
+      a remote attacker may be able to execute arbitrary SQL statements.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Quassel users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-irc/quassel-0.9.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-3443">CVE-2010-3443</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-4422">CVE-2013-4422</uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 07 Oct 2011 23:37:21 +0000">
+    keytoaster
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 07 Nov 2013 01:26:59 +0000">ackle</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201311-04.xml b/metadata/glsa/glsa-201311-04.xml
new file mode 100644
index 000000000000..ba1d76034903
--- /dev/null
+++ b/metadata/glsa/glsa-201311-04.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201311-04">
+  <title>Vixie cron: Denial of Service</title>
+  <synopsis>A vulnerability has been found in Vixie cron, allowing local
+    attackers to conduct symlink attacks. 
+  </synopsis>
+  <product type="ebuild">vixie-cron</product>
+  <announced>November 07, 2013</announced>
+  <revised>November 07, 2013: 1</revised>
+  <bug>308055</bug>
+  <access>local</access>
+  <affected>
+    <package name="sys-process/vixie-cron" auto="yes" arch="*">
+      <unaffected range="ge">4.1-r14</unaffected>
+      <vulnerable range="lt">4.1-r14</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Paul Vixie’s cron daemon, a fully featured crond implementation.</p>
+  </background>
+  <description>
+    <p>Vixie cron contains a race condition relating to atime and mtime values
+      of temporary files.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could change the modification time of files, possibly
+      resulting in a Denial of Service condition via a symlink attack.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Vixie cron users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-process/vixie-cron-4.1-r14"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-0424">CVE-2010-0424</uri>
+  </references>
+  <metadata tag="requester" timestamp="Mon, 04 Nov 2013 03:18:24 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 07 Nov 2013 01:56:36 +0000">
+    BlueKnight
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1b41930bfcfd..3365112dd1e7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 06 Nov 2013 17:36:59 +0000
+Thu, 07 Nov 2013 10:36:59 +0000
diff --git a/metadata/md5-cache/app-admin/radmind-1.13.0 b/metadata/md5-cache/app-admin/radmind-1.13.0
index e37b280c6ca8..347a2f9e508d 100644
--- a/metadata/md5-cache/app-admin/radmind-1.13.0
+++ b/metadata/md5-cache/app-admin/radmind-1.13.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=ssl? ( dev-libs/openssl )
-DESCRIPTION=A suite of Unix command-line tools and a server designed to remotely administer the file systems of multiple Unix machines.
+DESCRIPTION=command-line tools and server to remotely administer multiple Unix filesystems
 EAPI=2
 HOMEPAGE=http://rsug.itd.umich.edu/software/radmind/
 IUSE=ssl
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/radmind/radmind-1.13.0.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=79a847270d2956efdba08adeb2b5322b
+_md5_=facb97302f62130da2b026579dfd6028
diff --git a/metadata/md5-cache/app-admin/radmind-1.7.1-r1 b/metadata/md5-cache/app-admin/radmind-1.7.1-r1
index ce9be8b18c45..8b4e5737c489 100644
--- a/metadata/md5-cache/app-admin/radmind-1.7.1-r1
+++ b/metadata/md5-cache/app-admin/radmind-1.7.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=ssl? ( dev-libs/openssl )
-DESCRIPTION=A suite of Unix command-line tools and a server designed to remotely administer the file systems of multiple Unix machines.
+DESCRIPTION=command-line tools and server to remotely administer multiple Unix filesystems
 HOMEPAGE=http://rsug.itd.umich.edu/software/radmind/
 IUSE=ssl
 KEYWORDS=~amd64 x86
@@ -9,4 +9,4 @@ RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/radmind/radmind-1.7.1.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d9d068c7f31f8289c9abbf3973d313b
+_md5_=8f2c90b0bb624cc6306d63fc02db60da
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.0 b/metadata/md5-cache/app-arch/zopfli-1.0.0
index 611455fec29e..99de98be802b 100644
--- a/metadata/md5-cache/app-arch/zopfli-1.0.0
+++ b/metadata/md5-cache/app-arch/zopfli-1.0.0
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Compression library programmed in C to perform very good, but slow, deflate or zlib compression.
 EAPI=5
 HOMEPAGE=https://code.google.com/p/zopfli/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://zopfli.googlecode.com/files/zopfli-1.0.0.zip
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953
-_md5_=39560ec24d8ffa26af69601fedc1154c
+_md5_=fe8183876eb740884e99cccd6b0f857d
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20130508-r1 b/metadata/md5-cache/app-arch/zopfli-1.0.0_p20130508-r1
index 6bb6880a30e7..1ef0b1d369a2 100644
--- a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20130508-r1
+++ b/metadata/md5-cache/app-arch/zopfli-1.0.0_p20130508-r1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Compression library programmed in C to perform very good, but slow, deflate or zlib compression.
 EAPI=5
 HOMEPAGE=https://code.google.com/p/zopfli/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/zopfli-1.0.0_p20130508.zip
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953
-_md5_=3a1b6c0c0f0d879ab8bea6c25ae5b0ab
+_md5_=22271fc1f43cee730329110ef4ad56e8
diff --git a/metadata/md5-cache/app-backup/backuppc-2.1.2-r1 b/metadata/md5-cache/app-backup/backuppc-2.1.2-r1
index c4dd5b3251e4..813e3fef4432 100644
--- a/metadata/md5-cache/app-backup/backuppc-2.1.2-r1
+++ b/metadata/md5-cache/app-backup/backuppc-2.1.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prerm setup test unpack
 DEPEND=dev-lang/perl >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A high performance, enterprise grade backup system for backing up Linux, Windows, Mac OS X desktops and laptops to a server's disk. No client side software needed.
+DESCRIPTION=A high-performance system for backing up computers to a server's disk.
 HOMEPAGE=http://backuppc.sourceforge.net
 IUSE=samba doc vhosts
 KEYWORDS=amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/File-RsyncP app-arch/par2cmdline app-arch/gzip app-arch/bzip2 a
 SLOT=2.1.2-r1
 SRC_URI=mirror://sourceforge/backuppc/BackupPC-2.1.2.tar.gz mirror://gentoo/backuppc-2.1.2-gentoo-0.1.tar.bz2
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=b1ccfab249ff11ff44ca27e702c32252
+_md5_=1e0685ba1ecee00a41166808470242ea
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.2 b/metadata/md5-cache/app-crypt/pinentry-0.8.2
index e0f19df6456b..0428d59b98e2 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.8.2
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=app-admin/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol
 EAPI=5
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? (
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.2.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1f45f39294826708263c442d9ac264fd
+_md5_=83b5a1b830e876b7f1e121849d8fe856
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.3 b/metadata/md5-cache/app-crypt/pinentry-0.8.3
index 7b1b693c812c..c3b3671c1f83 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.8.3
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=app-admin/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=app-admin/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol
 EAPI=5
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? (
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.3.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5c8b1687e3a960ecfa079270e0b0e84e
+_md5_=cbcb169093d41c3f9addac30dd849fa9
diff --git a/metadata/md5-cache/app-dicts/sword-hunuj-1.2 b/metadata/md5-cache/app-dicts/sword-hunuj-1.2
index 445882cfeb77..8b4e46f93fbb 100644
--- a/metadata/md5-cache/app-dicts/sword-hunuj-1.2
+++ b/metadata/md5-cache/app-dicts/sword-hunuj-1.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=app-arch/unzip
-DESCRIPTION=The New Translation Bible of the Hungarian Bible Society (Magyar Bibliatarsulat Ujforditasu Bibliaja)
+DESCRIPTION=New Translation Bible of the Hungarian Bible Society (Magyar Bibliatarsulat Ujforditasu Bibliaja)
 HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=freedist
@@ -8,4 +8,4 @@ RDEPEND=app-text/sword
 SLOT=0
 SRC_URI=mirror://gentoo/HunUj-1.2.zip
 _eclasses_=sword-module	c52595ffeb9df1c705120bffa624d484
-_md5_=c9e39827b04487e770582a18a31b5429
+_md5_=6aa2a6369a18270f1df75630c24e8cd3
diff --git a/metadata/md5-cache/app-doc/phrack-all-66 b/metadata/md5-cache/app-doc/phrack-all-66
index f93201867e73..cc77c76d9718 100644
--- a/metadata/md5-cache/app-doc/phrack-all-66
+++ b/metadata/md5-cache/app-doc/phrack-all-66
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
-DESCRIPTION=...a Hacker magazine by the community, for the community... (this will install *all* issues of phrack)
+DESCRIPTION=Hacker magazine by the community, for the community (this will install *all* issues of phrack)
 HOMEPAGE=http://www.phrack.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=phrack
 RDEPEND==app-doc/phrack-01 =app-doc/phrack-02 =app-doc/phrack-03 =app-doc/phrack-04 =app-doc/phrack-05 =app-doc/phrack-06 =app-doc/phrack-07 =app-doc/phrack-08 =app-doc/phrack-09 =app-doc/phrack-10 =app-doc/phrack-11 =app-doc/phrack-12 =app-doc/phrack-13 =app-doc/phrack-14 =app-doc/phrack-15 =app-doc/phrack-16 =app-doc/phrack-17 =app-doc/phrack-18 =app-doc/phrack-19 =app-doc/phrack-20 =app-doc/phrack-21 =app-doc/phrack-22 =app-doc/phrack-23 =app-doc/phrack-24 =app-doc/phrack-25 =app-doc/phrack-26 =app-doc/phrack-27 =app-doc/phrack-28 =app-doc/phrack-29 =app-doc/phrack-30 =app-doc/phrack-31 =app-doc/phrack-32 =app-doc/phrack-33 =app-doc/phrack-34 =app-doc/phrack-35 =app-doc/phrack-36 =app-doc/phrack-37 =app-doc/phrack-38 =app-doc/phrack-39 =app-doc/phrack-40 =app-doc/phrack-41 =app-doc/phrack-42 =app-doc/phrack-43 =app-doc/phrack-44 =app-doc/phrack-45 =app-doc/phrack-46 =app-doc/phrack-47 =app-doc/phrack-48 =app-doc/phrack-49 =app-doc/phrack-50 =app-doc/phrack-51 =app-doc/phrack-52 =app-doc/phrack-53 =app-doc/phrack-54 =app-doc/phrack-55 =app-doc/phrack-56 =app-doc/phrack-57 =app-doc/phrack-58 =app-doc/phrack-59 =app-doc/phrack-60 =app-doc/phrack-61 =app-doc/phrack-62 =app-doc/phrack-63 =app-doc/phrack-64 =app-doc/phrack-65 =app-doc/phrack-66
 SLOT=0
-_md5_=9b8ff115e73e32d85ef5bbd226086556
+_md5_=13ef55873e4815212518745dce8b0222
diff --git a/metadata/md5-cache/app-doc/phrack-all-67 b/metadata/md5-cache/app-doc/phrack-all-67
index 2f44fa4b324a..6a946adefc76 100644
--- a/metadata/md5-cache/app-doc/phrack-all-67
+++ b/metadata/md5-cache/app-doc/phrack-all-67
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
-DESCRIPTION=...a Hacker magazine by the community, for the community... (this will install *all* issues of phrack)
+DESCRIPTION=Hacker magazine by the community, for the community (this will install *all* issues of phrack)
 HOMEPAGE=http://www.phrack.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=phrack
 RDEPEND==app-doc/phrack-01 =app-doc/phrack-02 =app-doc/phrack-03 =app-doc/phrack-04 =app-doc/phrack-05 =app-doc/phrack-06 =app-doc/phrack-07 =app-doc/phrack-08 =app-doc/phrack-09 =app-doc/phrack-10 =app-doc/phrack-11 =app-doc/phrack-12 =app-doc/phrack-13 =app-doc/phrack-14 =app-doc/phrack-15 =app-doc/phrack-16 =app-doc/phrack-17 =app-doc/phrack-18 =app-doc/phrack-19 =app-doc/phrack-20 =app-doc/phrack-21 =app-doc/phrack-22 =app-doc/phrack-23 =app-doc/phrack-24 =app-doc/phrack-25 =app-doc/phrack-26 =app-doc/phrack-27 =app-doc/phrack-28 =app-doc/phrack-29 =app-doc/phrack-30 =app-doc/phrack-31 =app-doc/phrack-32 =app-doc/phrack-33 =app-doc/phrack-34 =app-doc/phrack-35 =app-doc/phrack-36 =app-doc/phrack-37 =app-doc/phrack-38 =app-doc/phrack-39 =app-doc/phrack-40 =app-doc/phrack-41 =app-doc/phrack-42 =app-doc/phrack-43 =app-doc/phrack-44 =app-doc/phrack-45 =app-doc/phrack-46 =app-doc/phrack-47 =app-doc/phrack-48 =app-doc/phrack-49 =app-doc/phrack-50 =app-doc/phrack-51 =app-doc/phrack-52 =app-doc/phrack-53 =app-doc/phrack-54 =app-doc/phrack-55 =app-doc/phrack-56 =app-doc/phrack-57 =app-doc/phrack-58 =app-doc/phrack-59 =app-doc/phrack-60 =app-doc/phrack-61 =app-doc/phrack-62 =app-doc/phrack-63 =app-doc/phrack-64 =app-doc/phrack-65 =app-doc/phrack-66 =app-doc/phrack-67
 SLOT=0
-_md5_=dc7722e80fedbe4a261e808bb3bab5de
+_md5_=f2d56dac8a74d10996226c57efea9c4e
diff --git a/metadata/md5-cache/app-doc/phrack-all-68 b/metadata/md5-cache/app-doc/phrack-all-68
index c63159e399de..346cef0ea008 100644
--- a/metadata/md5-cache/app-doc/phrack-all-68
+++ b/metadata/md5-cache/app-doc/phrack-all-68
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
-DESCRIPTION=...a Hacker magazine by the community, for the community... (this will install *all* issues of phrack)
+DESCRIPTION=Hacker magazine by the community, for the community (this will install *all* issues of phrack)
 HOMEPAGE=http://www.phrack.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=phrack
 RDEPEND==app-doc/phrack-01 =app-doc/phrack-02 =app-doc/phrack-03 =app-doc/phrack-04 =app-doc/phrack-05 =app-doc/phrack-06 =app-doc/phrack-07 =app-doc/phrack-08 =app-doc/phrack-09 =app-doc/phrack-10 =app-doc/phrack-11 =app-doc/phrack-12 =app-doc/phrack-13 =app-doc/phrack-14 =app-doc/phrack-15 =app-doc/phrack-16 =app-doc/phrack-17 =app-doc/phrack-18 =app-doc/phrack-19 =app-doc/phrack-20 =app-doc/phrack-21 =app-doc/phrack-22 =app-doc/phrack-23 =app-doc/phrack-24 =app-doc/phrack-25 =app-doc/phrack-26 =app-doc/phrack-27 =app-doc/phrack-28 =app-doc/phrack-29 =app-doc/phrack-30 =app-doc/phrack-31 =app-doc/phrack-32 =app-doc/phrack-33 =app-doc/phrack-34 =app-doc/phrack-35 =app-doc/phrack-36 =app-doc/phrack-37 =app-doc/phrack-38 =app-doc/phrack-39 =app-doc/phrack-40 =app-doc/phrack-41 =app-doc/phrack-42 =app-doc/phrack-43 =app-doc/phrack-44 =app-doc/phrack-45 =app-doc/phrack-46 =app-doc/phrack-47 =app-doc/phrack-48 =app-doc/phrack-49 =app-doc/phrack-50 =app-doc/phrack-51 =app-doc/phrack-52 =app-doc/phrack-53 =app-doc/phrack-54 =app-doc/phrack-55 =app-doc/phrack-56 =app-doc/phrack-57 =app-doc/phrack-58 =app-doc/phrack-59 =app-doc/phrack-60 =app-doc/phrack-61 =app-doc/phrack-62 =app-doc/phrack-63 =app-doc/phrack-64 =app-doc/phrack-65 =app-doc/phrack-66 =app-doc/phrack-67 =app-doc/phrack-68
 SLOT=0
-_md5_=4a319fe7198594d7d31a01d2cd7e1c71
+_md5_=0777d430312bd4b426abbadf63b33a18
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.1.3.1 b/metadata/md5-cache/app-emulation/libvirt-1.1.3.1
new file mode 100644
index 000000000000..eeb4023fff3e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-1.1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-lang/perl dev-libs/libxslt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=5
+HOMEPAGE=http://www.libvirt.org/
+IUSE=audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit python +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc systemd python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) 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? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
+REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=http://libvirt.org/sources/stable_updates/libvirt-1.1.3.1.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.3.1.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-single-r1	4d9f916e821994a2ccdbbcfc8ac225c9	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0caad1233712921f4165a219f256eb3c
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-279.1 b/metadata/md5-cache/app-emulation/vmware-modules-279.1
new file mode 100644
index 000000000000..9706d4985bca
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vmware-modules-279.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=|| ( =app-emulation/vmware-player-6.0.1* =app-emulation/vmware-workstation-10.0.1* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=VMware kernel modules
+EAPI=5
+HOMEPAGE=http://www.vmware.com/
+IUSE=pax_kernel kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	linux-info	a9cbd6bbe2b28166e403321882f3c73c	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ff97d6ad40b935a7395d627b82fb32db
diff --git a/metadata/md5-cache/app-emulation/vmware-player-6.0.0.1295980 b/metadata/md5-cache/app-emulation/vmware-player-6.0.0.1295980
index 5808b571b161..e54bcc0b3856 100644
--- a/metadata/md5-cache/app-emulation/vmware-player-6.0.0.1295980
+++ b/metadata/md5-cache/app-emulation/vmware-player-6.0.0.1295980
@@ -4,6 +4,7 @@ DESCRIPTION=Emulate a complete PC on your PC without the usual performance overh
 EAPI=5
 HOMEPAGE=http://www.vmware.com/products/player/
 IUSE=cups doc +vmware-tools
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-279.0 vmware-tools? ( app-emulation/vmware-tools )
 RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-cpp/pangomm:1.4 dev-libs/atk dev-libs/glib:2 dev-libs/libaio dev-libs/libsigc++ dev-libs/libxml2 =dev-libs/openssl-0.9.8* dev-libs/xmlrpc-c gnome-base/libgnomecanvas gnome-base/libgtop:2 gnome-base/librsvg:2 gnome-base/orbit media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl =media-libs/libpng-1.2* net-misc/curl cups? ( net-print/cups ) sys-devel/gcc sys-fs/fuse sys-libs/glibc sys-libs/zlib x11-libs/cairo x11-libs/gtk+:2 x11-libs/libgksu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/startup-notification !app-emulation/vmware-workstation
@@ -11,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( https://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.0/1295980/linux/core/VMware-Player-6.0.0-1295980.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.0/1295980/linux/core/VMware-Player-6.0.0-1295980.x86_64.bundle.tar )
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
-_md5_=0abd9d2dec9df68920a2c143e13920bc
+_md5_=56ba08f2c4de83318a38ae080296d48a
diff --git a/metadata/md5-cache/app-emulation/vmware-tools-9.6.1.1379776 b/metadata/md5-cache/app-emulation/vmware-tools-9.6.1.1379776
new file mode 100644
index 000000000000..0d2a3b071bd9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vmware-tools-9.6.1.1379776
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=dev-libs/libxslt
+DESCRIPTION=VMware Tools for guest operating systems
+HOMEPAGE=http://www.vmware.com/products/player/
+IUSE=vmware_guest_freebsd vmware_guest_linux vmware_guest_netware vmware_guest_solaris vmware_guest_windows vmware_guest_winPre2k
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=vmware
+RESTRICT=mirror
+SLOT=0
+SRC_URI=vmware_guest_freebsd? ( amd64? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-freebsd-9.6.1-1379776.x86_64.component.tar ) x86? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-freebsd-9.6.1-1379776.i386.component.tar ) ) vmware_guest_linux? ( amd64? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-linux-9.6.1-1379776.x86_64.component.tar ) x86? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-linux-9.6.1-1379776.i386.component.tar ) ) vmware_guest_netware? ( amd64? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-netware-9.6.1-1379776.x86_64.component.tar ) x86? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-netware-9.6.1-1379776.i386.component.tar ) ) vmware_guest_solaris? ( amd64? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-solaris-9.6.1-1379776.x86_64.component.tar ) x86? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-solaris-9.6.1-1379776.i386.component.tar ) ) vmware_guest_windows? ( amd64? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-windows-9.6.1-1379776.x86_64.component.tar ) x86? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-windows-9.6.1-1379776.i386.component.tar ) ) vmware_guest_winPre2k? ( amd64? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-winPre2k-9.6.1-1379776.x86_64.component.tar ) x86? ( http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.1/1379776/linux/packages/vmware-tools-winPre2k-9.6.1-1379776.i386.component.tar ) )
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
+_md5_=ffb53d8e74d83e9769af82e946251610
diff --git a/metadata/md5-cache/app-emulation/vmware-workstation-10.0.1.1379776 b/metadata/md5-cache/app-emulation/vmware-workstation-10.0.1.1379776
new file mode 100644
index 000000000000..2acf2ffe8ca1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vmware-workstation-10.0.1.1379776
@@ -0,0 +1,15 @@
+DEFINED_PHASES=config install postinst postrm preinst prepare prerm unpack
+DEPEND=virtual/pkgconfig >=sys-apps/sed-4 dev-libs/libxslt
+DESCRIPTION=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+EAPI=4
+HOMEPAGE=http://www.vmware.com/products/workstation/
+IUSE=cups doc ovftool server vix vmware-tools
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=vmware GPL-2
+PDEPEND=~app-emulation/vmware-modules-279.1 vmware-tools? ( app-emulation/vmware-tools )
+RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm dev-cpp/pangomm dev-libs/atk dev-libs/glib:2 dev-libs/icu dev-libs/expat dev-libs/libaio dev-libs/libsigc++ dev-libs/libxml2 =dev-libs/openssl-0.9.8* dev-libs/xmlrpc-c gnome-base/libgnomecanvas gnome-base/libgtop:2 gnome-base/librsvg:2 gnome-base/orbit media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl =media-libs/libpng-1.2* media-libs/libpng net-misc/curl cups? ( net-print/cups ) sys-devel/gcc sys-fs/fuse sys-libs/glibc sys-libs/zlib x11-libs/cairo x11-libs/gtk+:2 x11-libs/libgksu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/startup-notification x11-themes/hicolor-icon-theme !app-emulation/vmware-player
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/VMware-Workstation-10.0.1-1379776.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/VMware-Workstation-10.0.1-1379776.x86_64.bundle.tar ) https://github.com/akhuettel/systemd-vmware/archive/gentoo-01.tar.gz
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
+_md5_=a93ddb613a07f49586662c5fd596f885
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r4 b/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r5
similarity index 98%
rename from metadata/md5-cache/app-emulation/xen-tools-4.2.2-r4
rename to metadata/md5-cache/app-emulation/xen-tools-4.2.2-r5
index 26b43b55e0b1..8e81ccf1a27b 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r4
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r5
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.2/xen-4.2.2.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2 http://dev.gentoo.org/~idella4//patches/XSA-55patches.tar.gz
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	4d9f916e821994a2ccdbbcfc8ac225c9	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=10b181ab7d9560f3ad1e0d84dfdba2a6
+_md5_=1da4f02da45ac6646f3f2da7906fbd91
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.3.0-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.3.0-r3
similarity index 98%
rename from metadata/md5-cache/app-emulation/xen-tools-4.3.0-r2
rename to metadata/md5-cache/app-emulation/xen-tools-4.3.0-r3
index bd2f80eac9f2..0eb365c5d115 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.3.0-r2
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.3.0-r3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.3.0/xen-4.3.0.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz
 _eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	4d9f916e821994a2ccdbbcfc8ac225c9	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=80f08700202625799b48dfb64957475d
+_md5_=bc3427a6382a83f6b224c89b919e3bb6
diff --git a/metadata/md5-cache/app-misc/elasticsearch-0.90.6 b/metadata/md5-cache/app-misc/elasticsearch-0.90.6
new file mode 100644
index 000000000000..b8ccf4511518
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-0.90.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=5
+HOMEPAGE=http://www.elasticsearch.org/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jre
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.6.tar.gz
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6a4998bbfb9986c8cd7630ed2bb76ba6
diff --git a/metadata/md5-cache/app-mobilephone/lightblue-0.4 b/metadata/md5-cache/app-mobilephone/lightblue-0.4
index d56dc388893b..87874e554b7d 100644
--- a/metadata/md5-cache/app-mobilephone/lightblue-0.4
+++ b/metadata/md5-cache/app-mobilephone/lightblue-0.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=>=dev-libs/openobex-1.3 >=dev-python/pybluez-0.9 =dev-lang/python-2*
-DESCRIPTION=LightBlue is a cross-platform Bluetooth API for Python which provides simple access to Bluetooth operations
+DESCRIPTION=Cross-platform Bluetooth API for Python which provides simple access to Bluetooth operations
 EAPI=3
 HOMEPAGE=http://lightblue.sourceforge.net/
 KEYWORDS=~amd64
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/openobex-1.3 >=dev-python/pybluez-0.9 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/lightblue/lightblue-0.4.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953
-_md5_=90370dbec89e148ff496afb1a541679e
+_md5_=abd73e06438bce6aab5e9fd35e60e85c
diff --git a/metadata/md5-cache/app-text/cook-1.0.2-r1 b/metadata/md5-cache/app-text/cook-1.0.2-r1
index 53ef15347737..a8b9ea5529ce 100644
--- a/metadata/md5-cache/app-text/cook-1.0.2-r1
+++ b/metadata/md5-cache/app-text/cook-1.0.2-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install postinst
-DESCRIPTION=COOK is an embedded language which can be used as a macro preprocessor and for similar text processing.
+DESCRIPTION=Embedded language which can be used as a macro preprocessor and for similar text processing.
 HOMEPAGE=http://cook.sourceforge.net/
 KEYWORDS=~amd64 ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cook/cook-1.0.2.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953
-_md5_=5d1b0ab9cf260cd7bcfe0b2b58107a53
+_md5_=83c1478a77b8c8929284add177816a2a
diff --git a/metadata/md5-cache/app-text/mbtpdfasm-1.0.28-r1 b/metadata/md5-cache/app-text/mbtpdfasm-1.0.28-r1
index a94cfa0d2931..452d9b0ad6e3 100644
--- a/metadata/md5-cache/app-text/mbtpdfasm-1.0.28-r1
+++ b/metadata/md5-cache/app-text/mbtpdfasm-1.0.28-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DESCRIPTION=mbtPdfAsm can assemble/merge PDF files, extract information from PDF files, and update the metadata in PDF files.
+DESCRIPTION=Tool to assemble/merge PDF files, extract information from, and update the metadata in PDF files.
 EAPI=2
 HOMEPAGE=http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://thierry.schmit.free.fr/spip/IMG/gz/mbtPdfAsm-1.0.28.tar.gz http://sbriesen.de/gentoo/distfiles/mbtpdfasm-1.0.28-manual.pdf.bz2
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bd7ab126b0d19301ea80bdabc2cd3477
+_md5_=ad909be1376c75894ac7d91558196d76
diff --git a/metadata/md5-cache/app-text/pelican-3.3 b/metadata/md5-cache/app-text/pelican-3.3
index 91cf954d60cc..54b7d2cfe8c2 100644
--- a/metadata/md5-cache/app-text/pelican-3.3
+++ b/metadata/md5-cache/app-text/pelican-3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/feedgenerator[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) virtual/python-argparse[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=dev-python/feedgenerator[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/python-argparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 DESCRIPTION=A tool to generate a static blog, with restructured text (or markdown) input files.
 EAPI=5
 HOMEPAGE=http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican
-IUSE=examples markdown python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=examples markdown python_targets_python2_7 python_targets_python3_3
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pelican/pelican-3.3.tar.gz
 _eclasses_=distutils-r1	26fe65665d086911163d4502473bd093	eutils	4878e7f88afc0ba0866ac112190b0fd4	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-r1	b81583006559e9b008883355c9889e29	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f981f24dac758ac67b9c2faa47b653e2
+_md5_=29981feab5e5297733630c33b786bdb1
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.114_p1 b/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
index c291a6081512..a5c6d07bc1b3 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
+++ b/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare test unpack
 DEPEND=dev-libs/popt test? ( sys-apps/iproute2 sys-process/procps ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Cluster implementation of the TDB database used by Samba and other projects to store temporary data.
+DESCRIPTION=A cluster implementation of the TDB database used to store temporary data.
 EAPI=2
 HOMEPAGE=http://ctdb.samba.org/
 IUSE=test
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.114-1.src.rpm http://ctdb.samba.org/packages/redhat/RHEL5/old/ctdb-1.0.114-1.src.rpm
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1936ede7f57b652549842c6f305df8e2
+_md5_=ad0eea051e7a3b67cd6391446da74bc6
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.73 b/metadata/md5-cache/dev-db/ctdb-1.0.73
index 57299f71618b..cad583ba1626 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.0.73
+++ b/metadata/md5-cache/dev-db/ctdb-1.0.73
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A cluster implementation of the TDB database used by Samba and other projects to store temporary data.
+DESCRIPTION=A cluster implementation of the TDB database used to store temporary data.
 EAPI=2
 HOMEPAGE=http://ctdb.samba.org/
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.73.tgz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953
-_md5_=d4ebda60405e1e662a003999b1353558
+_md5_=8fc1c403fd8f45f2b4fad0ab4f966179
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.88 b/metadata/md5-cache/dev-db/ctdb-1.0.88
index 4c3866a151bb..234b19a5e921 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.0.88
+++ b/metadata/md5-cache/dev-db/ctdb-1.0.88
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DEPEND=dev-libs/popt || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A cluster implementation of the TDB database used by Samba and other projects to store temporary data.
+DESCRIPTION=A cluster implementation of the TDB database used to store temporary data.
 EAPI=2
 HOMEPAGE=http://ctdb.samba.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.88.tgz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=47d4f44b19fbfe5184ae11e82600bdbd
+_md5_=2a11d1492654c6b811a7435b931eff9a
diff --git a/metadata/md5-cache/dev-db/libdbi-0.8.3 b/metadata/md5-cache/dev-db/libdbi-0.8.3
index 14dba1c13caa..ba2933ba7cdf 100644
--- a/metadata/md5-cache/dev-db/libdbi-0.8.3
+++ b/metadata/md5-cache/dev-db/libdbi-0.8.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl.
+DESCRIPTION=libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl.
 HOMEPAGE=http://libdbi.sourceforge.net/
 IUSE=doc
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
@@ -9,4 +9,4 @@ PDEPEND=>=dev-db/libdbi-drivers-0.8.3
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi/libdbi-0.8.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d6c9c50c4ed2ebfd10aab65089649cc6
+_md5_=3e1a33c58d42f269c22a3dca26f4ab86
diff --git a/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1 b/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1
index 9a9b96777dab..9f9cd173f47e 100644
--- a/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1
+++ b/metadata/md5-cache/dev-db/libodbc++-0.2.5-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-db/unixODBC sys-libs/ncurses
-DESCRIPTION=Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC.
+DESCRIPTION=C++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC.
 EAPI=2
 HOMEPAGE=http://libodbcxx.sourceforge.net/
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-db/unixODBC sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/libodbcxx/libodbc++-0.2.5.tar.bz2
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8784feb7f19d18c8dd0d96df3a98f947
+_md5_=cf35b2b3ae436926e0071e5d8d57d2fa
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.2 b/metadata/md5-cache/dev-db/mysql-super-smack-1.2
index 25a2594992fc..afbf4db2c32b 100644
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.2
+++ b/metadata/md5-cache/dev-db/mysql-super-smack-1.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install setup unpack
 DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =sys-devel/automake-1.4* >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL.
+DESCRIPTION=Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL.
 HOMEPAGE=http://jeremy.zawodny.com/mysql/super-smack/
 IUSE=mysql postgres
 KEYWORDS=x86
@@ -9,4 +9,4 @@ RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://jeremy.zawodny.com/mysql/super-smack/super-smack-1.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=500a182bf852107e02c953a01e9f6762
+_md5_=76c685c2cac186d5d05ea6e2d0dc5c33
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2 b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
index b6fc98da1ce9..dcf1bec2ed2b 100644
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
+++ b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =sys-devel/automake-1.4* >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL.
+DESCRIPTION=Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL.
 EAPI=2
 HOMEPAGE=http://vegan.net/tony/supersmack/
 IUSE=+mysql postgres
@@ -10,4 +10,4 @@ RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server )
 SLOT=0
 SRC_URI=http://vegan.net/tony/supersmack/super-smack-1.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5c2342eccd15afe175da943dc28d6093
+_md5_=568be11d4efaff9d3fc513b178f1ac36
diff --git a/metadata/md5-cache/dev-db/odbtp-1.1.4 b/metadata/md5-cache/dev-db/odbtp-1.1.4
index 0e7ca2a52d40..b30042ed9976 100644
--- a/metadata/md5-cache/dev-db/odbtp-1.1.4
+++ b/metadata/md5-cache/dev-db/odbtp-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DESCRIPTION=ODBTP is a fast, efficient TCP/IP protocol for connecting to Win32-based databases from any platform.
+DESCRIPTION=Fast, efficient TCP/IP protocol for connecting to Win32-based databases from any platform.
 HOMEPAGE=http://odbtp.sourceforge.net/
 IUSE=doc
 KEYWORDS=~amd64 ~x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2 LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/odbtp/odbtp-1.1.4.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df671e74de512bc3434038de8bccf5fb
+_md5_=e99a65f77c06a7e7fa09f05f6d43dc99
diff --git a/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1 b/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
index 3de5d05d4a4a..506e8c22210d 100644
--- a/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
+++ b/metadata/md5-cache/dev-embedded/jtag-0.5.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=prepare
 DEPEND=dev-embedded/include
-DESCRIPTION=software package for working with JTAG-aware (IEEE 1149.1) hardware devices (parts) and boards through JTAG adapter
+DESCRIPTION=Software for working with JTAG-aware (IEEE 1149.1) devices (parts) and boards through JTAG adapter
 EAPI=4
 HOMEPAGE=http://openwince.sourceforge.net/jtag/
 KEYWORDS=x86 sparc ~ppc
@@ -9,4 +9,4 @@ RDEPEND=dev-embedded/include !dev-embedded/urjtag
 SLOT=0
 SRC_URI=mirror://sourceforge/openwince/jtag-0.5.1.tar.bz2
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4fc05cf9d4066c4b3cddae00a9b05700
+_md5_=d4196fc6fc39e87b398b211eeea33bcf
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
index 8fa3d233d4ba..1ac67710bb0a 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3_p20120406/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.3_p20120406.patch.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=812f676b33d442d98af9c0ffa440d85c
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
index 30cb552a09a8..4644385d2f21 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120911/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/dist/msp430-gcc-4.7.0_p20120911.patch.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df1eeaed61e12996abc6fcb46df20146
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r1 b/metadata/md5-cache/dev-java/colt-1.2.0-r1
index 12f9da274d71..c474d217bc88 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup unpack
 DEPEND=>=virtual/jdk-1.4 >=dev-java/concurrent-util-1.3.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=Colt provides a set of Open Source Libraries for High Performance Scientific and Technical Computing in Java.
+DESCRIPTION=A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java.
 HOMEPAGE=http://www-itg.lbl.gov/~hoschek/colt/
 IUSE=elibc_FreeBSD source doc elibc_FreeBSD
 KEYWORDS=amd64 ppc ppc64 x86
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/concurrent-util-1.3.4 >=dev-java/java-confi
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a8937ad606d8d642e1e27740cf03c5ae
+_md5_=fe10ba5036fe12b02f5c68ab57b8d981
diff --git a/metadata/md5-cache/dev-java/fastutil-4.3.1-r1 b/metadata/md5-cache/dev-java/fastutil-4.3.1-r1
index a460135ec001..85a595e4006a 100644
--- a/metadata/md5-cache/dev-java/fastutil-4.3.1-r1
+++ b/metadata/md5-cache/dev-java/fastutil-4.3.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion.
+DESCRIPTION=Provides faster type-specific maps, sets and lists with a small memory footprint.
 HOMEPAGE=http://fastutil.dsi.unimi.it
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc x86
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=4.3
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-4.3.1-src.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c53c8bea3b3af8f3f950c9524ab4cbf6
+_md5_=16cc9c59ffa1b5028b85aaf91b22a058
diff --git a/metadata/md5-cache/dev-java/fastutil-4.4.2-r1 b/metadata/md5-cache/dev-java/fastutil-4.4.2-r1
index 3656b0b07a1f..7ced998fa347 100644
--- a/metadata/md5-cache/dev-java/fastutil-4.4.2-r1
+++ b/metadata/md5-cache/dev-java/fastutil-4.4.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion.
+DESCRIPTION=Provides faster type-specific maps, sets and lists with a small memory footprint.
 HOMEPAGE=http://fastutil.dsi.unimi.it
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc x86
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=4.4
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-4.4.2-src.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=85ae4c9ee720e0999e3e72b312d59a3f
+_md5_=6e082ef1e802a1754e5641b9f81749f7
diff --git a/metadata/md5-cache/dev-java/fastutil-5.0.9 b/metadata/md5-cache/dev-java/fastutil-5.0.9
index a8722932fe44..f702a0330c9c 100644
--- a/metadata/md5-cache/dev-java/fastutil-5.0.9
+++ b/metadata/md5-cache/dev-java/fastutil-5.0.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=Provides type-specific maps, sets and lists with a small memory footprint for much faster access and insertion.
+DESCRIPTION=Provides faster type-specific maps, sets and lists with a small memory footprint.
 HOMEPAGE=http://fastutil.dsi.unimi.it
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc x86
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=5.0
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-5.0.9-src.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cb91b3bb797b4e4cbff9f94e1cbca18b
+_md5_=376c9eb2d2ad48db92e5977468ae844c
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index cd65690304a9..d4cf77e20b8a 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup unpack
 DEPEND=>=virtual/jdk-1.3 >=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=The Streaming API for XML (StAX) is a groundbreaking new Java API for parsing and writing XML easily and efficiently
+DESCRIPTION=The Streaming API for XML (StAX) is a Java API for parsing and writing XML easily and efficiently
 HOMEPAGE=http://dev2dev.bea.com/xml/stax.html
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config-2.1.9-r1 source?
 SLOT=0
 SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7c9916bb874bb469d1e32ecaf7ba49c2
+_md5_=cc0075d2b2ba16173ed8a65e0ad2820a
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0 b/metadata/md5-cache/dev-java/jvmstat-3.0
index 1c0d677e0eef..a24484ce7bdd 100644
--- a/metadata/md5-cache/dev-java/jvmstat-3.0
+++ b/metadata/md5-cache/dev-java/jvmstat-3.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install nofetch preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.1.9-r1
-DESCRIPTION=A set of monitoring APIs and tools for monitoring the performance of the JVM in production environments.
+DESCRIPTION=Monitoring APIs and tools for monitoring the performance of the JVM in production environments.
 HOMEPAGE=http://java.sun.com/performance/jvmstat/
 IUSE=doc elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=fetch strip
 SLOT=0
 SRC_URI=jvmstat-3_0.zip
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=592a013777d84f970298701276308db6
+_md5_=a611e32a026d920785d1521a8cf92ee6
diff --git a/metadata/md5-cache/dev-lang/maude-2.3.0 b/metadata/md5-cache/dev-lang/maude-2.3.0
deleted file mode 100644
index 274bcb69f286..000000000000
--- a/metadata/md5-cache/dev-lang/maude-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sci-libs/buddy dev-libs/libtecla >=dev-libs/gmp-4.1.3 sys-devel/bison sys-devel/flex
-DESCRIPTION=Maude - A high-level specification language
-HOMEPAGE=http://maude.cs.uiuc.edu/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sci-libs/buddy dev-libs/libtecla >=dev-libs/gmp-4.1.3
-SLOT=0
-SRC_URI=http://maude.cs.uiuc.edu/download/current/Maude-2.3.tar.gz mirror://gentoo/maude-2.3.0-extras.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9deb519d57591d2528dfb4ba694d848f
diff --git a/metadata/md5-cache/dev-lang/maude-2.5.0 b/metadata/md5-cache/dev-lang/maude-2.5.0
deleted file mode 100644
index 9594a813b00c..000000000000
--- a/metadata/md5-cache/dev-lang/maude-2.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Maude - A high-level specification language
-EAPI=3
-HOMEPAGE=http://maude.cs.uiuc.edu/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
-SLOT=0
-SRC_URI=http://maude.cs.uiuc.edu/download/current/Maude-2.5.tar.gz mirror://gentoo/maude-2.5.0-extras.tar.bz2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d000b77cca2fa27605e92e22a0683480
diff --git a/metadata/md5-cache/dev-lang/maude-2.6 b/metadata/md5-cache/dev-lang/maude-2.6-r1
similarity index 82%
rename from metadata/md5-cache/dev-lang/maude-2.6
rename to metadata/md5-cache/dev-lang/maude-2.6-r1
index a64d046b7778..1635bb32e461 100644
--- a/metadata/md5-cache/dev-lang/maude-2.6
+++ b/metadata/md5-cache/dev-lang/maude-2.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Maude - A high-level specification language
-EAPI=4
+DESCRIPTION=High-level specification language for equational and logic programming
+EAPI=5
 HOMEPAGE=http://maude.cs.uiuc.edu/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+IUSE=doc examples
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
 SLOT=0
 SRC_URI=http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz http://dev.gentoo.org/~jlec/distfiles/maude-2.6-extras.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	5f912199ed4fdfb0bfbde29c7ac7dbdb	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bcfea5f3039629e5702ea0f3abd6124f
+_md5_=36b2cee23149347ba059f840e4d1940f
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-TTYtter-1.4 b/metadata/md5-cache/dev-perl/Term-ReadLine-TTYtter-1.4
new file mode 100644
index 000000000000..3350b08425d3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Term-ReadLine-TTYtter-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=Quick implementation of readline utilities for ttytter.
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Term-ReadLine-TTYtter/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/TermReadKey || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CK/CKAISER/Term-ReadLine-TTYtter-1.4.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e4a5684e9c1edd34714db92c924ee124
diff --git a/metadata/md5-cache/dev-python/mozrunner-5.26 b/metadata/md5-cache/dev-python/mozrunner-5.26
new file mode 100644
index 000000000000..6cf2b4e3e612
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mozrunner-5.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/mozrunner
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/mozinfo-0.3.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=dev-python/mozprofile-0.10[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=dev-python/mozprocess-0.10[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] dev-python/mozfile[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/m/mozrunner/mozrunner-5.26.tar.gz
+_eclasses_=distutils-r1	26fe65665d086911163d4502473bd093	eutils	4878e7f88afc0ba0866ac112190b0fd4	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-r1	b81583006559e9b008883355c9889e29	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f04e6de20f8f660edf8367687f4a79ac
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.3.2 b/metadata/md5-cache/dev-python/py-amqp-1.3.2
new file mode 100644
index 000000000000..39a35ab23d0b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/py-amqp-1.3.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Low-level AMQP client for Python (fork of amqplib)
+EAPI=5
+HOMEPAGE=https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/
+IUSE=doc examples extras test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/amqp/amqp-1.3.2.tar.gz
+_eclasses_=distutils-r1	26fe65665d086911163d4502473bd093	eutils	4878e7f88afc0ba0866ac112190b0fd4	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-r1	b81583006559e9b008883355c9889e29	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7e1ee98bc8ec0ac868bf75cb31ed8937
diff --git a/metadata/md5-cache/dev-python/pyopencl-2013.2 b/metadata/md5-cache/dev-python/pyopencl-2013.2
new file mode 100644
index 000000000000..d8e1950d8baf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2013.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=dev-libs/boost-1.48[python] dev-python/decorator dev-python/numpy dev-python/mako dev-python/pytools >=virtual/opencl-0-r1 =dev-lang/python-2*
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=4
+HOMEPAGE=http://mathema.tician.de/software/pyopencl http://pypi.python.org/pypi/pyopencl
+IUSE=examples opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.48[python] dev-python/decorator dev-python/numpy dev-python/mako dev-python/pytools >=virtual/opencl-0-r1 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2013.2.tar.gz
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953
+_md5_=796e3e9a4183b1dea7f8451e0d1c5475
diff --git a/metadata/md5-cache/dev-python/urllib3-1.7.1 b/metadata/md5-cache/dev-python/urllib3-1.7.1
index 74370152b810..e22597eb202e 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.7.1
+++ b/metadata/md5-cache/dev-python/urllib3-1.7.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] test? ( >=www-servers/tornado-2.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] dev-python/mock[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( >=www-servers/tornado-2.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/mock[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
 EAPI=5
 HOMEPAGE=https://github.com/shazow/urllib3
-IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+RDEPEND=dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.7.1.tar.gz
 _eclasses_=distutils-r1	26fe65665d086911163d4502473bd093	eutils	4878e7f88afc0ba0866ac112190b0fd4	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-r1	b81583006559e9b008883355c9889e29	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b75154e7f3f13e453c5d32b94c43eb76
+_md5_=1829af3407055210b885d6fc8f484e51
diff --git a/metadata/md5-cache/dev-qt/assistant-4.8.5 b/metadata/md5-cache/dev-qt/assistant-4.8.5
index 4c2bc760d4b6..34eca98a81bb 100644
--- a/metadata/md5-cache/dev-qt/assistant-4.8.5
+++ b/metadata/md5-cache/dev-qt/assistant-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=webkit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qthelp-4.8.5[aqua=,debug=] ~dev-qt/qtsql-4.8.5[aqua=,debug=,sqlite] webkit? ( ~dev-qt/qtwebkit-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=32b6554c03e497ff51936a877a44b49c
+_md5_=563730ddcf000eab3a407b8d4041a8ad
diff --git a/metadata/md5-cache/dev-qt/designer-4.8.5 b/metadata/md5-cache/dev-qt/designer-4.8.5
index 1b17b0c76565..ac1110de2481 100644
--- a/metadata/md5-cache/dev-qt/designer-4.8.5
+++ b/metadata/md5-cache/dev-qt/designer-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=declarative phonon qt3support webkit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qtscript-4.8.5[aqua=,debug=] declarative? ( ~dev-qt/qtdeclarative-4.8.5[aqua=,debug=] ) phonon? ( ~dev-qt/qtphonon-4.8.5[aqua=,debug=] ) qt3support? ( ~dev-qt/qt3support-4.8.5[aqua=,debug=] ) webkit? ( ~dev-qt/qtwebkit-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0b55b097894d007c60adf04b76fad27d
+_md5_=f3a5752bc6824411565a19c8f5ae38cb
diff --git a/metadata/md5-cache/dev-qt/linguist-4.8.5 b/metadata/md5-cache/dev-qt/linguist-4.8.5
index 61f2632096bc..39ceafbf9e6e 100644
--- a/metadata/md5-cache/dev-qt/linguist-4.8.5
+++ b/metadata/md5-cache/dev-qt/linguist-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/designer-4.8.5[aqua=,debug=] ~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1504b78aceb2c908858d8df4cc37fe3b
+_md5_=c1950332f24bcbb72b89c262f03cae32
diff --git a/metadata/md5-cache/dev-qt/pixeltool-4.8.5 b/metadata/md5-cache/dev-qt/pixeltool-4.8.5
index 312ccd722519..c5faf5a263f1 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-4.8.5
+++ b/metadata/md5-cache/dev-qt/pixeltool-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Qt screen magnifier
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] !<dev-qt/qthelp-4.8.5:4
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6212418f47dd78529820b0a038a79b10
+_md5_=21d6249c5bcf4e480c4d6757a0246495
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5 b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
index f0289d8d9dca..835e55e072b8 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtdbus-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ac845bad6c07ea86aeb7a91974dc3486
+_md5_=4a15a6a5cc044850f043fae1c7cf8255
diff --git a/metadata/md5-cache/dev-qt/qt3support-4.8.5 b/metadata/md5-cache/dev-qt/qt3support-4.8.5
index ffff70b9a712..dd8ebe4010f3 100644
--- a/metadata/md5-cache/dev-qt/qt3support-4.8.5
+++ b/metadata/md5-cache/dev-qt/qt3support-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Qt3Support module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support] ~dev-qt/qtgui-4.8.5[accessibility=,aqua=,debug=,qt3support] ~dev-qt/qtsql-4.8.5[aqua=,debug=,qt3support]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9acb954143a343624541f5f2f3af5c9a
+_md5_=06381d2c29f6010b5c103b466b69d633
diff --git a/metadata/md5-cache/dev-qt/qtbearer-4.8.5 b/metadata/md5-cache/dev-qt/qtbearer-4.8.5
index 22b0e4677f25..a5f5e2c12860 100644
--- a/metadata/md5-cache/dev-qt/qtbearer-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtbearer-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The network bearer plugins for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=connman networkmanager aqua debug pch +exceptions
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] connman? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] ) networkmanager? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=78166163a53380c9b4567c28d9dd980b
+_md5_=efd723fdfbb589737e79a0a8ae7fdbea
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.5 b/metadata/md5-cache/dev-qt/qtcore-4.8.5
index 12aff4b520b9..2f14bc283d9a 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+glib iconv icu qt3support ssl aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 PDEPEND=qt3support? ( ~dev-qt/qtgui-4.8.5[aqua=,debug=,glib=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49:= ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2a354c7d5acaae64461311aa78091143
+_md5_=522259cba16878d1db65461cc10b66be
diff --git a/metadata/md5-cache/dev-qt/qtdbus-4.8.5 b/metadata/md5-cache/dev-qt/qtdbus-4.8.5
index 722a4122f48e..20ef00cd5983 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtdbus-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The DBus module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] >=sys-apps/dbus-1.2
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e778faed1cc25f2dc16369819cf34886
+_md5_=a3e2455f859b79a773a04f8ff426aaff
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5 b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
index 22747e35d1e6..74317f8b0bca 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Declarative module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility qt3support webkit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtgui-4.8.5[accessibility=,aqua=,debug=,qt3support=] ~dev-qt/qtopengl-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtscript-4.8.5[aqua=,debug=] ~dev-qt/qtsql-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtsvg-4.8.5[accessibility=,aqua=,debug=] ~dev-qt/qtxmlpatterns-4.8.5[aqua=,debug=] qt3support? ( ~dev-qt/qt3support-4.8.5[accessibility=,aqua=,debug=] ) webkit? ( ~dev-qt/qtwebkit-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cc760f874402864b6ec8fc3aa1f3ba28
+_md5_=96e6cd71d1d2e87db3ea41cd60254f20
diff --git a/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1 b/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1
index d6a3fba9ec98..b9c0f19f8b08 100644
--- a/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-4.8.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 PDEPEND=qt3support? ( ~dev-qt/qt3support-4.8.5[aqua=,debug=] )
 RDEPEND=app-admin/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.5[aqua=,debug=,glib=,qt3support=] ~dev-qt/qtscript-4.8.5[aqua=,debug=] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) cups? ( net-print/cups ) egl? ( media-libs/mesa[egl] ) gtkstyle? ( x11-libs/cairo[-qt4] x11-libs/gtk+:2[aqua=] ) mng? ( >=media-libs/libmng-1.0.9 ) nas? ( >=media-libs/nas-1.5 ) tiff? ( media-libs/tiff:0 ) !<dev-qt/qthelp-4.8.5:4
@@ -12,4 +12,4 @@ REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2c3daad9003ec1aef1df0cb2a14b4bb8
+_md5_=6cb7aa6a5c266cfd26539c9bfeb44360
diff --git a/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2 b/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
index b5c71162554c..ad0707df46f2 100644
--- a/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
+++ b/metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The Help module for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=compat doc aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qtsql-4.8.5[aqua=,debug=,sqlite] compat? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] sys-libs/zlib )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=aa16952ae57ee8777440c63ef6e6263b
+_md5_=4363f1fbafda044321ee8137ce0f34cf
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.5 b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.5
index 04204910e797..daa1d82f63ba 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Multimedia module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=alsa aqua debug pch +exceptions
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] alsa? ( media-libs/alsa-lib )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=caa5490a79f5a4f2e01b05cb69822320
+_md5_=c2a0c6eec67077b9787234e9660e3941
diff --git a/metadata/md5-cache/dev-qt/qtopengl-4.8.5 b/metadata/md5-cache/dev-qt/qtopengl-4.8.5
index 398f725463ba..58c3e950ac0a 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtopengl-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=egl qt3support aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support=] ~dev-qt/qtgui-4.8.5[aqua=,debug=,egl=,qt3support=] virtual/opengl
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4ebe0b947ce8525951665a02219742e3
+_md5_=419e0e9b71ab3b9c7c01b8073ecccc9c
diff --git a/metadata/md5-cache/dev-qt/qtphonon-4.8.5 b/metadata/md5-cache/dev-qt/qtphonon-4.8.5
index 69b6248a821b..d9aea6588484 100644
--- a/metadata/md5-cache/dev-qt/qtphonon-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtphonon-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Phonon module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=dbus qt3support aqua debug pch +exceptions
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtgui-4.8.5[aqua=,debug=,qt3support=] !kde-base/phonon-kde !kde-base/phonon-xine !media-libs/phonon !media-sound/phonon !aqua? ( media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 ) aqua? ( ~dev-qt/qtopengl-4.8.5[aqua,debug=,qt3support=] ) dbus? ( ~dev-qt/qtdbus-4.8.5[aqua=,debug=] )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=51012174539c555943ef04a8877708dc
+_md5_=9730b1d25c6244be530ea9d41eecc356
diff --git a/metadata/md5-cache/dev-qt/qtscript-4.8.5 b/metadata/md5-cache/dev-qt/qtscript-4.8.5
index 4032be2d9bff..463dad942128 100644
--- a/metadata/md5-cache/dev-qt/qtscript-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtscript-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The QtScript module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=iconv +jit aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=71f8be6db74e3e3c7556a2d00f493609
+_md5_=b420ce150614fac12504c9b5d5629ef5
diff --git a/metadata/md5-cache/dev-qt/qtsql-4.8.5 b/metadata/md5-cache/dev-qt/qtsql-4.8.5
index 161300cd1971..3a228409973b 100644
--- a/metadata/md5-cache/dev-qt/qtsql-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtsql-4.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=The SQL module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=firebird freetds mysql oci8 odbc postgres qt3support +sqlite aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=,qt3support=] firebird? ( dev-db/firebird ) freetds? ( dev-db/freetds ) mysql? ( virtual/mysql ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( firebird freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=53abdd171078c873b1452d429e1f8724
+_md5_=00711e0f955df242c1a0dc561ec2cf6a
diff --git a/metadata/md5-cache/dev-qt/qtsvg-4.8.5 b/metadata/md5-cache/dev-qt/qtsvg-4.8.5
index 0ff47b382054..d8e94e714aef 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtsvg-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The SVG module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+accessibility aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[accessibility=,aqua=,debug=] sys-libs/zlib
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=80adbbce1e6009cb99a5e99e85bb4a22
+_md5_=973dc64d65f35aa170e14a35f71197ad
diff --git a/metadata/md5-cache/dev-qt/qttest-4.8.5 b/metadata/md5-cache/dev-qt/qttest-4.8.5
index e37171d9e7e9..a85fb5ced577 100644
--- a/metadata/md5-cache/dev-qt/qttest-4.8.5
+++ b/metadata/md5-cache/dev-qt/qttest-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The QtTest module for unit testing Qt applications and libraries
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch +exceptions
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=44223174cfd9643ab9c2a53a2c98bff5
+_md5_=6cef186e28f758b922b32ce6df70cf8f
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-4.8.5 b/metadata/md5-cache/dev-qt/qtwebkit-4.8.5
index 31fb93a67eab..9fbdf3c85f87 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtwebkit-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The WebKit module for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+gstreamer icu +jit aqua debug pch +exceptions
-KEYWORDS=amd64 ~arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-db/sqlite:3 ~dev-qt/qtcore-4.8.5[aqua=,debug=,ssl] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~dev-qt/qtxmlpatterns-4.8.5[aqua=,debug=] x11-libs/libX11 x11-libs/libXrender gstreamer? ( dev-libs/glib:2 dev-libs/libxml2:2[!icu?] >=media-libs/gstreamer-0.10.36:0.10 >=media-libs/gst-plugins-base-0.10.36:0.10 ) icu? ( dev-libs/icu:= )
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=718d4d1eeb88674118c1bbf9508074e7
+_md5_=fb7dda74babc8738c83c37e55c16d7ce
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5 b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
index 484b9df7930f..9801d5799056 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=The XmlPatterns module for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=aqua debug pch
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=]
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	f41d554720dcd272594a8ed13e72419f	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a9b10e91461b31efdb686b948a075dcc
+_md5_=24bd28edaf68d5e7cc73e158c1b8d222
diff --git a/metadata/md5-cache/dev-ruby/flog-4.2.0 b/metadata/md5-cache/dev-ruby/flog-4.2.0
new file mode 100644
index 000000000000..39c67f554d4e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/flog-4.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby18] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby19] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby20] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby20] ) ruby_targets_jruby? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_jruby] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Flog reports the most tortured code in an easy to read pain report.
+EAPI=5
+HOMEPAGE=http://ruby.sadi.st/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+KEYWORDS=~x86 ~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby18] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby19] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby20] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_ruby20] ) ruby_targets_jruby? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_jruby] >=dev-ruby/sexp_processor-4.4:4[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/flog-4.2.0.gem
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e018254a1db86c328024c729f1f0d400
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1 b/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1
index dfb82c46b12e..f760f4cb689c 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-3.5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.5.3.1.tar.gz -> gitolite-3.5.3.1.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a1b80f3bccf2dc1034a898532a735f4
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=fd9fff015e6e0db9c1d433442ac7155e
diff --git a/metadata/md5-cache/games-arcade/gnome-nibbles-3.8.0 b/metadata/md5-cache/games-arcade/gnome-nibbles-3.8.0
index 4b75ad151039..88d09d92c38a 100644
--- a/metadata/md5-cache/games-arcade/gnome-nibbles-3.8.0
+++ b/metadata/md5-cache/games-arcade/gnome-nibbles-3.8.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1:1.0 >=
 DESCRIPTION=Nibbles clone for Gnome
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Nibbles
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nibbles/3.8/gnome-nibbles-3.8.0.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f98d36fc7817a98b2c8cec6572bae042
+_md5_=a73a5b8659547827ff7ca5bf8765855a
diff --git a/metadata/md5-cache/games-arcade/gnome-robots-3.8.1 b/metadata/md5-cache/games-arcade/gnome-robots-3.8.1
index 5646e704901d..592871b0408e 100644
--- a/metadata/md5-cache/games-arcade/gnome-robots-3.8.1
+++ b/metadata/md5-cache/games-arcade/gnome-robots-3.8.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26
 DESCRIPTION=Avoid the robots and make them crash into each other
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Robots
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-robots/3.8/gnome-robots-3.8.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fb6ed08ead041e04fd09ccdea9b688c6
+_md5_=3f8bea679ec062b44b0effe334560169
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.5 b/metadata/md5-cache/games-board/domination-1.1.1.5
new file mode 100644
index 000000000000..6d41aefeba91
--- /dev/null
+++ b/metadata/md5-cache/games-board/domination-1.1.1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst preinst setup unpack
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=The well-known board game, written in java
+HOMEPAGE=http://domination.sourceforge.net
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
+SLOT=0
+SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.5.zip
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	games	0fb7637597e0869f6c8be79b11d0135a	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=8b5a0fec6fe076df5d29bec3916f290c
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.8.1 b/metadata/md5-cache/games-board/four-in-a-row-3.8.1
index cf6f4de77b18..935a8db67532 100644
--- a/metadata/md5-cache/games-board/four-in-a-row-3.8.1
+++ b/metadata/md5-cache/games-board/four-in-a-row-3.8.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26
 DESCRIPTION=Make lines of the same color to win
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Four-in-a-row
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] sys-libs/zlib >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/four-in-a-row/3.8/four-in-a-row-3.8.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=092f0fc3199f4701cd6bab09a4bfe4ed
+_md5_=bda4b76555c04c821b96027133d37f71
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.8.3 b/metadata/md5-cache/games-board/gnome-chess-3.8.3
deleted file mode 100644
index 351384858cc4..000000000000
--- a/metadata/md5-cache/games-board/gnome-chess-3.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 virtual/glu virtual/opengl >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Play the classic two-player boardgame of chess
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Chess
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 virtual/glu virtual/opengl >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-chess/3.8/gnome-chess-3.8.3.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1cc0ae62e489d856c3e7a04cae8e3d03
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.8.4 b/metadata/md5-cache/games-board/gnome-chess-3.8.4
index b9bc7d0b4f53..2817ca07fd76 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.8.4
+++ b/metadata/md5-cache/games-board/gnome-chess-3.8.4
@@ -3,10 +3,10 @@ DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 virtual/glu v
 DESCRIPTION=Play the classic two-player boardgame of chess
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Chess
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 virtual/glu virtual/opengl >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.8/gnome-chess-3.8.4.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6806c30a849164d1e7fb223ec1a79386
+_md5_=c079cfbcde02b551a9e5d6093c879f95
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.8.0 b/metadata/md5-cache/games-board/gnome-mahjongg-3.8.0
deleted file mode 100644
index e6190a239690..000000000000
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Mahjongg
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.8/gnome-mahjongg-3.8.0.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=234f010271ab228d1367845d441a8760
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.8.1 b/metadata/md5-cache/games-board/gnome-mahjongg-3.8.1
index d6cb2b3ac99d..e8e220caaa9b 100644
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.8.1
+++ b/metadata/md5-cache/games-board/gnome-mahjongg-3.8.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || (
 DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Mahjongg
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.8/gnome-mahjongg-3.8.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dc4467958b4c9d5960a1873b10b5eef1
+_md5_=643ea0ea75bf20534efbec3ece8d365f
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.8.1 b/metadata/md5-cache/games-board/gnome-mines-3.8.1
deleted file mode 100644
index 19043555d47e..000000000000
--- a/metadata/md5-cache/games-board/gnome-mines-3.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Clear hidden mines from a minefield
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Mines
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-mines/3.8/gnome-mines-3.8.1.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=65cb88e18a432c50dc1833f72162a967
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.8.2 b/metadata/md5-cache/games-board/gnome-mines-3.8.2
index a0f6db4a79b3..fb745efc4022 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.8.2
+++ b/metadata/md5-cache/games-board/gnome-mines-3.8.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || (
 DESCRIPTION=Clear hidden mines from a minefield
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Mines
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.8/gnome-mines-3.8.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=463bc0d7956b24a18b9417b69e455cc3
+_md5_=ba8d4395a699c8ffd4da9e388e8b1709
diff --git a/metadata/md5-cache/games-board/hexxagon-1.0.1 b/metadata/md5-cache/games-board/hexxagon-1.0.1
deleted file mode 100644
index 74f929bf0de3..000000000000
--- a/metadata/md5-cache/games-board/hexxagon-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=Clone of the original DOS game
-EAPI=2
-HOMEPAGE=http://www.nesqi.se/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.nesqi.se/download/hexxagon-1.0.1.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a61552f9fb4cf00057b543eb9e71585d
diff --git a/metadata/md5-cache/games-board/iagno-3.8.2 b/metadata/md5-cache/games-board/iagno-3.8.2
deleted file mode 100644
index 837698f7579e..000000000000
--- a/metadata/md5-cache/games-board/iagno-3.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Dominate the board in a classic version of Reversi
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Iagno
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/iagno/3.8/iagno-3.8.2.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=54a1fbfb8cbe6f9f7b371c50f8b4bcb4
diff --git a/metadata/md5-cache/games-board/iagno-3.8.3 b/metadata/md5-cache/games-board/iagno-3.8.3
index 7cc1897345c4..9f8a0503c6d8 100644
--- a/metadata/md5-cache/games-board/iagno-3.8.3
+++ b/metadata/md5-cache/games-board/iagno-3.8.3
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26
 DESCRIPTION=Dominate the board in a classic version of Reversi
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Iagno
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.8/iagno-3.8.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=14f338f109458f77cb14882fba1d5f41
+_md5_=135c3740577fb7410342d2c0a4fd0755
diff --git a/metadata/md5-cache/games-board/pokerth-1.0.1 b/metadata/md5-cache/games-board/pokerth-1.0.1
deleted file mode 100644
index b1efdd0fc783..000000000000
--- a/metadata/md5-cache/games-board/pokerth-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/boost[threads(+)] dev-libs/protobuf dev-libs/libgcrypt dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 ) !dedicated? ( dev-qt/qtsql:4 ) virtual/pkgconfig
-DESCRIPTION=Texas Hold'em poker game
-EAPI=5
-HOMEPAGE=http://www.pokerth.net/
-IUSE=dedicated
-KEYWORDS=amd64 ~ppc x86
-LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
-RDEPEND=dev-db/sqlite:3 dev-libs/boost[threads(+)] dev-libs/protobuf dev-libs/libgcrypt dev-libs/tinyxml[stl] amd64? ( net-libs/libircclient ) ppc? ( >=net-libs/libircclient-1.6-r2 ) x86? ( net-libs/libircclient ) >=net-misc/curl-7.16 dev-qt/qtcore:4 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pokerth/PokerTH-1.0.1-src.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7352a34e00b005c47ee156ee14ed3a79
diff --git a/metadata/md5-cache/games-board/spider-1.2_p4 b/metadata/md5-cache/games-board/spider-1.2_p4
deleted file mode 100644
index bd961d9c9713..000000000000
--- a/metadata/md5-cache/games-board/spider-1.2_p4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libXext athena? ( x11-libs/libXaw ) x11-libs/libXmu x11-libs/libXt x11-misc/imake x11-proto/xproto
-DESCRIPTION=Spider Solitaire
-EAPI=2
-HOMEPAGE=http://packages.debian.org/stable/games/spider
-IUSE=athena
-KEYWORDS=~amd64 x86
-LICENSE=HPND
-RDEPEND=x11-libs/libXext athena? ( x11-libs/libXaw ) x11-libs/libXmu x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/spider/spider_1.2.orig.tar.gz mirror://debian/pool/main/s/spider/spider_1.2-4.diff.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b76acbc6ecb405aea85d3660e3ed96f
diff --git a/metadata/md5-cache/games-board/tali-3.8.0 b/metadata/md5-cache/games-board/tali-3.8.0
deleted file mode 100644
index a0277df445d7..000000000000
--- a/metadata/md5-cache/games-board/tali-3.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.4:3 app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Beat the odds in a poker-style dice game
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Tali
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.4:3 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/tali/3.8/tali-3.8.0.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=541e47a31a83e0b82c2e32b26cb0444a
diff --git a/metadata/md5-cache/games-board/tali-3.8.1 b/metadata/md5-cache/games-board/tali-3.8.1
index 25b7d63e7311..97801318c3f6 100644
--- a/metadata/md5-cache/games-board/tali-3.8.1
+++ b/metadata/md5-cache/games-board/tali-3.8.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.4:3 app-tex
 DESCRIPTION=Beat the odds in a poker-style dice game
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Tali
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.4:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/tali/3.8/tali-3.8.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7fd330400cbfec7f2516874a00351b18
+_md5_=fafe295a4229fa0d0423ab546be285f5
diff --git a/metadata/md5-cache/games-board/xmille-2.0-r1 b/metadata/md5-cache/games-board/xmille-2.0-r1
deleted file mode 100644
index 033052c23bcf..000000000000
--- a/metadata/md5-cache/games-board/xmille-2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libXext app-text/rman x11-misc/imake
-DESCRIPTION=Mille Bournes card game
-EAPI=2
-HOMEPAGE=http://www.milleborne.info/
-KEYWORDS=~amd64 ppc x86
-LICENSE=public-domain
-RDEPEND=x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xmille/xmille_2.0.orig.tar.gz mirror://debian/pool/main/x/xmille/xmille_2.0-12.diff.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=83d455bc8b781cb705e644ff89d6bd03
diff --git a/metadata/md5-cache/games-misc/lolcat-42.0.99-r1 b/metadata/md5-cache/games-misc/lolcat-42.0.99-r1
index ffb726bbab63..7f16e939b53b 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.0.99-r1
+++ b/metadata/md5-cache/games-misc/lolcat-42.0.99-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby18] dev-ruby/paint[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[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] ) )
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby18] dev-ruby/paint[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Rainbows and unicorns!
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/busyloop/lolcat
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby18] dev-ruby/paint[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[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] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby18] dev-ruby/paint[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-42.0.99.gem
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f2c87f81a2b861f8ad81bf76b1472f0f
+_md5_=b16d81d4e5b9df0406e429f8a08569e0
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.8.2 b/metadata/md5-cache/games-puzzle/five-or-more-3.8.2
index 8b04fe2045c7..710eb82f0e05 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.8.2
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.8.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 app-t
 DESCRIPTION=Five or More Game for GNOME
 EAPI=5
 HOMEPAGE=https://live.gnome.org/Five%20or%20more
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.8/five-or-more-3.8.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=34e7a22375b8583cb0861df5a17a7be4
+_md5_=e86e6d77ea9d334f09b8987d3a4f7363
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.8.2 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.8.2
index dec37ec43eff..7b615304a63c 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.8.2
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.8.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || (
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Klotski
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.8/gnome-klotski-3.8.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=29454363a03828681c7072c1b1b94b96
+_md5_=0358237c35ce4b0ba3817ef0eb26c306
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.8.1 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.8.1
index 3061e4b114fb..eaa0a1f5ad88 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.8.1
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Test your logic skills in this number grid puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/GnomeSudoku
 IUSE=python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/glib:2 dev-python/pycairo[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-2.28.3:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] !gnome-extra/gnome-games
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.8/gnome-sudoku-3.8.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	python-single-r1	4d9f916e821994a2ccdbbcfc8ac225c9	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3a82cf8a66e21a1d6eb0766bf4d5c89c
+_md5_=e000db40e0170402e06a85fa2b483e5a
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.8.1 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.8.1
index 2501e0adafa8..9909411e2033 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.8.1
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.8.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || (
 DESCRIPTION=Complete the puzzle by matching numbered tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Tetravex
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.8/gnome-tetravex-3.8.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6fcff1e36f8755f68d19b4ba200edbfb
+_md5_=aa9e04b27d9a2e0e6fbbb61d97e968fb
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.8.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.8.0
index 24b95bdff9b3..a58a8a68b318 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.8.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.8.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.
 DESCRIPTION=Turn off all the lights
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Lightsoff
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.8/lightsoff-3.8.0.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=08738e3bda5637fbd7300c21699ae352
+_md5_=fd378102313d3a01d08ef559f0a1c005
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.8.1 b/metadata/md5-cache/games-puzzle/quadrapassel-3.8.1
deleted file mode 100644
index 4bd93fb55320..000000000000
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/clutter-1.0.0 >=media-libs/clutter-gtk-0.91.6 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Fit falling blocks together
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Quadrapassel
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=media-libs/clutter-1.0.0 >=media-libs/clutter-gtk-0.91.6 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/quadrapassel/3.8/quadrapassel-3.8.1.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ff4ba5fce92426749c415f974b785aa7
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.8.2 b/metadata/md5-cache/games-puzzle/quadrapassel-3.8.2
index e5546bb21d11..f968ca8fa62e 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.8.2
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.8.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Quadrapassel
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.8/quadrapassel-3.8.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=feb648d6f261f8afb5c2dd01d665a035
+_md5_=7a69a229a8122ca2fa29aa27d318d5eb
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.8.1 b/metadata/md5-cache/games-puzzle/swell-foop-3.8.1
deleted file mode 100644
index 73f3b9aa700a..000000000000
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 dev-lang/vala:0.16 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Swell%20Foop
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/swell-foop/3.8/swell-foop-3.8.1.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=02c0acc20f9e5f5c91540b0d99fece9b
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.8.2 b/metadata/md5-cache/games-puzzle/swell-foop-3.8.2
index 75ae34755fc9..83a097009253 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.8.2
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.8.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.
 DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Swell%20Foop
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.8/swell-foop-3.8.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	0fb7637597e0869f6c8be79b11d0135a	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	vala	b365480bc54c4e356dc1e953da9fe356	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ea07f2c490bb10cd0ef9e0d65a85fda4
+_md5_=affa2dc62c71c00f4263b9d3413006ca
diff --git a/metadata/md5-cache/games-strategy/warzone2100-2.3.9 b/metadata/md5-cache/games-strategy/warzone2100-2.3.9
deleted file mode 100644
index 0382fff18fd9..000000000000
--- a/metadata/md5-cache/games-strategy/warzone2100-2.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) sys-devel/bison app-arch/zip virtual/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=3D real-time strategy game
-EAPI=2
-HOMEPAGE=http://wz2100.net/
-IUSE=debug nls videos
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2 CC-BY-SA-3.0 public-domain
-RDEPEND=dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) media-fonts/dejavu
-SLOT=0
-SRC_URI=mirror://sourceforge/warzone2100/warzone2100-2.3.9.tar.gz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	4878e7f88afc0ba0866ac112190b0fd4	games	0fb7637597e0869f6c8be79b11d0135a	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bc366f002778fa8c417ae1b63d1c7033
diff --git a/metadata/md5-cache/net-analyzer/sslscan-1.8.2 b/metadata/md5-cache/net-analyzer/sslscan-1.8.2
index a79b0423450f..e0c06f48d9df 100644
--- a/metadata/md5-cache/net-analyzer/sslscan-1.8.2
+++ b/metadata/md5-cache/net-analyzer/sslscan-1.8.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
 DEPEND=dev-libs/openssl:0
 DESCRIPTION=Fast SSL port scanner
 EAPI=4
-HOMEPAGE=https://www.titania-security.com/labs/sslscan
+HOMEPAGE=http://sourceforge.net/projects/sslscan/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:0
 SLOT=0
 SRC_URI=mirror://sourceforge/sslscan/sslscan-1.8.2.tgz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=07dfff0c4f079924345f5d1b47731b98
+_md5_=8c1daca50e9c4cf195067c9e312bcd9b
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r3 b/metadata/md5-cache/net-dialup/pptpd-1.4.0
similarity index 83%
rename from metadata/md5-cache/net-dialup/pptpd-1.3.4-r3
rename to metadata/md5-cache/net-dialup/pptpd-1.4.0
index d3ad30d8dd4e..0235bd6c5f9f 100644
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r3
+++ b/metadata/md5-cache/net-dialup/pptpd-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Point-to-Point Tunnelling Protocol Server
 EAPI=5
 HOMEPAGE=http://poptop.sourceforge.net/
 IUSE=gre-extreme-debug tcpd
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
-SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
+SRC_URI=mirror://sourceforge/poptop/pptpd-1.4.0.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cc593758de121e877e89d3f9d2104f1e
+_md5_=0c5f08ef568ef3aa643f1c598ed0ef13
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.2.9 b/metadata/md5-cache/net-fs/nfs-utils-1.2.9
new file mode 100644
index 000000000000..3998063da4c9
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) uuid? ( sys-apps/util-linux ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=NFS client and server daemons
+EAPI=4
+HOMEPAGE=http://linux-nfs.org/
+IUSE=caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) uuid? ( sys-apps/util-linux ) !net-nds/portmap
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.9.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cb4e3489da92f8f23bfb0a39a8033b5a
diff --git a/metadata/md5-cache/net-misc/curl-7.30.0 b/metadata/md5-cache/net-misc/curl-7.30.0
new file mode 100644
index 000000000000..be6558140aa7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.30.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A Client that groks URLs
+EAPI=5
+HOMEPAGE=http://curl.haxx.se/
+IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) adns? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) metalink? ( >=media-libs/libmetalink-0.1.0 ) rtmp? ( media-video/rtmpdump ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+REQUIRED_USE=threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://curl.haxx.se/download/curl-7.30.0.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0b48e5844984351695aa9c1e1e6d8d4
diff --git a/metadata/md5-cache/sci-mathematics/cgal-4.3 b/metadata/md5-cache/sci-mathematics/cgal-4.3
new file mode 100644
index 000000000000..e54bd8ecd6fc
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/cgal-4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/boost dev-libs/mpfr sys-libs/zlib x11-libs/libX11 virtual/glu virtual/opengl gmp? ( dev-libs/gmp[cxx] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) mpfi? ( sci-libs/mpfi ) app-arch/xz-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=C++ library for geometric algorithms and data structures
+EAPI=5
+HOMEPAGE=http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/
+IUSE=doc examples +gmp mpfi qt4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3 GPL-3 Boost-1.0
+RDEPEND=dev-libs/boost dev-libs/mpfr sys-libs/zlib x11-libs/libX11 virtual/glu virtual/opengl gmp? ( dev-libs/gmp[cxx] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 ) mpfi? ( sci-libs/mpfi )
+SLOT=0
+SRC_URI=http://gforge.inria.fr/frs/download.php/32995/CGAL-4.3.tar.xz doc? ( http://gforge.inria.fr/frs/download.php/33000/CGAL-4.3-doc_html.tar.xz )
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=978038e414956bb12d97f3b6dc33cc28
diff --git a/metadata/md5-cache/sys-auth/pam_ssh-1.98 b/metadata/md5-cache/sys-auth/pam_ssh-1.98
new file mode 100644
index 000000000000..71315cd8b67d
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pam_ssh-1.98
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=sys-libs/pam net-misc/openssh sys-devel/libtool
+DESCRIPTION=Uses ssh-agent to provide single sign-on
+EAPI=5
+HOMEPAGE=http://pam-ssh.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=BSD-2 BSD ISC
+RDEPEND=sys-libs/pam net-misc/openssh
+SLOT=0
+SRC_URI=mirror://sourceforge/pam-ssh/pam_ssh-1.98.tar.bz2
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=efdea78736bdd68fcc3b65c26d44accb
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
index 4514341f3622..5fd7f740bfaa 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext )
 RESTRICT=strip
 SLOT=2.95
 SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.4.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a874ecc1daea2f9b7f6867262af5fcd6
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index 74f654bf5870..6970b031056d 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( sys-devel/gette
 RESTRICT=strip
 SLOT=3.3
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b1a12147240ddd3486c24bca45737a8
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index 207dadd4203a..31978837cebb 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.7.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~dirtyepic/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b122bc589aebd9b88e9b51c59e298312
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index afa055fd6f53..5febe897b872 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv fortran? ( >=d
 RESTRICT=strip
 SLOT=4.0
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.1.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=59cb209cc8ee26ef974c1fcd46e78990
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 6413924d68c4..3158ae9b1b92 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv fortran? ( >=d
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.4.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=33a0c5a6dc434f467dd551d0d865a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index d65ee062abf1..37d891d8e108 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv fortran? ( >=d
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.2.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c0ac4293c41b697414d99ef96e407918
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
index 00160e04237c..f6ab6fd22161 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2 mirror://gentoo/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a122abd1e323db68decb7d90a58ec6fd
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.4 b/metadata/md5-cache/sys-devel/gcc-4.3.4
index 02b20316530c..a5b1cd11dff5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.4/gcc-4.3.4.tar.bz2 mirror://gentoo/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.4-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.4-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e3c90b6cebd999605e77d8c96233e6a
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.5 b/metadata/md5-cache/sys-devel/gcc-4.3.5
index 65353166a56b..c4a8846e9746 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fb84d7bd8bbc47426f3e4a1620acc4be
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index bfb666ac3db1..6c1793abfc89 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1601b121e0d62b32050a854972f487fe
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.2 b/metadata/md5-cache/sys-devel/gcc-4.4.2
index f0ad7a9444df..b5409bab7f73 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.2/gcc-4.4.2.tar.bz2 mirror://gentoo/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.2-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=673b85a16bd85eae38b3d7fe7739a6b9
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.3-r3 b/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
index 03404134f43a..633b04e31f37 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.3-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.3/gcc-4.4.3.tar.bz2 mirror://gentoo/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e779cb6b20bfedccfe0d65bacd9007dd
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
index 3b119a26dfd5..b05072013581 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.4-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.4/gcc-4.4.4.tar.bz2 mirror://gentoo/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ed32daff3bbaaab5dfcedf40cedfbec
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.5 b/metadata/md5-cache/sys-devel/gcc-4.4.5
index 8a1ba97c3790..fe7bef1009d8 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.5
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=68fd944966e6d2614f539136fc4b92de
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
index 8db3a6c7a57f..f0f7bda3859e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.6-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7965ea84cc6e70d54fa875886fa8866
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index d3d8dd8f4394..b1b193dc1e75 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=129b62ab8d325de9f786d2bb764cd76c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
index d3527d069bd0..9160ac5a9813 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.bz2 mirror://gentoo/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c82ba3800ed42cff0f4fd8344bba49f3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.2 b/metadata/md5-cache/sys-devel/gcc-4.5.2
index 4973c2a4b507..2a31567d9dab 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=65b55449a677aea774ecc1e3eb115bee
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
index 4a80024158ee..f5a98eecf618 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a40d980c2a59ad8bc81dca42ca6a00b7
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index 91203705d29d..c5aa499486c9 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=09a25deec6a9c1c540283d40816e895c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.0 b/metadata/md5-cache/sys-devel/gcc-4.6.0
index 51e5ffda1666..9e6fc66ea45d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.0/gcc-4.6.0.tar.bz2 mirror://gentoo/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2cf9933fd5c80c938006d8b7392f6a92
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
index 487577bd6722..1d5bf07bada7 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.1/gcc-4.6.1.tar.bz2 mirror://gentoo/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11ad9ebdb5724fe4cad21af0e789271c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.2 b/metadata/md5-cache/sys-devel/gcc-4.6.2
index 3a4ba9d12dae..6c22664c83e5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de99d24392e864b410cf25faa1418d49
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.3 b/metadata/md5-cache/sys-devel/gcc-4.6.3
index 9807cdee8642..ed38ed57bcdf 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.3
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.13.tar.bz2 mirror://gentoo/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58c11bb784716a9bd985353924b0db6e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 832a4df88da3..97733a500e7a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4d231e67719883174fa72e3f9980104
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.0 b/metadata/md5-cache/sys-devel/gcc-4.7.0
index 9bdac4e9bc3b..05aa0b746bd4 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=41ef736cb5ea58cec144dfa008fbdfd9
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.1 b/metadata/md5-cache/sys-devel/gcc-4.7.1
index 65a4c1be2bff..eef3f8838dea 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2 mirror://gentoo/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=14b40114ccea03660eb0c05547002f2f
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.2-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
index 9e7b01d8931f..5ad008b9e338 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2 mirror://gentoo/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=63e847cc07d4cb2b3822d6b948434a0c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.3-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
index c2e50092d187..ef992957c827 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f0c8d999bd643a953323cc4cd466c2f7
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.0 b/metadata/md5-cache/sys-devel/gcc-4.8.0
index 335c6525537a..ec2cd8dcdb8b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.0
@@ -3,12 +3,12 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 sys-devel
 DESCRIPTION=The GNU Compiler Collection
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot nls nptl regression-test vanilla altivec cxx fortran nopie nossp doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite lto go
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib 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-0.18.0 >=dev-libs/isl-0.11.1 )
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.0/gcc-4.8.0.tar.bz2 mirror://gentoo/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.0-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9e24aa1cf154bbeb56e3e6d8f3def6f1
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e5b90a23a1a5940884ac28590568de81
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
index 3a55b0b4a0a4..a75dfee6ff5b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( sys-devel/gettext ) virtual/libiconv >=dev-libs/gmp
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2 mirror://gentoo/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99cdd1d01c19e3721ff4a44fbf02d52f
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493 b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
index 8a69f7ff340b..41dd739e4b31 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=40
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5493.tar.gz
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=695373bab736b1a123a59a4884511fad
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
index c4da83e9995c..5160259d0453 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5664.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d5e5182e1ebf95a532a8ea011fcf95fc
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
index 5e66ca8c567a..d76e9a8968e1 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bf52ae2cbf24b2891f95c393aac5e41
diff --git a/metadata/md5-cache/sys-devel/kgcc64-3.4.6 b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
index 723ea46ad4e4..e68aa67ae539 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-3.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.2.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ba8b008080ade055be3ab2b62c3031f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index cdf6fbbcae9d..099cdeb3ca2c 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c0249b3b056954c2b256a9cf62cbff17
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index be0ad9539964..09a78cb6b3d2 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4e8acb877830174bfe478e20fe5dd82b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.3 b/metadata/md5-cache/sys-devel/kgcc64-4.3.3
index a4cfaf5e735a..9e08115b2be6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.3
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2 mirror://gentoo/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.3-patches-1.0.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2de426fa59648fd54334a636b3cfcc5
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 3f604e0637d6..56d45d672b70 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -10,5 +10,5 @@ RDEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bedba76cd6aa7bf4da8d96d31f2fc79
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.4 b/metadata/md5-cache/sys-devel/kgcc64-4.4.4
index 072df149163c..ceaf86d384d0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.4/gcc-4.4.4.tar.bz2 mirror://gentoo/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.4-patches-1.0.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3f83bf8c79814f4aedf08148803fd93
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index b7f7d210f871..a688bbdc37c1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a5d3c437cc15acf27ec2f09bafbf4644
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index 1628e6057219..45975504666b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d2342a48f750adc57110f6e655159b21
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.2 b/metadata/md5-cache/sys-devel/kgcc64-4.5.2
index 26348e55de57..c7660049f6cc 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.1.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b349d6b224eb5757004e94bed6e61f0
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index 2e5a5287eede..6de0690ca77f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=50081d6db4e2f5cd2d55859c7da432fa
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index 2d3609e257d7..1fe3830eee4d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f53de6771d1666630080dced6324724
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.3 b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
index d69333b52249..cf56c9ee6bf8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.9.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c00599337cd6b0f7d36e6a8b67d4db37
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index ef181cebfc12..9a98c6c1c043 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85adbfdcc20b766a78c0038fb112721f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.2 b/metadata/md5-cache/sys-devel/kgcc64-4.7.2
index 9e60b3ea0f88..ea5f7b0b9136 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2 mirror://gentoo/gcc-4.7.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-patches-1.5.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f56cf670adfeb0d61b9af45d17d05572
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index c2c35509c5bf..40b13b901260 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1411a428b901b9147157a4fac69ef30e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.1 b/metadata/md5-cache/sys-devel/kgcc64-4.8.1
index c58790bb31d8..bb2f3206e1e6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.1
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2 mirror://gentoo/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-patches-1.2.tar.bz2
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	b8d66d0068b213fc5c5ba85267487832	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain	98f7ec3ffdb404b05c9d189f51559626	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cce71b16fcd24563ce50d640542ff7ce
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.18
similarity index 90%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.10.17
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.10.18
index 4dd686bdfdb6..5fe73dfcad21 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.17
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.18
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.17
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.17.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 )
+SLOT=3.10.18
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.18.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 )
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	kernel-2	cfcb408286f35bb67644ce1a46310880	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=80262d2cd5796e76dc999892d9554874
+_md5_=d6404f51eb2dea5030e49ac14a6ea903
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.7
similarity index 90%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.11.6
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.11.7
index 887932a304e1..ee998efb3cdb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.7
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.11.6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.11.6.xz mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-3.11 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-check -> deblob-check-3.11 )
+SLOT=3.11.7
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.11.7.xz mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-3.11 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-check -> deblob-check-3.11 )
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	kernel-2	cfcb408286f35bb67644ce1a46310880	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a285aae020981ac4924b563a64e3135a
+_md5_=3a95ac2c8674a5f1009d18680c52e7c9
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.67 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.67
deleted file mode 100644
index 48fb6778b31f..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.67
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.4.67
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.67.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	kernel-2	cfcb408286f35bb67644ce1a46310880	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d079e527fdc757cc7d8332d453fb41f7
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38
index f37fca6d6fa7..84efbf288c59 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/173.14.38/NVIDIA-Linux-x86-173.14.38-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.38/NVIDIA-Linux-x86_64-173.14.38-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/173.14.38/NVIDIA-FreeBSD-x86-173.14.38.tar.gz )
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	linux-info	a9cbd6bbe2b28166e403321882f3c73c	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	nvidia-driver	92e88a2e33d056779baa88f1061c662e	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9965de4e7dc9dad503cc815a42d27683
+_md5_=3404eba7be250da09cd43cf590c75da7
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.116 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.116
new file mode 100644
index 000000000000..991f17ccc3a7
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.116
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) kernel_linux? ( virtual/linux-sources virtual/pkgconfig ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA X11 driver and GLX libraries
+EAPI=4
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r1
+PDEPEND=X? ( >=x11-libs/libvdpau-0.3-r1 )
+RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) X? ( <x11-base/xorg-server-1.14.99 x11-libs/libXvMC multilib? ( || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/304.116/NVIDIA-FreeBSD-x86_64-304.116.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/304.116/NVIDIA-Linux-x86_64-304.116.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/304.116/NVIDIA-FreeBSD-x86-304.116.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/304.116/NVIDIA-Linux-x86-304.116.run )
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	linux-info	a9cbd6bbe2b28166e403321882f3c73c	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	nvidia-driver	92e88a2e33d056779baa88f1061c662e	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=291ab5b015d62608a70d015b3b155eec
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.1 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.1
deleted file mode 100644
index 49dee35a9e2c..000000000000
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.34.0:2 >=media-libs/libpng-1.4:0= introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper:= ) tiff? ( >=media-libs/tiff-3.9.2:0= ) X? ( x11-libs/libX11 ) >=dev-util/gtk-doc-am-1.11 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Image loading library for GTK+
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=+X debug +introspection jpeg jpeg2k tiff test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.34.0:2 >=media-libs/libpng-1.4:0= introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper:= ) tiff? ( >=media-libs/tiff-3.9.2:0= ) X? ( x11-libs/libX11 ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
-SLOT=2
-SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.28/gdk-pixbuf-2.28.1.tar.xz
-_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0e2e43db542e8896cff308e3c95e6858
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.2 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.2
index 74642a86ac0b..e590b09a98c4 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.2
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.28.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.34.0:2 >=media-libs/libpng-1.4:0= introspection? ( >=d
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.28/gdk-pixbuf-2.28.2.tar.xz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=46e76a31a78baeb64453a3a238dae36d
+_md5_=0ed06377603362534a0b777bea6de166
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.2 b/metadata/md5-cache/x11-misc/shared-mime-info-1.2-r1
similarity index 95%
rename from metadata/md5-cache/x11-misc/shared-mime-info-1.2
rename to metadata/md5-cache/x11-misc/shared-mime-info-1.2-r1
index b88328ff86e5..1385564ba64e 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.2
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hadess/shared-mime-info-1.2.tar.xz
 _eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=266fc9b384ee1926294b01c99bbfc101
+_md5_=ffd193784801b9b3d74e27e225e817a1
diff --git a/metadata/md5-cache/x11-misc/spacefm-0.9.1 b/metadata/md5-cache/x11-misc/spacefm-0.9.1
new file mode 100644
index 000000000000..94015585e78c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/spacefm-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm preinst setup
+DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A multi-panel tabbed file manager
+EAPI=5
+HOMEPAGE=http://ignorantguru.github.com/spacefm/
+IUSE=+startup-notification
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/spacefm-0.9.1.tar.xz mirror://sourceforge/spacefm/spacefm-0.9.1.tar.xz
+_eclasses_=eutils	4878e7f88afc0ba0866ac112190b0fd4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=44d88b5128dc304a8f28df89f84d49d4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 68f828ede74c..d9db14242e20 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 06 Nov 2013 17:37:02 +0000
+Thu, 07 Nov 2013 10:37:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 745b9605909b..20e163b8d5fd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov  6 17:36:59 UTC 2013
+Thu Nov  7 10:36:59 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5e5e6eaff523..d44227706da6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 06 Nov 2013 18:00:01 +0000
+Thu, 07 Nov 2013 11:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 940495ccdecd..534c86eb5b3f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1383759301 Wed Nov  6 17:35:01 2013 UTC
+1383820501 Thu Nov  7 10:35:01 2013 UTC
diff --git a/net-analyzer/sslscan/sslscan-1.8.2.ebuild b/net-analyzer/sslscan/sslscan-1.8.2.ebuild
index 782b86176bec..dc0744389331 100644
--- a/net-analyzer/sslscan/sslscan-1.8.2.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslscan/sslscan-1.8.2.ebuild,v 1.4 2012/08/06 06:22:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslscan/sslscan-1.8.2.ebuild,v 1.5 2013/11/07 10:22:55 polynomial-c Exp $
 
 EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Fast SSL port scanner"
-HOMEPAGE="https://www.titania-security.com/labs/sslscan"
+HOMEPAGE="http://sourceforge.net/projects/sslscan/"
 SRC_URI="mirror://sourceforge/sslscan/${P}.tgz"
 
 LICENSE="GPL-3"
diff --git a/net-dialup/pptpd/Manifest b/net-dialup/pptpd/Manifest
index 36ed8001c881..e9e4597cfeb8 100644
--- a/net-dialup/pptpd/Manifest
+++ b/net-dialup/pptpd/Manifest
@@ -1 +1,2 @@
 DIST pptpd-1.3.4.tar.gz 240942 SHA256 c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6 SHA512 382cc7ce9db7f2b6ffe0a075a319267310f736ca1b93e9867e9d5abb3c56edf49d3cf2bba83d6ae778834e0e18a21fddf29444106c8143a3016ca704ac538b1e WHIRLPOOL ae0675c3dad54242ff8d1fd588540ce097eab2dc48af3381fc844db27b0f78059d2abb101cc894464c60fcdbec1ab77c119361a95e866b29a5ae1f15f53f3887
+DIST pptpd-1.4.0.tar.gz 252167 SHA256 8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484 WHIRLPOOL 8296818e05cb01339b83a68d149413fd5bd76b435cfa56c3e16a8136b531743468953279d44339fd0f8125fb25172a3ee9a10ec14bb9f801eb54133b665dab3b
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch
new file mode 100644
index 000000000000..9e7db7ea3454
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch
@@ -0,0 +1,59 @@
+diff -Naur pptpd-1.3.4.orig/Makefile.am pptpd-1.3.4/Makefile.am
+--- pptpd-1.3.4.orig/Makefile.am	2007-04-16 04:53:53.000000000 +0400
++++ pptpd-1.3.4/Makefile.am	2007-05-01 21:29:15.000000000 +0400
+@@ -11,7 +11,7 @@
+ ##  warning with -Wmissing-prototypes).
+ ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
+ ##  aren't up to it).
+-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
++CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
+ 
+diff -Naur pptpd-1.3.4.orig/plugins/Makefile pptpd-1.3.4/plugins/Makefile
+--- pptpd-1.3.4.orig/plugins/Makefile	2006-08-03 06:02:01.000000000 +0400
++++ pptpd-1.3.4/plugins/Makefile	2007-05-01 21:29:15.000000000 +0400
+@@ -1,6 +1,5 @@
+-CC	= gcc
++CC	?= gcc
+-COPTS	= -O2 -g
+-CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
++CFLAGS	+= -I.. -I../../include -fPIC
+-LDFLAGS	= -shared
++LDFLAGS	+= -shared
+ LDADD   = -lutil
+ INSTALL	= install -o root
+diff -Naur pptpd-1.3.4.orig/pptpgre.c pptpd-1.3.4/pptpgre.c
+--- pptpd-1.3.4.orig/pptpgre.c	2007-04-16 04:21:02.000000000 +0400
++++ pptpd-1.3.4/pptpgre.c	2007-05-01 21:29:50.000000000 +0400
+@@ -326,9 +326,11 @@
+                                        "GRE: timeout waiting for %d packets", 
+                                        head->seq - gre.seq_recv - 1);        
+                 }
++#ifdef LOG_DEBUG_GRE_ACCEPTING_PACKET
+                 if (pptpctrl_debug)
+                         syslog(LOG_DEBUG, "GRE: accepting #%d from queue", 
+                                head->seq);
++#endif
+                 gre.seq_recv = head->seq;
+                 status = callback(cl, head->packet, head->packlen);
+                 pqueue_del(head);
+diff -Naur pptpd-1.3.4.orig/pqueue.c pptpd-1.3.4/pqueue.c
+--- pptpd-1.3.4.orig/pqueue.c	2005-08-03 12:53:22.000000000 +0400
++++ pptpd-1.3.4/pqueue.c	2007-05-01 21:29:15.000000000 +0400
+@@ -7,13 +7,11 @@
+ #include "pqueue.h"
+ 
+ #ifdef DEBUG_PQUEUE
+-#define DEBUG_ON 1
++#	define DEBUG_CMD(_a) { _a }
+ #else
+-#define DEBUG_ON 0
++#	define DEBUG_CMD(_a)
+ #endif
+ 
+-#define DEBUG_CMD(_a) if (DEBUG_ON) { _a }
+-
+ #define MIN_CAPACITY 128 /* min allocated buffer for a packet */
+ 
+ static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new);
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
new file mode 100644
index 000000000000..de91753f33f5
--- /dev/null
+++ b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
@@ -0,0 +1,21 @@
+--- plugins/Makefile.orig	2013-05-15 14:36:33.994231829 +0400
++++ plugins/Makefile	2013-05-15 14:37:06.686234429 +0400
+@@ -17,14 +17,14 @@
+ %.so: %.c
+ 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+ 
+-LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR	?= $(prefix)/lib/pptpd
+ 
+ install: $(PLUGINS)
+-	$(INSTALL) -d $(LIBDIR)
+-	$(INSTALL) $? $(LIBDIR)
++	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
++	$(INSTALL) $? $(DESTDIR)$(LIBDIR)
+ 
+ uninstall:
+-	rm -f $(LIBDIR)$(PLUGINS)
++	rm -f $(DESTDIR)$(LIBDIR)$(PLUGINS)
+ 
+ clean:
+ 	rm -f *.o *.so *.a
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild b/net-dialup/pptpd/pptpd-1.4.0.ebuild
similarity index 83%
rename from net-dialup/pptpd/pptpd-1.3.4-r3.ebuild
rename to net-dialup/pptpd/pptpd-1.4.0.ebuild
index 03efc04c0022..59dee417b753 100644
--- a/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild
+++ b/net-dialup/pptpd/pptpd-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r3.ebuild,v 1.4 2013/10/25 09:24:36 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.4.0.ebuild,v 1.1 2013/11/06 18:26:56 pinkbyte Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gre-extreme-debug tcpd"
 
 DEPEND="net-dialup/ppp:=
@@ -23,7 +23,6 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-more-reodering-fixes.patch"
 	epatch "${FILESDIR}/${P}-sandbox-fix.patch"
 
 	# Match pptpd-logwtmp.so's version with pppd's version (#89895)
@@ -32,9 +31,6 @@ src_prepare() {
 	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
 	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die
 
-	# respect LDFLAGS
-	sed -i -e "/^LDFLAGS/{s:=:+=:}" plugins/Makefile || die
-
 	# Automake 1.13, compatibility, bug #469476
 	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.in || die 'sed on configure.ac failed'
 
@@ -74,6 +70,5 @@ src_install () {
 	newconfd "${FILESDIR}/pptpd-confd" pptpd
 
 	dodoc README.*
-	docinto samples
-	dodoc samples/*
+	dodoc -r samples
 }
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 7585cdbf30e6..a3d008afed1f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -10,3 +10,4 @@ DIST nfs-utils-1.2.5.tar.bz2 698148 SHA256 3595ed4f6ee5c13514540861ad5e89907aa4f
 DIST nfs-utils-1.2.6.tar.bz2 755305 SHA256 70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83 SHA512 634f6d71d081fd9a06e28f25d9270d04d92cacc7bd1f99507ed610bd703d4df9e9ce4fab0de1463dd25ac64a99ae5a54f65340edb12ac007583b83a872dcbc25 WHIRLPOOL b87b0e543aacaa74ea305dccfd966c4f7717929636c8ed6f0bfd1bfec1ef2e6e913855b4a704ffd31215582931a795707455eaa3d639e601b154eb0ea77d13a2
 DIST nfs-utils-1.2.7.tar.bz2 2902130 SHA256 7ef8e0a8b22cd7ff33f3afd28e770d45643fae303468a180640c2967833fe75e SHA512 c63b28be8e7b9cbc3ccb4950f31fd30f3ddc9c8707dcad4c3f2ee78fb464df9e0f1f58dc0c47e530c5afaa604712b4dc5e15af795810374e833c09a19dfd32e1 WHIRLPOOL 785511e2eb03649027977d81f11d7a5b1f960d4fdc57b790af5a3d441aa63858d8c2876e851049ea1b799a93796b209c9a3d22837f3aa3744ba17395a4fc8dbc
 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
+DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index e1edd02fed0b..715d2d63e001 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -4,6 +4,7 @@
 <herd>net-fs</herd>
 	<longdescription>NFS client and server daemons</longdescription>
 	<use>
+		<flag name='libmount'>Link mount.nfs with libmount</flag>
 		<flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag>
 		<flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag>
 		<flag name='nfsv3'>Enable support for NFSv3</flag>
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
new file mode 100644
index 000000000000..fa97e9db09e2
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild,v 1.1 2013/11/07 07:50:22 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib autotools systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
+	caps? ( sys-libs/libcap )
+	sys-libs/e2fsprogs-libs
+	>=net-nds/rpcbind-0.2.0-r1
+	net-libs/libtirpc
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			net-libs/librpcsecgss
+			>=net-libs/libgssglue-0.3
+			net-libs/libtirpc[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			sys-apps/keyutils
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		$(use_enable libmount libmount-mount) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsdcld nfsdcltrack) \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use_enable uuid) \
+		$(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
+		$(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	for f in nfs nfsmount ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+	systemd_dounit "${FILESDIR}"/nfsd.service
+	systemd_dounit "${FILESDIR}"/rpc-statd.service
+	systemd_dounit "${FILESDIR}"/rpc-mountd.service
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	mkdir -p "${ROOT}"/var/lib/nfs #368505
+	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
+		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
+	done
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ae877cc5601d..d8ecb1593882 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,4 @@
+DIST curl-7.30.0.tar.bz2 2625976 SHA256 6b1c410387bea82601baec85d6aa61955794672e36766407e99ade8d55aaaf11 SHA512 5ee8e1e8a0e650a1875198b21cb8f9d125a3790883efc6d6c21c029552b4eba1203d96c6830866ce735dae1b63d61455f0c6a7c8b540acbef77451caf23e9dd5 WHIRLPOOL 3d378db225deba8d3eed97cea7cb75aa4f42a6aba023559c00f579a95e6988cc7f5b2ffa5005e08d186057c0cbb432aed410c45e74dc22b1b7bde1eba5b9debc
 DIST curl-7.31.0.tar.bz2 2679209 SHA256 a73b118eececff5de25111f35d1d0aafe1e71afdbb83082a8e44d847267e3e08 SHA512 56b69cf5ec6e4de2b38280fe03ce97dfad33f3f88d2147a0334dab5cd6cde30aef2f4d09761b1dc8d515b448b5c149aff7f15c6ccd235cdf951f3c021b360200 WHIRLPOOL a7b2fcab8c65edd83d89addf2c7fa3ea334d8554a4d69efe8ff40790e41d0dbe3bda0c471130f3401e39a79c1c264f141fd1843abfa588c2b58036474bc7d385
 DIST curl-7.32.0.tar.bz2 2727587 SHA256 8e3db42548e01407cb2f1407660c0f528b89ec7afda6264442fc2b229b95223b SHA512 bcb2f070f3bb85c9a876e4e7d443df0a66aabed395ef7542df1aac2672d31ee8d57e3b4fa1242dc773e7fb6ad05fae8cefe436a6fccf6f1824014669ef05647a WHIRLPOOL a6c27638ad7336c895cd9e92bc1c14148d9c95b420e55f4871466c285e433568c0088f2cb3f5f53c3c57916aa970c40939dc729ddebad9421873a0759cb99d78
 DIST curl-7.33.0.tar.bz2 2747507 SHA256 0afde4cd949e2658eddc3cda675b19b165eea1af48ac5f3e1ec160792255d1b3 SHA512 13f61e8255859f3d1138bf7cc935bda90af5f51103f1660b9e9cc6dd63d37b7672752900f3a76f8c80d47a7c02061077c6417d53617576f4030e180552b75076 WHIRLPOOL 54a2533cb8cefe72a497cc1f45050967a26d0b438b5ef9bafc1e291d8d4af2f15c899d4b9664b0dc32dc0ecd2833da1bb093a64b41ada995b3395fc067afae12
diff --git a/net-misc/curl/curl-7.30.0.ebuild b/net-misc/curl/curl-7.30.0.ebuild
new file mode 100644
index 000000000000..2c49f7a7318a
--- /dev/null
+++ b/net-misc/curl/curl-7.30.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.30.0.ebuild,v 1.14 2013/11/06 17:57:09 zerochaos Exp $
+
+EAPI="5"
+
+inherit autotools eutils prefix
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
+IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+	ssl? (
+		curl_ssl_axtls?  ( net-libs/axtls  app-misc/ca-certificates )
+		curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
+		curl_ssl_gnutls? (
+			|| (
+				( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+			)
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
+		curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
+		curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates )
+	)
+	idn? ( net-dns/libidn[static-libs?] )
+	adns? ( net-dns/c-ares )
+	kerberos? ( virtual/krb5 )
+	metalink? ( >=media-libs/libmetalink-0.1.0 )
+	rtmp? ( media-video/rtmpdump )
+	ssh? ( net-libs/libssh2[static-libs?] )
+	sys-libs/zlib"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_polarssl? ( media-video/rtmpdump[polarssl] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,-polarssl,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_cyassl
+			curl_ssl_gnutls
+			curl_ssl_openssl
+			curl_ssl_nss
+			curl_ssl_polarssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
+		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
+		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+src_configure() {
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-cyassl --without-gnutls --without-nss --without-polarssl --without-ssl )
+	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			einfo "NOTE: axtls is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-axtls )
+		fi
+		if use curl_ssl_cyassl; then
+			einfo "SSL provided by cyassl"
+			einfo "NOTE: cyassl is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-cyassl )
+		fi
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
+				einfo "gnutls compiled with dev-libs/nettle"
+				myconf+=( --with-gnutls --with-nettle )
+			else
+				einfo "gnutls compiled with dev-libs/libgcrypt"
+				myconf+=( --with-gnutls --without-nettle )
+			fi
+		fi
+		if use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use curl_ssl_polarssl; then
+			einfo "SSL provided by polarssl"
+			einfo "NOTE: polarssl is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-polarssl )
+		fi
+		if use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --without-ca-bundle --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	econf \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--enable-pop3 \
+		--enable-rtsp \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-proxy \
+		--disable-soname-bump \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		--disable-versioned-symbols \
+		--without-darwinssl \
+		$(use_with idn libidn) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		--without-krb4 \
+		$(use_with metalink libmetalink)  \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--without-winssl \
+		--with-zlib \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+	insinto /usr/share/aclocal
+	doins docs/libcurl/libcurl.m4
+}
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index a28ad70ce987..36cbc4f4fb18 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.125 2013/09/08 17:08:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.126 2013/11/06 21:05:15 pacho Exp $
 
 # This file requires >=portage-2.1.1
 
@@ -26,10 +26,6 @@ sys-apps/hwloc -cuda -gl -opencl
 # Keywords missing, bug #478104
 >=app-editors/gedit-plugins-3.8.3 git
 
-# Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
-# Keywords pending, bug #476710
->=gnome-base/gnome-extra-apps-3.8 games
-
 # Anthony G. Basile <blueness@gentoo.org> (18 Jun 2013)
 # Works on x86
 net-libs/cyassl -aes-ni
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 44c96e9a3206..5331ddf73378 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4399,6 +4399,7 @@ net-fs/netatalk:shadow - Add shadow support
 net-fs/netatalk:ssl - Use dev-libs/openssl to provide DHX User Access Modules. These are not used with most recent versions of OS X and can be kept disabled without risks.
 net-fs/netatalk:tracker - Add support for spotlight like tracker
 net-fs/netatalk:utils - Install afpstats script
+net-fs/nfs-utils:libmount - Link mount.nfs with libmount
 net-fs/nfs-utils:nfsdcld - Enable nfsdcld NFSv4 clientid tracking daemon
 net-fs/nfs-utils:nfsidmap - Enable support for newer nfsidmap helper
 net-fs/nfs-utils:nfsv3 - Enable support for NFSv3
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index b4f3cbe68fa3..1b59356e8432 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -4,3 +4,5 @@ DIST CGAL-4.1-doc_html.tar.xz 18498060 SHA256 7e3243fa818a5aaad04deb0a13143e87f8
 DIST CGAL-4.1.tar.xz 9972676 SHA256 83038ceb6c4f76a88ddf8c3b02d628144c5271677184689f4ae95f79061ab50e SHA512 fc96f72ea88121fcb40051c9d73830c54ffbebc2456d4269b2ad950767bab7ae96c1417230d88a252d20ddb9b9106c188c0369f062cb5d9d3ded0b268471a400 WHIRLPOOL 120de86898373b52b472ac2538ae5f6b8393b42c7d3e29396464318c77a9d2af1b2a1011d18e2268e6fe563089d032ac09f5d3c207dc57e0ce5f535e8fe129ab
 DIST CGAL-4.2-doc_html.tar.xz 18853688 SHA256 ff28549be2d7e3331d68485bb348c29ece0b5d27526a64010d8f869895816525 SHA512 3150c9402f96503f03059b0d35abc550c4142e35a62641b00b2dd76e836b4c86a7404a003838647bc5be92e27bc52a37b1ce937d96d77eb7e0a2d6d5ed07cd60 WHIRLPOOL 0cbaa6bebccd2afbdfc76c6bf8a0867cea7df46807a5fad4dc104c4dc36542de2fa0be6cd1e53c35a64e5cc6f6e913358266b959421932eab6c48c727afbe6c8
 DIST CGAL-4.2.tar.xz 10005840 SHA256 6b78d7af2e328d380963bfd8294612449252bf50e69d8a96780feed40d3db916 SHA512 fa83f3e05830dfc83a7fd5f9c660201f245507e88b8343c14ccf366e1ff2c74b71c522cc20669196a8f2c286fa8d597f02e34ab2c6c210b13daaf8e7dfcc7a0e WHIRLPOOL 28351d9335abb5ba8db9f250c9c57851de2b8f43dbc210c0e563b228e26b34017dd92b1a880ee63fc8c33d4037520eba4410b70d1f6884a4a09260d18f55f687
+DIST CGAL-4.3-doc_html.tar.xz 15582924 SHA256 dd28989ee950178b3f22d8b14111510312586c1a2c0b29a73a2a14d7d7eb5059 SHA512 41125ab3b5135ae539365e6c128f79119a679292e734e1669cc43a35996363951f5a5d494f8c25c3b1eab75a69137ed51bf7b65ad6d47e56756212565ec245ec WHIRLPOOL 961c4fea224e2c94a65a7dd07b16326159e9fe95f9176abd0cc96be3cb53060c076a80d5efd2d9c640c2aa2eea0d3d06ce64839961906a588706647830849972
+DIST CGAL-4.3.tar.xz 10108992 SHA256 cc475885b4ca4b15ab5d446c0e554b7b69f6980969bc3a8c5b83f8da4ee1bb04 SHA512 dcf329232f6511be6b7eecef7afbfd505529385cb29a3717b762068a3dac52b3706b1d55c6e30b677c6cf2f99aae937de7d730d30cc33680fc39df0f0ff76e70 WHIRLPOOL 862d5bc3387afa1b6702974b7fab3b7d4c35334023eb813bb52a6c7092d6f89104db8c7b851fd7ebb7dfdd38392f9d6459e9afab34bf237b0484f7d395035873
diff --git a/sci-mathematics/cgal/cgal-4.3.ebuild b/sci-mathematics/cgal/cgal-4.3.ebuild
new file mode 100644
index 000000000000..f57296f91be5
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3.ebuild,v 1.1 2013/11/06 18:39:04 bicatali Exp $
+
+EAPI=5
+
+CMAKE_BUILD_TYPE=Release
+
+inherit base multilib cmake-utils
+
+MY_P=CGAL-${PV}
+PID=32995
+DPID=33000
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
+SRC_URI="
+	http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
+	doc? ( http://gforge.inria.fr/frs/download.php/${DPID}/${MY_P}-doc_html.tar.xz )"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi qt4"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/mpfr
+	sys-libs/zlib
+	x11-libs/libX11
+	virtual/glu
+	virtual/opengl
+	gmp? ( dev-libs/gmp[cxx] )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4 )
+	mpfi? ( sci-libs/mpfi )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS CHANGES* README"
+
+src_prepare() {
+	base_src_prepare
+	sed \
+		-e '/install(FILES AUTHORS/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs+=(
+		-DCGAL_INSTALL_LIB_DIR=$(get_libdir)
+		-DWITH_CGAL_Qt3=OFF
+		-DWITH_LEDA=OFF
+		$(cmake-utils_use_with gmp)
+		$(cmake-utils_use_with gmp GMPXX)
+		$(cmake-utils_use_with qt4 CGAL_Qt4)
+		$(cmake-utils_use_with mpfi)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples demo
+	fi
+}
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index a8b19aea2fbc..40a256015c0b 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<herd>sci-mathematics</herd>
 <longdescription lang="en">
   The Computational Geometry Algorithms Library is a collaborative
   open source library containing:
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index 4b9acaccd620..3d749539312b 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -1 +1,2 @@
 DIST pam_ssh-1.97.tar.bz2 200184 SHA256 10233b0d3e480fdc977d4e3a1ea5a994cf1f257c3b948650a86e4d753796789d SHA512 78632ef5baf8c7ac6d28d16a4c7e452978ad09a969c562cfcc708b835dbba3da12317569a618768ef6f9d59db1d5d31f2a0c7b2ab1244ed9caa37eb89413494e WHIRLPOOL efe23d1d86f92298682edeb960e046d0c5def65961e3e51dc82bb244b98f76ac7b7a456fd80d31740e851602e8d8cd27d17d0b66ca6e0e44d1356982c4496887
+DIST pam_ssh-1.98.tar.bz2 292989 SHA256 30312f242c00551b120cc39defd3745b8cb50408ea845e8688d18d2a28b51180 SHA512 bf6da4ced0619549d56516c6b24e899664e0948da7a0cc04ff1b536d06cc8c26242c83eb36ed835668c824b777e270aa293162ac77e3c479311386e6e5da39ff WHIRLPOOL a62dccfec3a0208e8e94c0635aa1d8813ff3bbfeba5eebbff854c44638c51a547251a22460f78d08d34cc60b0318bcec622649b6a0dac030d159378451df09ae
diff --git a/sys-auth/pam_ssh/pam_ssh-1.98.ebuild b/sys-auth/pam_ssh/pam_ssh-1.98.ebuild
new file mode 100644
index 000000000000..6f679f25d64a
--- /dev/null
+++ b/sys-auth/pam_ssh/pam_ssh-1.98.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.98.ebuild,v 1.1 2013/11/06 20:27:05 pacho Exp $
+
+EAPI=5
+inherit pam eutils flag-o-matic readme.gentoo
+
+DESCRIPTION="Uses ssh-agent to provide single sign-on"
+HOMEPAGE="http://pam-ssh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.bz2"
+
+LICENSE="BSD-2 BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+# Doesn't work on OpenPAM; looks for OpenSSH at build time (bug
+# #282993) and won't work with other implementations either
+RDEPEND="
+	sys-libs/pam
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+DOC_CONTENTS="
+	You can enable pam_ssh for system authentication by enabling
+	the pam_ssh USE flag on sys-auth/pambase.
+"
+
+src_configure() {
+	# hide all the otherwise-exported symbols that may clash with
+	# other software loading the PAM modules (see bug #274924 as an
+	# example).
+	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
+
+	econf \
+		"--with-pam-dir=$(getpam_mod_dir)"
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+	readme.gentoo_create_doc
+}
diff --git a/sys-devel/gcc/gcc-4.8.0.ebuild b/sys-devel/gcc/gcc-4.8.0.ebuild
index 8ad03b61126f..a9fda0be9c04 100644
--- a/sys-devel/gcc/gcc-4.8.0.ebuild
+++ b/sys-devel/gcc/gcc-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.0.ebuild,v 1.9 2013/10/08 04:00:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.0.ebuild,v 1.10 2013/11/07 03:29:24 dirtyepic Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -24,7 +24,7 @@ DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 65923c6e8534..44119b9cd615 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -2,18 +2,14 @@ DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522e
 DIST deblob-3.11 119401 SHA256 78bf8169e466a2082c6bedca0431bdbe15a55f4ba96c16a631587f23e0cdef25 SHA512 d6f87cf2d9c0a7f59a52c5a890015e050ba684d34f9e81ff8386ab57247718d0b10b6cd8a68ce3dd25711936b660b7cf512cacf31a3467b9b70a3e3e8433e142 WHIRLPOOL 026a2ff10994be722b08b1638366be8311c685c69214db9449e605477f81b817a8c2ca1e4d8617d61f7f66a6f287c74f68a679bc81ff3364d0245eb3ea84fe36
 DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
 DIST deblob-3.2 107602 SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20 SHA512 f34b7128adf716c908cbbbfefe72149fcd88b727d27edab43be65d4e6a55112b6d937d5c2bed86454d58781f3766ba4cc6db668cb6174a6039d276499da37cb4 WHIRLPOOL 0922457f7ca413c9d8115182964a7c051560799c4724452f81cb4c0383cf62c45b0364d6e639bd9d2b9000411d8773cabd2e8af99e8b0dc7f7bdc886db432d6d
-DIST deblob-3.4 109026 SHA256 2fca296bccfa7dc25447f36975971597f67730168a9bc4db0853e55347950680 SHA512 7e6263e265dba957e966b76366566c5b318322c33ec60c9f268af1a375271cd1c1232749902832554f93451225bf61c967f314a48c2890984974d30a984d2e01 WHIRLPOOL f3d8d76078b4a372277926d1d4f3d449968acd64e57a5fbe8fc1c3057e8a9893ba1d580418598089977bb808d9a351de04181dd7f73395e99b306ba8d4886160
 DIST deblob-check-3.10 565672 SHA256 748df2cf5c1f012f9942948827e57b12bb05c569cae220416b3c0339520d9855 SHA512 341ea8a755c4f1f42ddbc4e7dfe8d786e8b29f497bee3fd72154c8c1c0bcadcb9efff04f2663090bd8741e5b5baafed26a62b9d16c31f3b31665cd3cd3e779d5 WHIRLPOOL 7e6c8eefa9b44e7d50011a9390baf7999533b4016122992c0ac0722cce05dbb8e4b7e96f1f05e9bfdd2ce3e4c08f0e06c8955b68ed8c044ff75f3a314a405824
 DIST deblob-check-3.11 589384 SHA256 6931c59ed9f03e2f11038997e430e9c04d51fe2d00dc6f8a134d92e1eba72fdb SHA512 315c50141967adb7952bc83a374f94d9b70a1027d6cd4a4b76d4fa4108ea7159cedb599e65ba531af1c1ef869e203aa1a03225e210cddd996120977d4886a25a WHIRLPOOL c079786436dc55773de9f5fc1bccd265049e58b74618fba534cd5964d881c107ecb705de68e3a7f02d1e285ebad9b2d7e985a4b6603fa3460b503c6db1ff1ad2
 DIST deblob-check-3.12 601108 SHA256 e6c07b4220f86007ea31f9ed5d01023253296ddaa0710e65e08f231eccf6085a SHA512 fb293fb5093c410b319203cf0a65457a3ef28430ad6257b08a6e3eb77011d79708c51121c0a8776f55124259719782b4ac9b4c54155c13bb05a2679541816887 WHIRLPOOL e056b4edccd36911fe415cd1780bb484875a16237dce89316144c8ee07df3253bc19abdbee2e51ab3dd9248682470e80409819584c188e22601026e8df222754
 DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638 SHA512 3abb9968ef4750fda90e4e2283981fd4691b7f9854244413b31d17bb60382a6d809fec929d8d3f9b52397dd9f9fa26783f4c3a25f3f4115b76ed585ea68e9916 WHIRLPOOL 891c3f809af470d680ae896c843c09612fb5124f2805e03d67b28ec4353bff0bc346ae9f680d900f0f63e681be86a0195f9baab7dcf3b5accfda739b106766fa
-DIST deblob-check-3.4 448778 SHA256 28ce952c082e765784f9e5b63f5a3a4fb93545e5e788dc94d094c0b3ae8ea3a0 SHA512 f8f47a0adcc1b9a16c155d89d72d91a02d47bdbb3ac3a353be3873dc868fa44451367b7bb3906817d1ca8f51b64c99ce381d2fa3121582b70c7c2efb18dfc579 WHIRLPOOL 37d219204e15e0c81ac43faed93f7a5051735c474efb2b5167117cd463fbe81167267b756e8ce546447a30ad5bac651c943401ed98ec61713e20af89aa4fb957
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
-DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
-DIST patch-3.10.17.xz 324036 SHA256 5552fc6f24a56d13d603ddc7759114a7b52e92ad2fb84a23a1b80b37b739a33b SHA512 38f9085d67d59cb37c32db69b84714a96f327fe74b69bb4a7304861ea6e474614216067ee08093f41739ce803b83a70400c83f06c695cb1114cf41c0b2dc7aa7 WHIRLPOOL 8e0fcce60f7aa60de733d99421683599076e28959fb77afbe38ca2534d5fcc47b16a07f2e1a15fb3f9431bce1fd5957f4760e6c0610b8e78a0f0ee6d62d16218
-DIST patch-3.11.6.xz 136916 SHA256 61ca45a96f9db6477eca0f2170a7c79c2e3b83893f8445249ec7a360d8be244e SHA512 547e9b7edceec2cadb792118c219a68d1d0f3a180d4c1f22dc301c780be5c2669caf3a5585085e9ec0440d5d94bbea82255624132affbbe52163dd922eb91738 WHIRLPOOL 9c6c9b67ad08e1adb1a5718bffc672b241b46b4c3c183848d3bf50bf6882af81184bfa65f49e31d00c00274b841efea6dc7acf9c00acc15277f9db3f4d88e571
+DIST patch-3.10.18.xz 343116 SHA256 6fe9123444e4803d2bdec0f89a969024813bd54ba9114471589d1326deee8d6f SHA512 b891e6969a0628f760aebf04e7b4cfd9e93c73fd1f61d9c50a2e3b812bff4f35f2b2a13f88319a106fb6d9929b83bc59384ddb651b17ea158739523ad252575a WHIRLPOOL 57d574fd3f4f140b69e6ae811caea5cfa4be1646b97a919d2380a309efcd23c42f7ade788a1446c46ecec05697029bb212ee415729f8be2a5909fb2715e50245
+DIST patch-3.11.7.xz 157900 SHA256 da03530e5fa8a87566b605a65d650ffaff01f94caaa057bb375fd75746d07ecd SHA512 d94257c3c0bbd42f70693172bad494400e0f1c07a6404062fbb6c6fb788e94c2920ea76d3b92eba40e389aa7f2164c14555a1757ef8fdd76827d3e10676a39d3 WHIRLPOOL da1bcfc6a73879060df857f2a328e051a4f13ad725d7eaa36f82c8e55f4e8f3ceb64f704d999332d99a4ff8a528fcafb4e3e9f46f7caaf276f73ed6db7919b32
 DIST patch-3.2.52.xz 1023312 SHA256 1d23d1bf7a14d7ae48305b52d2c3d98c6c86d4f82596049c2335148a6c388265 SHA512 dafe29b5a9d7c0393588689840d78228018851afab07d5bd30dd9081acf34ed0860ecc0b547c124f0451f21898c056863d97a6d345a52abad7b124bc408e50b3 WHIRLPOOL 8a4cf9ed5a9e84c6782db2f534ee45bcd4d632c12c83171710c2a1041bad40dea9d800fc8a738f70a21c564cff22abf63189ce6b15f9e9e824e14c5bbfb18022
-DIST patch-3.4.67.xz 772524 SHA256 3d3c9048423ed98f9ed5202542711a0616c247a43eaa65dcf48994bbbf613c66 SHA512 eeec960202e5a17eafd78fc5cb70e1d73af52cb6a3290206d92ababe492a9a2db683d3d7b9aba997890dbbda10451f00c512f48f17ee9960f956c24c03317c47 WHIRLPOOL b007774e642b323c715618b0d825c3549ee62a5a9b45d4d6f6e4e03da1c39999807f2c350e8a5bd5b75067a1bf735e7823a5d48ae29b9810077a65a04ffa9003
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.4.67.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.18.ebuild
similarity index 88%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.4.67.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.10.18.ebuild
index 63de941771ee..c09544384402 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.4.67.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.10.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.4.67.ebuild,v 1.1 2013/10/23 06:54:53 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.10.18.ebuild,v 1.1 2013/11/07 00:36:46 mpagano Exp $
 
 EAPI="5"
 K_NOUSENAME="yes"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.11.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.11.7.ebuild
similarity index 89%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.11.6.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.11.7.ebuild
index f9151de955cb..d3edab173b39 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.11.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.11.6.ebuild,v 1.1 2013/10/18 19:54:41 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.11.7.ebuild,v 1.1 2013/11/07 00:36:46 mpagano Exp $
 
 EAPI="5"
 K_NOUSENAME="yes"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.68
similarity index 89%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.10.17.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.4.68
index 858320b63db3..8acbfb9f5649 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.4.68
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.10.17.ebuild,v 1.1 2013/10/19 19:59:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.4.68,v 1.1 2013/11/07 00:36:46 mpagano Exp $
 
 EAPI="5"
 K_NOUSENAME="yes"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5637ab52ad7c..769528f3139b 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,5 +1,6 @@
 DIST NVIDIA-FreeBSD-x86-173.14.38.tar.gz 19603538 SHA256 5e2d8e2151240df06632d9fd42bdb2ecdbf2ed8b29487f84f0f90a68e3f08185 SHA512 4b3d94e1d9718d651025410d32eb93c0536bf72bd9963671ac063804f9d32ea30aeeb691638927b7045fa7f192a93f312e296bd1ac51f226058cf073a79a0c6d WHIRLPOOL 02efd3e25bae76c89f647ed10ad5398702ff5b23723619a90e68f4b4c0155d273ff89e5397ddd6dfff0ba8a23691f173ccedcb8f247b60a919848813b560e82c
 DIST NVIDIA-FreeBSD-x86-304.108.tar.gz 33658984 SHA256 75908c8d062c8eeb1bc32ba1497485b4528f164bba2b2f6ba535e7c39ff04d4a SHA512 f16a742aac04f4f9e69ae466c5ec5d3a050bdbc10c70310f9d34ad3a553df02718e47f4b4c1eb9d1c103886959a787bb931782d9792f7055234d80c99d02f056 WHIRLPOOL 25e0e929c16b62669c105d2f8d9a4be3507cfba4088c6af63f3aa0473e72e1e8c05be7693bbac0e3c0a7f8e04b6abf2b400a2ad9f0da56ba7caaf96cdb3cfe88
+DIST NVIDIA-FreeBSD-x86-304.116.tar.gz 33666829 SHA256 8bcc7ec09243b8a201ebb104da0a887f6d842362672d6469065ae4f92a0b3a51 SHA512 a35fef1255a06f64ed19370aeb1e6a3eaccb17a72401a60ae7659122764dfb8fcce1ad97e3472d1e4bb1ad0e4862a2bce82f3cae8479cc16ca666246272e52bd WHIRLPOOL 345ff002e5e6fd3eb3762fbceebe7e88ae3f663733dd26a2e6690ccb5dbd6df7bfc6a42c4c668498cc45d5ae6e4e7bf765516b8a18219ffbfb95dda3a2449beb
 DIST NVIDIA-FreeBSD-x86-310.51.tar.gz 19512752 SHA256 95772b0b31a438f5f58e15c09d752a0dd7c3e98afda60e7b8239ebd2557d43a0 SHA512 9060d16e38c3edd080328dadc03df0601be76a79fa5610024077705c2ff177e6c7dc4e9a2c5fad6b58ef77b2c34477408a377a4dd12fe7ed47fcd48199bd572f WHIRLPOOL 151d874e61880a2eee146ca51d20a66c2f563b6c2e04c3070a1e6309c2a572dafdb18a6c8e385a2f767d652b2a236e5bd3a355e9abcf23d750fff5d2a9371817
 DIST NVIDIA-FreeBSD-x86-313.30.tar.gz 32591892 SHA256 1e02831fbaddf2f27808ea26352d835417f59bcf54ddb3e9c0f1d7b76dcb4666 SHA512 68cf61fabf707dfa1225011cab3749959ab29f09f611347eb9f9bd55065012d04382998e67091c4d3c1af9be21be6381aef9b6414448ee15f9a36d44448f5bf8 WHIRLPOOL 71ded70f45e880db2c2850c596cebafd004adf89f7131adaf324d1d38abbb5457a700bfa9e671bfa144515556f011df8a37fdf22b78b879f39007be6487f060a
 DIST NVIDIA-FreeBSD-x86-319.49.tar.gz 34058374 SHA256 668615070ea7fcf31588ab256c2708ae0570dffc009d153bf28183f652d14719 SHA512 fcf56916a3717590ada2fc778cf0d5ded6cd946528b115f36fa2ab93e1f08690bac83d4ecf6c9ae672581991b3399db9187073f65169bea72d724a4a1eb42ed4 WHIRLPOOL db2f181dbf9a9004c58535f305ccb16e6d3472375fdd14363716b04b561719a21628634df7a6d8f0b7fe939dcf709660eda963194c7208a37c01a64b267845af
@@ -8,6 +9,7 @@ DIST NVIDIA-FreeBSD-x86-325.15.tar.gz 34164781 SHA256 745d8454833d1ad59f6480ac2d
 DIST NVIDIA-FreeBSD-x86-331.20.tar.gz 55524337 SHA256 dca5c90a99ab151d97c1cbb23f37c7834867ce32f88c6916b2295b3945363b7e SHA512 56135d442c6404a2802e3c47a6b3ffbf11066ceb43bb4f3151e94ad802ea5b20fa007d68e2b0736207c8def988bfc8c522a04cf37efeeea8b8f32c78feaa13bb WHIRLPOOL 10d071ba491eb1f74398fc6ab7ecc80bc910950f0710abb25e7a97d9d43f65ddd4d67abef1dc7d939105de374ce14aa71640ac62cd0e2d7d3005fcf400d97fc3
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.108.tar.gz 34600935 SHA256 8044e3c9355fc243b76fac6e3a76eabb2f9df63b1d2c5711cfa3ce618677b793 SHA512 0d0465f52f997dc25a7fdb6588273368e7397bcbfe5d76895a81124d68cfcff7afa52ef29808a9795fe5ea3d563801b2fce1e26f36c1481af507743dd96f9d81 WHIRLPOOL 34be90833c016663e12b561753515841217b08f63a82ce89855ca1ea8a67c893320dc4f47f7368c3ccea69c846ec28d9411997f9bccb1adb64273a45761aab14
+DIST NVIDIA-FreeBSD-x86_64-304.116.tar.gz 34611550 SHA256 bdb6f040aa262336afffbf1e228afc60ec82fae65c10d3a20ec31e0d95d95f3a SHA512 2948ba806aafef3d05780c4b7e113f7722f037386205e23d7de20784cfa099b3067dfbdc0205023e2ad3184198971104f71f544bce7c2c5d0595f4162dde2a0e WHIRLPOOL a1b6798b5ecfaa3692db6ce57a80fcdb9ab083edafb928fb6fed5202fcabd9585fcaec9d57c3725124b1cf4eb407f14db094e9b21fe9966c0a13e57252f24464
 DIST NVIDIA-FreeBSD-x86_64-310.51.tar.gz 33574579 SHA256 9b3309488dae7097171828364b4aa4e9714afc4c5dabc0f2e95ad2fa42534d04 SHA512 0f26df1dccf5c8fbe169479ad09f6200c29ad4f1bdc3d314ac67b88186692924c193b6c34a8ce28d1ce28394909fe39e1e047c3616091fbb768cb7ca60be5669 WHIRLPOOL d08e206c376c01d0c28cb1100fc1106d44cc007985a1030fef666f440e5d6bdaf7d352cb7a8b72b9195c3acc8fe4a7adce25f876f24ceb12adfc27994413e2ea
 DIST NVIDIA-FreeBSD-x86_64-313.30.tar.gz 33557658 SHA256 192ad1bb8a0cd649e12bcccf97c5f4d2002d6695126fea81586991d9e95248d3 SHA512 79b3b47bdcbc99f724f8c424733c11f1b2653103bbe0ba9849587628611d9da08ea434c786cc7d3d891bde3dfe4068298a7377ce5b1a3484fb64ef4d28c896da WHIRLPOOL 7307d6adb04b47b8403134e7394bf9af4f90839d1fb62aa3b7b7c6d8e367392829fb249dc8d444e66158fa5b5b15cf5b6c16e1f5659a22a15c17f55eda026660
 DIST NVIDIA-FreeBSD-x86_64-319.49.tar.gz 34444632 SHA256 36b09e0c01907a7f50fe4a963ef24b2f45a6ba95a112a6f6596a1193c3741c3c SHA512 e5020aee6a38245db2c636fd5b403c3004beb40ddd88f2c139352fe5372223feb9ecd367a48e03748be2d4f200f3c772b820ab946a08bbdaace61d941c6964c8 WHIRLPOOL 585e9562ea2c6fcff110a88b6b42feda6a4c266c59e2a99adf64a0a493cb363f56be71f55e43710942297d1d39ef675599b22997a62be66be7119ecdfaa3320e
@@ -16,6 +18,7 @@ DIST NVIDIA-FreeBSD-x86_64-325.15.tar.gz 34590166 SHA256 92429119ca8e50baa06c668
 DIST NVIDIA-FreeBSD-x86_64-331.20.tar.gz 46616176 SHA256 6a0396e828427fb928f18faa72288208702c3067c25c29ed3815a68a06e244c5 SHA512 29a3dfc4e4cd88c64c5ff9cd268494344ca0f56f7af79a57f1cdae8565f1199b7c577c795e986d3a8c223b640d559c8201b4c9dcab105d2ffe99035400ac2260 WHIRLPOOL 126e4320e8fb3500b09a28889af5155a75122c59f502da08f01f037adadb1cc3f08200831eb4b1da896c0a09f645ad8c40ae3ceafb93fb84f13d2fbb0bc79e6b
 DIST NVIDIA-Linux-x86-173.14.38-pkg0.run 14762614 SHA256 386ca230632f617de0ae975c037e3570469d3313a8ef488620d4af40c50e3d41 SHA512 1467a5d79bbc6a655dd3475e6a1e9281a525ae11c11207a9ffa797187ba3d040762e40380632ade02bc0125686e1dbc0cd9f5ac7fcaf4e95f5bacd0c80f7c123 WHIRLPOOL 815258bb2f0715c0330b273c224f6b42a84a59b9eb336a079e39914a4196bfceb30a0ddd3a02fea76e96ed3d74623c4204e44570d29f6f5592f4eb90f614ea90
 DIST NVIDIA-Linux-x86-304.108.run 39700058 SHA256 c965d36f896ed154f0801a3e1936fcc195f12e76cf300fc6d890c3195082c838 SHA512 a8478f098962fdd4a6db80d844930e39e020f7842407d6c5770e2aecdd8aea7fcd83c5fc527ec3b0c3688ee834d002657b40fff9deb6b4d6a67bc8c29053f714 WHIRLPOOL 8e2e4f7bdcdfaa602cffac1ec5413e137763dd0868c03d0b49322c80f6f0b82248ec8b5af2815bd4a5b504b776a5b36b69e2021ecc92d173206ee326d6450f02
+DIST NVIDIA-Linux-x86-304.116.run 39785577 SHA256 9c3a57a93b70e807a0fe54cbce146dc738defccbbebf3f5aaa927ba69305b049 SHA512 0c1bb040a054f04f29d5ce1da655dfd99f00342eeec1effece1023d77ed669983bdf7d6306a850476ed79a43c2709e80d28afa32ea2a55ec4fa8db87eea26556 WHIRLPOOL 13d1f58e29d3376b9cff3165794651ed51508830fe9059a8eca6a149cb2220fd3151d00f173d94610650f33386ddd0e0846c65fed6746e174c3954cd25b0ac9a
 DIST NVIDIA-Linux-x86-310.51.run 38891291 SHA256 f2162d903bf0873b9d4e1ad6dc464a10ee9f28b508a10525879c51ed5f47c6ca SHA512 41e14da121140be7c068703e9adbb4208cd3d9b786167523b1fc04420b7f830d89b1bcaa4a1cfa991bd59f48e1d74bb50f16493256e5fab355047985d180d26a WHIRLPOOL e548ac02b98e13aa72d9291ab668f60ba0491f9b8b91e7dda129f1e2968e105945fa41da388af189e3ceec2d699c2bc591e3dfac4759c62726a139087389f956
 DIST NVIDIA-Linux-x86-313.30.run 38845860 SHA256 0a0f10979b1bca8e4a244e204b58aeb9a580924a9dd7b11b21d15abfe1ad49ad SHA512 c3b07e7186fcf5a1f3e73f4e9510dddff2a42c0202bc471a946e38e636af27b2d17206b7105a7a80179fc17ebceab6c2802ff6ddaabae9e16a930dfa1252a2db WHIRLPOOL 2d4402883a480ae3050af18f3fe1aec4110132aa4eda0ce9675f79471a526e8b90b9ebe6a0a5c76321474be6ace963520b903cf809835472649b095be757ec52
 DIST NVIDIA-Linux-x86-319.49.run 27430192 SHA256 42b075a799acb56d0a4cfcb7210fc37b4b2c557070ef915d2f2a81c07fd2fad9 SHA512 4e8f634beddfc404dd266e11bfeb46f2991c59df4c954a9b9c58a7f319ce21a2bf65d677daf7db8fbdb86f63504e8b1430718fcbdb8754fb2ae6d03d598755e9 WHIRLPOOL 917223327993c3e0fe70d5d9df816de221ac3bda93e7fa996b20dbe7d3c0ed2827c22af31ff1335c45b46670f321fd94765011f9f4371b5cc6d78fd11fef1a0d
@@ -25,6 +28,7 @@ DIST NVIDIA-Linux-x86-331.20.run 37034614 SHA256 7ad6b05d31e790a938474ce832488f3
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.38-pkg2.run 20649787 SHA256 d1c383e2c17fd176adabf6b5c0ef43004aa2be37c10edd47f65ed727a63d2c30 SHA512 9a8906b8232e11f0b839011fef312104d9d0ae15c2cb1b60217e8c31a3ce17b4f1536709d398ce3abc7740a2e586bdf30d9ce8299e2c6bb4dd4ec7cea85623d4 WHIRLPOOL 27ea0450fc9538f4fd1ea65baeda5da534b78e15cf73818fb1c974edf293259a4ab1bcfba8a4eae1c770028b30403668cce51c928c431d061b3cccbb7bb476c6
 DIST NVIDIA-Linux-x86_64-304.108.run 68052588 SHA256 56a61871f0488521f50c04607c568a177cad48a577c0f4ca625665d0015e2b39 SHA512 f8dfd38c4a9b8e127fe7ca567a46edfaca3e410bdfb82a7de0d72f78144013537638f6cad760dee06f911a04f2897410280fe560a84b55225cc7e42525159f90 WHIRLPOOL 6a0b14caea8167c328141f69fe538bd798040969c1e718c93f5fca7a077b652f6ceea96962212d432baf69e2b687ce0f2a3a7463a4549b5697e7ec4fc2bc8208
+DIST NVIDIA-Linux-x86_64-304.116.run 68213742 SHA256 3f267f2cd3f4ede4f954c5f36c8427ae4a2fa19ca8c275f892488f4dc3a4109a SHA512 8c846c5fb5f3951943140823d8d8d4672cb9a298c361b705358fac8173b96c2bd0c1f7908fcebbbef2d756f269f260ef5fb8e2f1ae5968f4f8c85e8891310e9f WHIRLPOOL d48694ad2d8bcaa22490d1c01b6b1b5f74953d13010c66127b9af0035ce9fb3070954198bcdac4ecec682157bae5aff79201d6b1e55c5e4c89be5e493c58bde3
 DIST NVIDIA-Linux-x86_64-310.51.run 68401088 SHA256 4d0f9829105a8f06121f8308fa5e67834f52b84add48eaf4101b02522db15f53 SHA512 d36406d9adbb77f80386191f623c845977fbbd86c994b60920ba97fff974efd68e4c83d8d8f2bf9323903bc49391f21c82425eef8f011549aa7b4591634232aa WHIRLPOOL c4ef120eb72b0789158e8f6f3806538523a1aff015a78eb6b089aca7baf1e9a4563e4116a22a18c22548a0708ee504f10a94b3f5504e229d69b519615ff12fb5
 DIST NVIDIA-Linux-x86_64-313.30.run 68379307 SHA256 72317f2e4c459c33c764e3283deb3e1615b1852ead1f9bfad82148e120506022 SHA512 ae4439697e47eff98e06e5f77de979bdce096f95efa8bdee9c6fc939b42b5ce3b11c23d7691e974cf0f6f783eeb0fb694670636538352a0e8979f88d687f1f86 WHIRLPOOL c12a68fcc4d78f3856d87a86cef43c3632c0db1b6c5799b6482584d4d83a7cc863b9b394a501b96534175e11663c602d72f6ffa49f85461eaf4324dc61e654ff
 DIST NVIDIA-Linux-x86_64-319.49.run 48857367 SHA256 f4bfee9f48725e20e05439ee099730fb1b42892b9ecfac000180426b044be585 SHA512 2a7c8c9f5739a37dbf819115d015462e12e9b5f80f0e37c7e99d3aea799a8601d8fa089356c68b9e0cba658d8b9f796b43727bab9366f5146e52570c05a2d58c WHIRLPOOL 2f01479de0981b3da79ea45297c6a955c8d1f6c331d7fec7d15430dbda03ff306334265adc9bb103b32df260505e519dd25b118172221d254e0fbc60cf35d5fe
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild
index cb4bfd034912..802c396ce900 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild,v 1.5 2013/10/12 15:14:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild,v 1.6 2013/11/07 00:40:40 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
@@ -205,11 +205,11 @@ pkg_setup() {
 
 	export _POSIX2_VERSION="199209"
 
-	if use kernel_linux && kernel_is ge 3 12 ; then
+	if use kernel_linux && kernel_is ge 3 13 ; then
 		ewarn "Gentoo supports kernels which are supported by NVIDIA"
 		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.12"
-		ewarn "<sys-kernel/vanilla-sources-3.12"
+		ewarn "<sys-kernel/gentoo-sources-3.13"
+		ewarn "<sys-kernel/vanilla-sources-3.13"
 		ewarn ""
 		ewarn "You are free to utilize epatch_user to provide whatever"
 		ewarn "support you feel is appropriate, but will not receive"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.116.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.116.ebuild
new file mode 100644
index 000000000000..ae4761354e29
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.116.ebuild
@@ -0,0 +1,460 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.116.ebuild,v 1.1 2013/11/06 17:31:46 jer Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user versionator udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-admin/eselect-opengl-1.0.9
+	)"
+DEPEND="${COMMON}
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
+RDEPEND="${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
+	)
+	X? (
+		<x11-base/xorg-server-1.14.99
+		x11-libs/libXvMC
+		multilib? (
+			|| (
+				(
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+				)
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
+PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is ge 3 13 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.13"
+		ewarn "<sys-kernel/vanilla-sources-3.13"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if ! use kernel_FreeBSD; then
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+	    epatch "${FILESDIR}"/${PN}-pax-const.patch
+	    epatch "${FILESDIR}"/${PN}-pax-usercopy.patch
+	fi
+
+	cat <<- EOF > "${S}"/nvidia.icd
+		/usr/$(get_libdir)/libnvidia-opencl.so
+	EOF
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "$VIDEOGROUP" ]; then
+			eerror "Failed to determine the video group gid."
+			die "Failed to determine the video group gid."
+		fi
+
+		# Add the aliases
+		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
+		sed -e 's:PACKAGE:'${PF}':g' \
+			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		newins "${WORKDIR}"/nvidia nvidia.conf || die
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(udev_get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld" || die
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko" || die
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	if use kernel_linux; then
+		# NVIDIA video decode <-> CUDA
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# XvMC driver
+		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+			die "failed to install libXvMCNVIDIA.so"
+		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
+		dosym libXvMCNVIDIA.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins nvidia.icd
+		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig || die
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-debugdump || die
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-control || die
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-server || die
+		doexe ${NV_OBJ}/nvidia-smi || die
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings || die
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh || die
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+	fi
+}
+
+pkg_preinst() {
+	use kernel_linux && linux-mod_pkg_preinst
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 1726fefc021e..8235e4c3f5fe 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,3 @@
 DIST gdk-pixbuf-2.26.4.tar.xz 1181640 SHA256 a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be SHA512 a85d9fb8a206b6986abc8bc8caa079f5ddbd1c83226f80896439a06a7644d27fa1e9d80cc0a34ba82ce0877cdfaeaee8bc2548b016d25d314bcbbab44091ef76 WHIRLPOOL f452673a3d4b9e894d7e92a24ecca9c4551353d38c242ad7ddcde812ce55dd56b68d80b297957c3f3cd7a649837cd47412995b842082ae5abec81a02ec486b07
 DIST gdk-pixbuf-2.26.5.tar.xz 1181336 SHA256 77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84 SHA512 2988dd550aac92c2633c5443c712be8e3c06d852190251d6436ef2457c43ccce48ef795f7b187ef975b643a0bc4fc407f8b539fd627dc05a69d7ee4b210244ee WHIRLPOOL 2a05fb5501a72fcb4acb502c542509a845406b1905e7750097de2c555dc5222b903bb7f1d4e953fdf19e4d6dd1b7acae6f6bceadcd26687d3b628f8c4cc654da
-DIST gdk-pixbuf-2.28.1.tar.xz 1191084 SHA256 bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb SHA512 5829d5eaca69fe8e813f5a668cb807d26dd7fc61a32e4d8a4beae638cb01d8f89f90ca554520ac4a43a530d7d03bd2e96da2d616b80effca264d385b97fee502 WHIRLPOOL 86b66300f0361d73e62e57a6998ca1751aa7a85b4703696672b6374b4c261a1b8f1745b5efd268b12831726fd830ab5056ab04fdf04b291f0f9db7a0487ce70d
 DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild
deleted file mode 100644
index fe818ce4cb1c..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.1.ebuild,v 1.3 2013/09/03 21:59:11 eva Exp $
-
-EAPI="5"
-
-inherit eutils gnome.org gnome2-utils multilib libtool
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34.0:2
-	>=media-libs/libpng-1.4:0=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper:= )
-	tiff? ( >=media-libs/tiff-3.9.2:0= )
-	X? ( x11-libs/libX11 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.28.0-string_h.patch #466034
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
-	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
-	default
-	elibtoolize # for Darwin modules
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	econf \
-		$(usex debug --enable-debug=yes "") \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(use_enable introspection) \
-		$(use_with X x11) \
-		--with-libpng
-}
-
-src_install() {
-	default
-	dodoc AUTHORS NEWS* README*
-	prune_libtool_files --modules
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	gnome2_gdk_pixbuf_update
-
-	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild
index 90beacb884dc..0c906947e8f6 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild,v 1.3 2013/09/03 21:59:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2.ebuild,v 1.4 2013/11/06 21:42:20 pacho Exp $
 
 EAPI="5"
-
 inherit gnome.org gnome2-utils multilib libtool
 
 DESCRIPTION="Image loading library for GTK+"
@@ -61,7 +60,8 @@ src_configure() {
 }
 
 src_install() {
-	default
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS+=" -j1" default
 	prune_libtool_files --modules
 }
 
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild
similarity index 96%
rename from x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild
rename to x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild
index 6e37a46ddf7b..528030314ae7 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild,v 1.3 2013/10/11 07:53:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-1.2-r1.ebuild,v 1.1 2013/11/06 20:04:18 pacho Exp $
 
 EAPI=5
 inherit eutils fdo-mime
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 4829898fa2f2..fb1268ed539f 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,3 +1,4 @@
 DIST spacefm-0.8.6.tar.xz 1164224 SHA256 27f898d180c8a679568f0b40a05b470d728d38c892f4032654c4f696bab476e5 SHA512 2c449414e7d493c0a6a99d4aca736058705abad40f2619870c056140ad669b80253c5cbb63b5135460a0ec4af75c7337d7cbd8398049b806431de11935b1c4e9 WHIRLPOOL ffc6d72f8ef775494d77f4c1db4161625aaaeefba18bcb5c8b2f37fc2e51b96b386b86ccba294d136dce7d56efa9b16fbbfbd757e6d0e78cc5bcf11e6035e387
 DIST spacefm-0.8.7.tar.xz 1155968 SHA256 3e48f276df4505b69d24fbeb4b5a869cf316503e2395bef467a29a5207b23947 SHA512 339fd7b4c2becf30c5b9bef0977575c778a340fb15fa51359080162dc0f07528913e5e80d74df1bc0a90cd30f84d9c693491008f1a7281e235e6408130ffd8bf WHIRLPOOL bef800675b140822538e9e58533f2d27fad2b810a892b1621f99d3ab434937a7708a244c95ba3a4be131a10b103ed4292c5c29ed3903c955bb2d9d5c9d6fc256
 DIST spacefm-0.9.0.tar.xz 1232600 SHA256 a47861b395ee991bc56e367238f2c3070c308a2b635be1099b0a6d2eda0f1795 SHA512 ff888a06a38356a6a1671cac86b8e9f66c6ffbc4b4e9f124547b6ffcbba8895db34d3c20af9b7527688a66a1c637b6b2a4da6e655bd87d9b4cc65e16a2719ff0 WHIRLPOOL 80ab4472c5b1bd389284e638f5d9c8fa44a4aeb482637151bddcd2d0c396c664d6405c70b1e923c3c7b211649d1bf81303a709612b4236b12886c4dab93a53ed
+DIST spacefm-0.9.1.tar.xz 1251772 SHA256 9e6251800cceb9b836c0107b8416b673c4d4c5b88520bc05eca698e972a6e155 SHA512 6161a76fd74dd049d649e22261e4566047ff3599254d941fc4a36416e579978aca12be7fe39c9838b386f08e411878f01616383488294cea8224d25a0323976f WHIRLPOOL 431ba109182cc06b0969a9b78909354b46ec96350a4ec8ec983907ef98100b2cef1df23c98efb67adcb13d4cb2ca713e363f00862b6b5524b521a621f894ee0a
diff --git a/x11-misc/spacefm/spacefm-0.9.1.ebuild b/x11-misc/spacefm/spacefm-0.9.1.ebuild
new file mode 100644
index 000000000000..021e6ddb326c
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-0.9.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.9.1.ebuild,v 1.1 2013/11/06 21:38:28 hasufell Exp $
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="http://ignorantguru.github.com/spacefm/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
+	mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+startup-notification"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3=yes
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-base/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}