diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
index 606d3e776d26..66df6ef62864 100644
--- a/app-accessibility/festival/festival-2.1-r1.ebuild
+++ b/app-accessibility/festival/festival-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.9 2015/04/26 22:10:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.10 2015/05/13 11:21:03 zlogene Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs user
@@ -24,7 +24,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="~app-accessibility/speech-tools-2.1
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
index 9c1f707e86d7..12866c70b15d 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.11 2015/04/26 22:12:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.12 2015/05/13 11:16:38 zlogene Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"
 
 RDEPEND="
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index f5469a293906..d21758941082 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-1.8.4.tar.gz 758916 SHA256 d37c04b3abce9b036a6c8311fccb360c5cbc3ec895445f805243b0448d239ec1 SHA512 abba45df12144a6b32447404ffda57a08f43a20e8875c8cb052435d8447271b1c1895c5cb8cf584b10ba8bac7e24ee242e99494b7b9a21c8df40cea54b48b3e0 WHIRLPOOL c7de6a99c5bcce2aa987e5cc551bca939f78562f91e5a48484aa776fbc1bee9ca9f61e446ab5f179aef2da81fa8e2685f116f3f10505240956f40530c90964f5
 DIST ansible-1.9.0.1.tar.gz 916591 SHA256 b2193fd9a4061ab624fa67311796419a759de06b4f321d37169b22ba3831331c SHA512 4548847f7644ced6ec099ac80871da4c113145b541d0a1cf32f3fc00898c86cd6e494ee08fca81cbdf0f96ff9f714c6b5d7eff29e37a9f76f460cb5bcbc5cf30 WHIRLPOOL ae06e315191c61847b3f3779299c6591c8456525aaf70aa94e9c655bf18e441197104bd48d14d8aafc5ced747a5429fdcc094c059eaba3d18edeb8339c0b29b7
 DIST ansible-1.9.1.tar.gz 917471 SHA256 a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5 SHA512 5f0d9842f1b797f287db6ef1941868b783d80209210ba2d3469aaa3f028436df5e95f305818de5b7b8bce8b66d6758fcac01e7d36febe1a24bcba556f79ef385 WHIRLPOOL 423f35cd0218a12df90a7e4efbc0a08bfeff89b826f336c05d44fc9a92e8f7fc7e6ce5a178bfe159a843fa5f946dfec4ce7b0de400d836d3cb11d04114ffec4a
diff --git a/app-admin/ansible/ansible-1.8.4.ebuild b/app-admin/ansible/ansible-1.8.4.ebuild
deleted file mode 100644
index 636723562f56..000000000000
--- a/app-admin/ansible/ansible-1.8.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.8.4.ebuild,v 1.3 2015/04/19 09:45:51 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-
-	insinto /usr/share/${PN}
-	doins -r examples
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
diff --git a/app-admin/ansible/ansible-1.9.0.1.ebuild b/app-admin/ansible/ansible-1.9.0.1.ebuild
index f7f440a0f938..a40681fdde24 100644
--- a/app-admin/ansible/ansible-1.9.0.1.ebuild
+++ b/app-admin/ansible/ansible-1.9.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.9.0.1.ebuild,v 1.2 2015/05/08 12:13:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.9.0.1.ebuild,v 1.3 2015/05/13 09:36:13 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
index 9998c7689fc9..2884c89d4bf3 100644
--- a/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild,v 1.5 2015/05/12 09:12:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild,v 1.6 2015/05/13 09:27:36 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
diff --git a/app-admin/logrotate/logrotate-3.8.9.ebuild b/app-admin/logrotate/logrotate-3.8.9.ebuild
index 6e2ce0cf0b22..8fd663ac78c9 100644
--- a/app-admin/logrotate/logrotate-3.8.9.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9.ebuild,v 1.10 2015/05/01 19:12:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9.ebuild,v 1.11 2015/05/13 06:36:13 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl selinux"
 
 CDEPEND="
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 504366ea8ccd..2251e96b1e42 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1 +1 @@
-DIST mongo-tools-3.0.2.tar.gz 2150689 SHA256 a476318b0fbdd432985911a8e32d73635bff2c4466a9cbcb76f52f3fe70e04eb SHA512 9c10ea0c7c0c6d30a1fdc0f5fbf8e4816c178c16a71a8b6643265cd0e7022b7ea00c9469cb26fb7a5de5531cc62f67e5b38943f6c34eb8f1a6ddb41b84efad72 WHIRLPOOL 07c928d8617aaec9a1b1851481d0c81c540171b69f60757186e2dcfacc1ea57d9986ff868d28160eefc7dcb880d28f380e80599eb4c44b3adfdee0b84ec5c594
+DIST mongo-tools-3.0.3.tar.gz 2151771 SHA256 17deff3d1adf2b456b3d4dc6096e6d0ff4b0d4dd799adcdb3c64f12acfa3204f SHA512 16a702cb48f2dde750dd493a4011616cce037606686af900403dcfc353fa31933704dbf4433c328eb3aa1fec60c6de251554a76a84e4f406544337a0fd3570f3 WHIRLPOOL e86749536afad3f2201d36509207bfd256ed7f534f12a7b92d3318d0db54f7293aeb2a7915f9f5358d6b74f03838b29f5bf5580c94ca1cfd68b482d35bc2e7bd
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.3.ebuild
similarity index 94%
rename from app-admin/mongo-tools/mongo-tools-3.0.2.ebuild
rename to app-admin/mongo-tools/mongo-tools-3.0.3.ebuild
index 61d008e9d258..44cfd76b57ba 100644
--- a/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild,v 1.2 2015/04/10 07:40:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mongo-tools/mongo-tools-3.0.3.ebuild,v 1.1 2015/05/13 08:24:58 ultrabug Exp $
 
 EAPI=5
 
diff --git a/app-admin/monit/monit-5.12.2.ebuild b/app-admin/monit/monit-5.12.2.ebuild
index 38e1dd420639..39bf1fefac22 100644
--- a/app-admin/monit/monit-5.12.2.ebuild
+++ b/app-admin/monit/monit-5.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.12.2.ebuild,v 1.2 2015/05/12 07:55:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/monit-5.12.2.ebuild,v 1.3 2015/05/13 09:35:21 ago Exp $
 
 EAPI="5"
 inherit pam systemd
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="pam ssl"
 
 RDEPEND="ssl? ( dev-libs/openssl )"
diff --git a/app-admin/testdisk/testdisk-6.14.ebuild b/app-admin/testdisk/testdisk-6.14.ebuild
index 6c243fb9d9a1..45b86e28570c 100644
--- a/app-admin/testdisk/testdisk-6.14.ebuild
+++ b/app-admin/testdisk/testdisk-6.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v 1.4 2015/04/28 07:16:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v 1.5 2015/05/13 09:34:35 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="jpeg ntfs reiserfs static"
 
 # WARNING: reiserfs support does NOT work with reiserfsprogs
diff --git a/app-cdr/k3b/k3b-2.0.3-r1.ebuild b/app-cdr/k3b/k3b-2.0.3-r1.ebuild
index 03a00deadb64..70b7bc477e80 100644
--- a/app-cdr/k3b/k3b-2.0.3-r1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.5 2015/04/28 13:51:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.7 2015/05/13 09:31:09 ago Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 CDEPEND="
diff --git a/app-crypt/xca/xca-1.1.0.ebuild b/app-crypt/xca/xca-1.1.0.ebuild
index 15b5b57a6d5a..880cdb313d80 100644
--- a/app-crypt/xca/xca-1.1.0.ebuild
+++ b/app-crypt/xca/xca-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-1.1.0.ebuild,v 1.3 2015/04/28 07:16:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/xca/xca-1.1.0.ebuild,v 1.4 2015/05/13 09:27:18 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bindist"
 
 RDEPEND=">=dev-libs/openssl-0.9.8[bindist=]
diff --git a/app-editors/mg/mg-20150323.ebuild b/app-editors/mg/mg-20150323.ebuild
index a86fb3883595..b3d7ff58710c 100644
--- a/app-editors/mg/mg-20150323.ebuild
+++ b/app-editors/mg/mg-20150323.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20150323.ebuild,v 1.4 2015/04/26 16:57:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20150323.ebuild,v 1.5 2015/05/13 08:44:28 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses
diff --git a/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
index 394e0a98ee9b..e7606b563846 100644
--- a/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild,v 1.4 2015/05/08 12:12:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild,v 1.5 2015/05/13 09:40:21 ago Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ else
 	SRC_URI+=" ${BACKPORTS:+
 		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
 		http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SLOT="0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/app-misc/dvtm/dvtm-0.11.ebuild b/app-misc/dvtm/dvtm-0.11.ebuild
index 9714d987c072..f86f34fa36a3 100644
--- a/app-misc/dvtm/dvtm-0.11.ebuild
+++ b/app-misc/dvtm/dvtm-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.11.ebuild,v 1.2 2015/04/26 16:42:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dvtm/dvtm-0.11.ebuild,v 1.3 2015/05/13 07:55:39 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-office/odeskteam/odeskteam-3.12.9.ebuild b/app-office/odeskteam/odeskteam-3.12.9.ebuild
index d83c394c8773..9b8a4820cef6 100644
--- a/app-office/odeskteam/odeskteam-3.12.9.ebuild
+++ b/app-office/odeskteam/odeskteam-3.12.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.3 2014/12/31 12:48:11 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/odeskteam/odeskteam-3.12.9.ebuild,v 1.5 2015/05/13 09:38:46 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}.x86_64.rpm )
 
 LICENSE="ODESK"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S=${WORKDIR}
 
diff --git a/app-office/skrooge/skrooge-1.10.0.ebuild b/app-office/skrooge/skrooge-1.10.0.ebuild
index 11f32ff04f67..9ad1cd3fddb3 100644
--- a/app-office/skrooge/skrooge-1.10.0.ebuild
+++ b/app-office/skrooge/skrooge-1.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.10.0.ebuild,v 1.1 2015/01/29 10:01:42 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.10.0.ebuild,v 1.3 2015/05/13 09:32:26 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 96a8e7dd0c3b..a4580292eac0 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,3 +1 @@
-DIST OOoFBTools-2.30.zip 4799069 SHA256 5d8866645c6679dcd4dfbaa57cd2d6a94aecb2694554407217d5f7275b5c4083 SHA512 3947a22504cb2a4fe33b91dc0c5a6d94022acb296fece6962f858ea9545466a746be583dd6c45e442a6708cc8fe8d02fe8cdaded2435acceb9422a963047d713 WHIRLPOOL 391666630d33600aa9b11c08592dbc0ec24e683d8790bb87e45d200e7890ec80acc080916b7c24dbbeff965e8485701895b241856e11b916838ac69e44c5cd8c
-DIST OOoFBTools-2.31.zip 4793991 SHA256 e123bc3297a63997b8afdca8804f199043a1c976449ca4e6cbf588ff0f20a15a SHA512 a0d735b597d6f4dd67473e9f6f210243c1404b00222f2a31b4494ac71641a0df53e750d7eac2879bf21e949a79034beac2a1f4eb0d74c214c9a4ca3f8c6cf43b WHIRLPOOL 3176eef69d1d48803f47225487ebf8217a2f32f5557f51deacf1be9c7118ff273a9391b491b1d1cd5e716b14593f59543a60ad89a6425f83fe2894649e63af5f
 DIST OOoFBTools-2.34.zip 4810850 SHA256 9fea8bb702c484547378f2771bbb16065b09f9b36954b87970de6fa2b54a58b5 SHA512 0d470837a1bdea713b2b711bc73774748513bdb29ecf4bedaadc770b544980ecfcf1f820e41194a77b11c2abc1432d491f111a32b812ecce769a76ac71154fc9 WHIRLPOOL a4fc2e5ebe85c83e8f037914d07145eae586dcff27fab550768f9cdf30c95d28ea8ee670ab897caf3ea294cd9e70590eb0705689484a799eadc0b16a26194799
diff --git a/app-officeext/ooofbtools/ooofbtools-2.30.ebuild b/app-officeext/ooofbtools/ooofbtools-2.30.ebuild
deleted file mode 100644
index 81453839bad1..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.30.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooofbtools/ooofbtools-2.30.ebuild,v 1.3 2014/12/28 12:12:12 ago Exp $
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libxml2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
-	rm -r win32 || die
-	popd 2>/dev/null
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.31.ebuild b/app-officeext/ooofbtools/ooofbtools-2.31.ebuild
deleted file mode 100644
index b2725ed32e09..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.31.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooofbtools/ooofbtools-2.31.ebuild,v 1.3 2015/02/25 15:54:19 ago Exp $
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
-	"${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libxml2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
-	rm -r win32 || die
-	popd 2>/dev/null
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.34.ebuild b/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
index 943cda857089..c162db16361f 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooofbtools/ooofbtools-2.34.ebuild,v 1.2 2015/05/08 12:12:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooofbtools/ooofbtools-2.34.ebuild,v 1.3 2015/05/13 09:25:32 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND="dev-libs/libxml2"
diff --git a/app-portage/portpeek/portpeek-2.1.18.ebuild b/app-portage/portpeek/portpeek-2.1.18.ebuild
index ab8d53a7a073..4f4022605b03 100644
--- a/app-portage/portpeek/portpeek-2.1.18.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.18.ebuild,v 1.3 2015/04/08 07:30:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.18.ebuild,v 1.4 2015/05/13 11:26:30 zlogene Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 51e3f07707b8..b01ee04fcbba 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -3,4 +3,4 @@ DIST mongodb-src-r2.4.13.tar.gz 14183056 SHA256 9ad8a3b58457c35b6dd020ca2364ee60
 DIST mongodb-src-r2.4.14.tar.gz 15120808 SHA256 f5ed949cf7c9669267e6f426f3dc30bf6c0e2d68ba7df9e29f16799e8212e7ce SHA512 6811f27a57a2df07f59215f544948708cd5846237c24df6eb14bf09384db4136d964587d82008ff2b0a4dea94d6869fc1dcf2ccd07e5f285da5012a0a091a74f WHIRLPOOL c89b2f4f1a77523f895b3fa21ec82813a4859391c82e3934952b25ab8602c30ac13b9e6b2a00082bbe7bace32edacdb3270e46ac0f3a8c0ab10ea48b5911e019
 DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
 DIST mongodb-src-r2.6.9.tar.gz 15491620 SHA256 aa3d92defa6938f115700d7d158f34b979cdb1f5870dcacd4feeb1ee4aefec6a SHA512 e03f58b9b7185dbb82e3c93f724b628050d506e564ba09a76684bd6bf3e7cca876c22b04979d93c4cf592213ad70830ee63e22c60e63f8e62fdb3f77524ea3c3 WHIRLPOOL ce6eabcb24388020506b3e2f31c4cd85039cbb2d5cf3881f0284d3bb93cbcefebae7c8da19b2551daaa6c63f13b392b5043ef47b2af2f64063c7c868e758e8e0
-DIST mongodb-src-r3.0.2.tar.gz 26594777 SHA256 010522203cdb9bbff52fbd9fe299b67686bb1256e2e55eb78abf35444f668399 SHA512 ec14529f39459835644dd681a98133c276bb96c676ce3ad91c20dff1ce96aeda3e14f08c05019a72a6f8eaadfed7e176944b42187a273b3e82001946126931d7 WHIRLPOOL 76cd0325cfc949d2bfe12105b5a07f37b37700ba309167d04428b305c832073d6b3c178cce757c78ace29e54c6ac146ad91ef874ec9880a75939d235a8470381
+DIST mongodb-src-r3.0.3.tar.gz 26621249 SHA256 57765a81c18a0bb674fbe63bc507111d8795596eb9c9492028903985b4720807 SHA512 23655d98ba7c0ba5d76c29964babb69a43714f5ca41843b0e8ae7bc5fa4dbba7b67022af4909a34f363406d4db58db39f9a03b4348a46eceb13067210bf8f23f WHIRLPOOL d9e28095463b2ba37a882972ee58435319fd00b3a61bd44c2f764076fc0c9d275c00ad627bc7f2b8db6db198e100820e403d74ef07cb5c6dbf4eb0d12fea5553
diff --git a/dev-db/mongodb/mongodb-3.0.2.ebuild b/dev-db/mongodb/mongodb-3.0.3.ebuild
similarity index 97%
rename from dev-db/mongodb/mongodb-3.0.2.ebuild
rename to dev-db/mongodb/mongodb-3.0.3.ebuild
index 97bfb527bab2..b252b84c373e 100644
--- a/dev-db/mongodb/mongodb-3.0.2.ebuild
+++ b/dev-db/mongodb/mongodb-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-3.0.2.ebuild,v 1.1 2015/04/09 20:05:54 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-3.0.3.ebuild,v 1.1 2015/05/13 08:25:21 ultrabug Exp $
 
 EAPI=5
 SCONS_MIN_VERSION="2.3.0"
diff --git a/dev-db/sqlite/sqlite-3.8.10.1.ebuild b/dev-db/sqlite/sqlite-3.8.10.1.ebuild
index 12d30363c08b..fb7fc28d3549 100644
--- a/dev-db/sqlite/sqlite-3.8.10.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.1.ebuild,v 1.2 2015/05/13 05:52:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.1.ebuild,v 1.3 2015/05/13 07:55:34 ago Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
index 6f21905ec7a3..05adb88a6a0a 100644
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
+++ b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild,v 1.6 2012/08/21 10:11:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild,v 1.7 2015/05/13 10:37:04 vapier Exp $
 
 EAPI=4
 inherit eutils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-embedded/libftdi
+RDEPEND="<dev-embedded/libftdi-1
 	dev-libs/confuse"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
new file mode 100644
index 000000000000..3a0f275362da
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild,v 1.1 2015/05/13 10:42:51 vapier Exp $
+
+EAPI=4
+
+DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
+HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-embedded/libftdi[tools]"
+
+pkg_setup() {
+	elog "This tool has moved to libftdi itself (via USE=tools)."
+	elog "Please install that package and remove this one."
+}
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index fa319dcfe337..8bb3d1d4c822 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -3,3 +3,4 @@ DIST libftdi-0.18.tar.gz 398380 SHA256 5b6f3c3ee51c6aa24d3b87135e01762cf68821d1c
 DIST libftdi-0.19.tar.gz 406671 SHA256 567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972 WHIRLPOOL b3ee2812697cb8e0e549d580b07b2d67f2bc7bbb5da823e80172748d2d907e67c36314c4524beb2278e131a57c1ae4e25efaaa7b243ab80b30a3f88fa9f6fd7a
 DIST libftdi-0.20.tar.gz 423570 SHA256 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 WHIRLPOOL b1eab592bd6a21a123c7e951d5e4cdafc740c20773b8c5c7c86eef2a05bc8a190a2758a04187d3436de464a49dc329d4e4c9e54792287cc5c39a0ec7d08425d2
 DIST libftdi1-1.0.tar.bz2 97072 SHA256 7290fd38208d8c00d25ed13ce172aaa0403b37148080e4a33a99837022d2b321 SHA512 e733db0bf826415971c64723fe1e56cb1201fa1b9e3a3f04a2a47e1d16c543ae29c634a514f5ff5ca422c2e3b3e1715988c84df1dc66114700209dfb1e6d96ae WHIRLPOOL 82b384b396b12681d88531082e6a5d9d765934877192001106b7bb2ee91da91d0941eb7514b7b091fca403d47b4458a5ae06c5249b0cb0114a0fbe7b7056b7ed
+DIST libftdi1-1.2.tar.bz2 100672 SHA256 a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b558488d6 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05 WHIRLPOOL 7e6646a23b8e8f1c0fec6b1ad3231797653e1788abfb7340cd391c792d2f48e4cada0ca832e325947b49d964919d5b81cddd8b43f3962d185605afbabd743fbf
diff --git a/dev-embedded/libftdi/libftdi-1.2.ebuild b/dev-embedded/libftdi/libftdi-1.2.ebuild
new file mode 100644
index 000000000000..a85f8d7b5028
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-1.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-1.2.ebuild,v 1.1 2015/05/13 10:46:17 vapier Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+MY_P="${PN}1-${PV}"
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
+	inherit git-2
+else
+	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="cxx doc examples python static-libs tools"
+
+RDEPEND="virtual/libusb:1
+	cxx? ( dev-libs/boost )
+	python? ( dev-lang/python )
+	tools? (
+		!<dev-embedded/ftdi_eeprom-1.0
+		dev-libs/confuse
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use cxx FTDIPP)
+		$(cmake-utils_use doc DOCUMENTATION)
+		$(cmake-utils_use examples EXAMPLES)
+		$(cmake-utils_use python PYTHON_BINDINGS)
+		$(cmake-utils_use static-libs STATICLIBS)
+		$(cmake-utils_use tools FTDI_EEPROM)
+		-DCMAKE_SKIP_BUILD_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use doc ; then
+		# Clean up crap man pages. #356369
+		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
+
+		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
+		dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 6ce7dd5bd5f6..c4bad917a3be 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.9 2015/04/18 03:06:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-9999.ebuild,v 1.10 2015/05/13 10:46:17 vapier Exp $
 
 EAPI="4"
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
@@ -25,16 +25,15 @@ IUSE="cxx doc examples python static-libs tools"
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
 	python? ( dev-lang/python )
-	tools? ( dev-libs/confuse )"
+	tools? (
+		!<dev-embedded/ftdi_eeprom-1.0
+		dev-libs/confuse
+	)"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-staticlibs.patch
-}
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use cxx FTDIPP)
@@ -53,6 +52,9 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO
 
 	if use doc ; then
+		# Clean up crap man pages. #356369
+		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
+
 		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
 		dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
 	fi
diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
index 58d896adff04..9a5f7cb58d60 100644
--- a/dev-games/ogre/ogre-1.9.0-r1.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v 1.4 2015/05/12 08:41:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v 1.5 2015/05/13 09:28:29 ago Exp $
 
 EAPI=5
 CMAKE_REMOVE_MODULES="yes"
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.b
 
 LICENSE="MIT public-domain"
 SLOT="0/1.9.0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 # gles1 currently broken wrt bug #418201
 # gles1 does not even build wrt bug #506058
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
index 213b753d3e3c..9743a79d9d0a 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild,v 1.2 2015/04/26 16:00:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild,v 1.3 2015/05/13 09:23:37 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index 4dc2394e7ad3..ee067f55b634 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild,v 1.5 2015/05/13 05:37:53 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild,v 1.7 2015/05/13 11:30:05 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnl/libnl-3.2.25.ebuild b/dev-libs/libnl/libnl-3.2.25.ebuild
index 1b68818923af..cf46024a00cd 100644
--- a/dev-libs/libnl/libnl-3.2.25.ebuild
+++ b/dev-libs/libnl/libnl-3.2.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.25.ebuild,v 1.12 2015/04/26 19:57:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.25.ebuild,v 1.13 2015/05/13 06:35:32 jmorgan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
@@ -16,7 +16,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs python utils"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-libs/libtasn1/libtasn1-4.5.ebuild b/dev-libs/libtasn1/libtasn1-4.5.ebuild
index 46156553afb4..fb1a1192ff8e 100644
--- a/dev-libs/libtasn1/libtasn1-4.5.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-4.5.ebuild,v 1.5 2015/05/13 05:43:36 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-4.5.ebuild,v 1.7 2015/05/13 06:48:38 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/openssl/openssl-0.9.8z_p6.ebuild b/dev-libs/openssl/openssl-0.9.8z_p6.ebuild
index 97509fc82a93..17a836c914c8 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p6.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p6.ebuild,v 1.3 2015/05/11 19:25:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p6.ebuild,v 1.4 2015/05/13 09:25:11 ago Exp $
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.0.1m.ebuild b/dev-libs/openssl/openssl-1.0.1m.ebuild
index 7f533b9d1e60..75cb08220190 100644
--- a/dev-libs/openssl/openssl-1.0.1m.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1m.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1m.ebuild,v 1.6 2015/05/11 19:25:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1m.ebuild,v 1.7 2015/05/13 09:25:11 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
index abee6457d297..72b7a9b1579c 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild,v 1.8 2015/02/26 19:00:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild,v 1.9 2015/05/13 07:00:57 jmorgan Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module multilib
 DESCRIPTION="Look up country by IP Address"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/geoip"
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.210.0-r1.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.210.0-r1.ebuild
index 6730ef948da2..41757ecb7a45 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.210.0-r1.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.210.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Patricia/Net-Patricia-1.210.0-r1.ebuild,v 1.13 2015/05/13 05:41:34 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Patricia/Net-Patricia-1.210.0-r1.ebuild,v 1.15 2015/05/13 07:01:11 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild
index 736d2f8061b3..3c25eb4adf1c 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild,v 1.1 2014/09/29 23:51:17 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-geoip/pecl-geoip-1.1.0.ebuild,v 1.3 2015/05/13 09:35:38 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ USE_PHP="php5-6 php5-5 php5-4"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="PHP extension to map IP address to geographic places"
 LICENSE="PHP-3"
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.14.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.14.ebuild
index 03e23cf6fb2c..f8ca30fafd58 100644
--- a/dev-python/libvirt-python/libvirt-python-1.2.14.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-1.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/libvirt-python/libvirt-python-1.2.14.ebuild,v 1.2 2015/05/08 12:12:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libvirt-python/libvirt-python-1.2.14.ebuild,v 1.3 2015/05/13 09:40:25 ago Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 34df753705f0..9799c2f0fd23 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,3 +2,4 @@ DIST lxml-3.3.5.tar.gz 3467344 SHA256 6ad6949dc7eea744a30fba77a968dd5910f545220e
 DIST lxml-3.4.1.tar.gz 3524523 SHA256 069594837d0376a1bacf5cc42aa9a1be2e1c1396dc62f7d07f7358afecd34adf SHA512 ab669d1f9833e43b43ece4ef2481eebe22e9084ab07139f5c5c1fa6ea478177069d6ce96ece7eddef86982da418ec55a3785c4b78958f49f6ed415dc63af45ed WHIRLPOOL 5390f23aec3b7c07b9541f85ee5c674f267b99a9ef035cc5024d5f6defe6ee8ded500703b97b3f742f7630d25dbc538534654c8a3cddafb1ff37f5c5494bffb5
 DIST lxml-3.4.2.tar.gz 3526862 SHA256 c7d5990298af6ffb00312973a25f0cc917a6368126dd40eaab41d78d3e1ea25d SHA512 de57da48813cb6920937b23a82cf8fe389e0f215e3e5c4a873fae7a223d8df7fe693d835163cccedd23b538857ed8e5eb3f0d8e4e2c5ed33065c6fbb74604f10 WHIRLPOOL 0601d6474dad0b2dc6c47a906acc546e91e72b3e15bbf3d56d7f6c1ad2d46ae9e4007d775911ce2fef71ff06dba01d70d671379a079c92191aad13600a4e6a31
 DIST lxml-3.4.3.tar.gz 3541740 SHA256 6ce4a11ab485a67a899aa3e080c97b22a9df40c7077bd9146a821d3872cf2037 SHA512 9ce34fef03e19b13fd78f13562dba570018c6588c187452fa1a0e3db441c5583333e85386a56c243db6f0f03875b4be514f4e6084a386aa83a6e436fec992e4f WHIRLPOOL cfebfaa0a1cdb4cf9e451b0d3c7246fbf104bccd0511d4f4060862fdd88bd0699ce2b4e604afc5ae65cc037182565d8590cfe451c361ddecc4177fe09db0ffd7
+DIST lxml-3.4.4.tar.gz 3537508 SHA256 b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892724099 SHA512 94453ff0562fc18a4b43555271e2469556255b69daf5f801d1a0f1ff29fd73f4b46d4faba9bfe86b42cfdac31005a0d3cfcbf230e0c7593dd5fc6461afcad906 WHIRLPOOL 6debafb391c94bd57510498c8261a511759f52feb3065c8bdf3103b177b1ddcbad54968f1eceac07b97e42087a1c59a060a3719f9ea9d25a662da34bf314b89e
diff --git a/dev-python/lxml/lxml-3.3.5.ebuild b/dev-python/lxml/lxml-3.3.5.ebuild
index 2a538537d479..4eac9ac7955e 100644
--- a/dev-python/lxml/lxml-3.3.5.ebuild
+++ b/dev-python/lxml/lxml-3.3.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.5.ebuild,v 1.15 2015/04/08 08:05:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.5.ebuild,v 1.16 2015/05/13 09:00:54 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_{3,4}} )
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1 eutils flag-o-matic
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
diff --git a/dev-python/lxml/lxml-3.4.4.ebuild b/dev-python/lxml/lxml-3.4.4.ebuild
new file mode 100644
index 000000000000..1c54fbf9455d
--- /dev/null
+++ b/dev-python/lxml/lxml-3.4.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.4.4.ebuild,v 1.1 2015/05/13 08:59:39 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~arm64"
+IUSE="beautifulsoup3 doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.7.2
+	>=dev-libs/libxslt-1.1.23
+	beautifulsoup3? (
+		$(python_gen_cond_dep 'dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/beautifulsoup:python-3[${PYTHON_USEDEP}]' 'python3*')
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+# lxml tarball contains files pregenerated by Cython.
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i '/sys\.path/d' test.py || die
+
+	# seems to be broken
+	rm src/lxml/tests/test_elementpath.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	local test
+	for test in test.py selftest.py selftest2.py; do
+		einfo "Running ${test}"
+		"${PYTHON}" ${test} -vv -p || die "Test ${test} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	use examples && local EXAMPLES=( samples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 7edfd1b4de2a..eaf001aa9b51 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,4 +1,2 @@
-DIST openpyxl-1.7.0.tar.bz2 592566 SHA256 2c2c0dff10524223c1eaede8edbe18e6ed145123f6c4900e126c08f70a81b507 SHA512 bdcdd6a301cf515862ef051edd0d2a5ba9c8983f53774e3e427627250a5d0a433c6c40d632f42f8ba2e6f120d42b16ba9cb5d5df381b57775e5619de59b14629 WHIRLPOOL ebd0ec23e99ea98b127ddd74cd380f4c55e787376acca0545cd4ba38081388389cfcaeb77aed189483b7e71f682eefc5e9758ad4c0d18aab59f34927630f5d5c
-DIST openpyxl-1.9.0.tar.bz2 5227868 SHA256 688aeebf42e103018a274c34c6f186e496395e0c7a06180df684626b307134e4 SHA512 a739f02de9e1a4c4a134e025ac1eee47ed39e7d0fbf79dc4fc73187bfddf2b1ffe2cc1414b69bfd087620fcecddbecc199b72c21c39df72671079c73031b6cfc WHIRLPOOL 022289cfe340a41b87748579e6fd99fcaedb4aa6969cb896da78c3614abca44dbd87d7d71c0ff8cce40f4fd84b32391ef355a50a3baf0bc5b515d48ca3e00766
-DIST openpyxl-2.0.2.tar.bz2 5243087 SHA256 85dda6b3333af0ee5abfd26d6613a20c12175edb9d6fb29bab2261a74e43d66d SHA512 4137becf4986a3e944d0f0905dafae89faafc09375ec48a46abdf924af4f604bc1e08f67a50bc16de0c2920309cc1b2438e5c485f15a926b24fd5bbf77a4eff6 WHIRLPOOL 5c5902a30e0ca438d383344cddfb6099ffc464a2beb09ff81beb188867985a51d43ada0bf888921d9717238a6420c2ac7ad9e100144bd61e5d1d45bf15ce2f4d
 DIST openpyxl-2.1.0.tar.bz2 5286312 SHA256 60b64a18ccec5b4850c9b41cc8481c6dba3227926469b98d78279bc016eeabb0 SHA512 e537d1b2e1caae3932fde38295865609a4b1f9607378f5223bdfa8d219671331729453eb20092f7583ee3663200e40e8e3bd6a38119096c731d60d7efe2893dd WHIRLPOOL 0ba8228b4b942ef39136efb5d19695d5d619c3e3e77ad8ca402d2f933435e70c4b83adcdd400d36a491bfaa334644bee0668e823c420df5d199cabbf035cf948
+DIST openpyxl-2.2.2.tar.gz 108530 SHA256 2eec264a2eb42a9353319f0f939cfeacf75cf88b803fbf02d0dd5cc53f13b705 SHA512 207f1a3dca973206800529169ea1e68c40a70db5af1acf874b21ab7d1b1636e075a5c23ab98d3b40a397c78f9f3eebe6367be7dd2d5443c07a2443a58ea6835e WHIRLPOOL f34bfc7dc15620a20a29ab101a9eac47ba68ecb8eb4a994adfd0cb54a811e64d89c5210009f3c6dccfe85bf8806506e1f9b3e78f1da217033e03c981ec085de0
diff --git a/dev-python/openpyxl/openpyxl-1.7.0.ebuild b/dev-python/openpyxl/openpyxl-1.7.0.ebuild
deleted file mode 100644
index b0f16c288210..000000000000
--- a/dev-python/openpyxl/openpyxl-1.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-1.7.0.ebuild,v 1.1 2014/12/07 14:31:43 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="http://bitbucket.org/ericgazoni/openpyxl-328/wiki/Home"
-SRC_URI="https://bitbucket.org/ericgazoni/openpyxl-328/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/openpyxl/openpyxl-1.9.0.ebuild b/dev-python/openpyxl/openpyxl-1.9.0.ebuild
deleted file mode 100644
index ff298561f62f..000000000000
--- a/dev-python/openpyxl/openpyxl-1.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-1.9.0.ebuild,v 1.1 2014/12/07 14:06:15 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="http://bitbucket.org/ericgazoni/openpyxl-328/wiki/Home"
-SRC_URI="https://bitbucket.org/ericgazoni/openpyxl-328/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/openpyxl/openpyxl-2.0.2.ebuild b/dev-python/openpyxl/openpyxl-2.0.2.ebuild
deleted file mode 100644
index b36980cd944f..000000000000
--- a/dev-python/openpyxl/openpyxl-2.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-2.0.2.ebuild,v 1.2 2014/10/28 07:49:09 aballier Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="http://bitbucket.org/ericgazoni/openpyxl/wiki/Home"
-SRC_URI="https://bitbucket.org/ericgazoni/openpyxl/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all(){
-	sed -e "s: 'sphinx.ext.intersphinx',::" \
-		-i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/openpyxl/openpyxl-2.1.0.ebuild b/dev-python/openpyxl/openpyxl-2.1.0.ebuild
index f18c2b727918..523d38a7ea14 100644
--- a/dev-python/openpyxl/openpyxl-2.1.0.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-2.1.0.ebuild,v 1.2 2015/02/16 15:48:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-2.1.0.ebuild,v 1.3 2015/05/13 12:50:14 jlec Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} )
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="http://bitbucket.org/ericgazoni/openpyxl-328/wiki/Home"
+HOMEPAGE="http://openpyxl.readthedocs.org"
 SRC_URI="https://bitbucket.org/ericgazoni/openpyxl-328/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MIT"
diff --git a/dev-python/openpyxl/openpyxl-2.2.2.ebuild b/dev-python/openpyxl/openpyxl-2.2.2.ebuild
new file mode 100644
index 000000000000..b00c70132252
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-2.2.2.ebuild,v 1.1 2015/05/13 12:50:14 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+# tests aren't contained in tarball
+RESTRICT="test"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
new file mode 100644
index 000000000000..90fca4df6142
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-9999.ebuild,v 1.1 2015/05/13 12:50:14 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 mercurial
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI=""
+EHG_REPO_URI="https://bitbucket.org/openpyxl/openpyxl"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index bd8bb73d0a3c..236dccb04072 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,2 +1,3 @@
 DIST pandas-0.15.2.tar.gz 4575541 SHA256 4a1ded49c77e109e2d5d078248f1f809962d81b508541c702d25a369af27ba17 SHA512 cc7e9c4baf7b3cce7793ea75d6c5e76f6238961f40b5045b209b046d5338762c1815b2bf62e39a56ae6c3a2d1a07ab6c7f8c5a769f9086913e573507a3ba1c41 WHIRLPOOL 0a277169d45148cd66c2f3e2cd402bcfd3dc44db2b73a05055e163b1e5f9afe817acbdf2b978112999b6cc877b5f31dbaf3990bd050cf8f1726a189c70f678d0
 DIST pandas-0.16.0.tar.gz 4771233 SHA256 4013de6f8796ca9d2871218861823bd9878a8dfacd26e08ccf9afdd01bbad9f1 SHA512 2375adc08e5129d591b2cce173a5dd5a86f94fa17fec862580af1f735da0a973fd0040d8405bf3bfd24c258630e2d2e2419f719abc3ee63dda59df43b8929e41 WHIRLPOOL cae6e600476156d26dca685d759568ab198bf34653dca6caa5dfda659346f84ebb32503ce689d91e83c2ab2798dd9855c21683cb6d88a4d03f39db0cbca2716d
+DIST pandas-0.16.1.tar.gz 4959316 SHA256 570d243f8cb068bf780461b9225d2e7bef7c90aa10d43cf908fe541fc92df8b6 SHA512 273b600cf32001aaa08fb99790b9fcd989845c1de524c76ed42d26807b6751fc7a08e702134ef359ecb13b7de79eede4efe1be1f96aa23d0e2fbd8ab59cec630 WHIRLPOOL 858c10799998711c928ed587c7a7d060346b930b3a8df9d7c0d1fa9916a990344e92443005be1c85a8b0728412591777156fe81a7caf20556d4051c7b7693a84
diff --git a/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch b/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch
new file mode 100644
index 000000000000..be02595e9da4
--- /dev/null
+++ b/dev-python/pandas/files/pandas-0.16.1-zoneinfo.patch
@@ -0,0 +1,130 @@
+ pandas/compat/__init__.py               | 14 ++++++++++++++
+ pandas/tests/test_series.py             |  3 ++-
+ pandas/tseries/tests/test_daterange.py  |  2 +-
+ pandas/tseries/tests/test_period.py     |  8 ++++----
+ pandas/tseries/tests/test_timeseries.py |  6 +++---
+ pandas/tslib.pyx                        |  6 +++++-
+ 6 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
+index 6be0fac..2a27362 100644
+--- a/pandas/compat/__init__.py
++++ b/pandas/compat/__init__.py
+@@ -26,6 +26,7 @@ Python 2.6 compatibility:
+ 
+ Other items:
+ * OrderedDefaultDict
++* platform checker
+ """
+ # pylint disable=W0611
+ import functools
+@@ -754,3 +755,16 @@ class OrderedDefaultdict(OrderedDict):
+     def __reduce__(self):  # optional, for pickle support
+         args = self.default_factory if self.default_factory else tuple()
+         return type(self), args, None, None, list(self.items())
++
++
++# https://github.com/pydata/pandas/pull/9123
++def is_platform_windows():
++    return sys.platform == 'win32' or sys.platform == 'cygwin'
++
++
++def is_platform_linux():
++    return sys.platform == 'linux2'
++
++
++def is_platform_mac():
++    return sys.platform == 'darwin'
+diff --git a/pandas/tests/test_series.py b/pandas/tests/test_series.py
+index 22f8aee..925cfa8 100644
+--- a/pandas/tests/test_series.py
++++ b/pandas/tests/test_series.py
+@@ -5398,7 +5398,8 @@ class TestSeries(tm.TestCase, CheckNameIntegration):
+     def test_getitem_setitem_datetime_tz_dateutil(self):
+         tm._skip_if_no_dateutil();
+         from dateutil.tz import tzutc
+-        from dateutil.zoneinfo import gettz
++        from pandas.tslib import _dateutil_gettz as gettz
++
+         tz = lambda x: tzutc() if x == 'UTC' else gettz(x)  # handle special case for utc in dateutil
+ 
+         from pandas import date_range
+diff --git a/pandas/tseries/tests/test_daterange.py b/pandas/tseries/tests/test_daterange.py
+index 841d81c..69b1d84 100644
+--- a/pandas/tseries/tests/test_daterange.py
++++ b/pandas/tseries/tests/test_daterange.py
+@@ -441,7 +441,7 @@ class TestDateRange(tm.TestCase):
+     def test_month_range_union_tz_dateutil(self):
+         _skip_if_windows_python_3()
+         tm._skip_if_no_dateutil()
+-        from dateutil.zoneinfo import gettz as timezone
++        from pandas.tslib import _dateutil_gettz as timezone
+         tz = timezone('US/Eastern')
+ 
+         early_start = datetime(2011, 1, 1)
+diff --git a/pandas/tseries/tests/test_period.py b/pandas/tseries/tests/test_period.py
+index 70c706f..0218af6 100644
+--- a/pandas/tseries/tests/test_period.py
++++ b/pandas/tseries/tests/test_period.py
+@@ -101,15 +101,15 @@ class TestPeriodProperties(tm.TestCase):
+                          pytz.timezone('Europe/Brussels').normalize(p).tzinfo)
+ 
+     def test_timestamp_tz_arg_dateutil(self):
+-        import dateutil
++        from pandas.tslib import _dateutil_gettz as gettz
+         from pandas.tslib import maybe_get_tz
+         p = Period('1/1/2005', freq='M').to_timestamp(tz=maybe_get_tz('dateutil/Europe/Brussels'))
+-        self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
++        self.assertEqual(p.tz, gettz('Europe/Brussels'))
+ 
+     def test_timestamp_tz_arg_dateutil_from_string(self):
+-        import dateutil
++        from pandas.tslib import _dateutil_gettz as gettz
+         p = Period('1/1/2005', freq='M').to_timestamp(tz='dateutil/Europe/Brussels')
+-        self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
++        self.assertEqual(p.tz, gettz('Europe/Brussels'))
+ 
+     def test_timestamp_nat_tz(self):
+         t = Period('NaT', freq='M').to_timestamp()
+diff --git a/pandas/tseries/tests/test_timeseries.py b/pandas/tseries/tests/test_timeseries.py
+index 0c4961d..6c20b02 100644
+--- a/pandas/tseries/tests/test_timeseries.py
++++ b/pandas/tseries/tests/test_timeseries.py
+@@ -417,9 +417,9 @@ class TestTimeSeries(tm.TestCase):
+     def test_timestamp_to_datetime_explicit_dateutil(self):
+         _skip_if_windows_python_3()
+         tm._skip_if_no_dateutil()
+-        import dateutil
++        from pandas.tslib import _dateutil_gettz as gettz
+         rng = date_range('20090415', '20090519',
+-                         tz=dateutil.zoneinfo.gettz('US/Eastern'))
++                         tz=gettz('US/Eastern'))
+ 
+         stamp = rng[0]
+         dtval = stamp.to_pydatetime()
+@@ -1807,7 +1807,7 @@ class TestTimeSeries(tm.TestCase):
+     def test_append_concat_tz_dateutil(self):
+         # GH 2938
+         tm._skip_if_no_dateutil()
+-        from dateutil.zoneinfo import gettz as timezone
++        from pandas.tslib import _dateutil_gettz as timezone
+ 
+         rng = date_range('5/8/2012 1:45', periods=10, freq='5T',
+                          tz='dateutil/US/Eastern')
+diff --git a/pandas/tslib.pyx b/pandas/tslib.pyx
+index 40dbbd7..4feeaec 100644
+--- a/pandas/tslib.pyx
++++ b/pandas/tslib.pyx
+@@ -41,7 +41,11 @@ from datetime import time as datetime_time
+ # dateutil compat
+ from dateutil.tz import (tzoffset, tzlocal as _dateutil_tzlocal, tzfile as _dateutil_tzfile,
+                          tzutc as _dateutil_tzutc)
+-from dateutil.zoneinfo import gettz as _dateutil_gettz
++from pandas.compat import is_platform_windows
++if is_platform_windows():
++    from dateutil.tz import gettz as _dateutil_gettz
++else:
++    from dateutil.zoneinfo import gettz as _dateutil_gettz
+ 
+ from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
+ from pandas.compat import parse_date, string_types, PY3, iteritems
diff --git a/dev-python/pandas/files/pandas-9999-zoneinfo.patch b/dev-python/pandas/files/pandas-9999-zoneinfo.patch
new file mode 100644
index 000000000000..e42a17698db2
--- /dev/null
+++ b/dev-python/pandas/files/pandas-9999-zoneinfo.patch
@@ -0,0 +1,130 @@
+ pandas/compat/__init__.py               | 14 ++++++++++++++
+ pandas/tests/test_series.py             |  3 ++-
+ pandas/tseries/tests/test_daterange.py  |  2 +-
+ pandas/tseries/tests/test_period.py     |  8 ++++----
+ pandas/tseries/tests/test_timeseries.py |  6 +++---
+ pandas/tslib.pyx                        |  6 +++++-
+ 6 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
+index 6be0fac..2a27362 100644
+--- a/pandas/compat/__init__.py
++++ b/pandas/compat/__init__.py
+@@ -26,6 +26,7 @@ Python 2.6 compatibility:
+ 
+ Other items:
+ * OrderedDefaultDict
++* platform checker
+ """
+ # pylint disable=W0611
+ import functools
+@@ -754,3 +755,16 @@ class OrderedDefaultdict(OrderedDict):
+     def __reduce__(self):  # optional, for pickle support
+         args = self.default_factory if self.default_factory else tuple()
+         return type(self), args, None, None, list(self.items())
++
++
++# https://github.com/pydata/pandas/pull/9123
++def is_platform_windows():
++    return sys.platform == 'win32' or sys.platform == 'cygwin'
++
++
++def is_platform_linux():
++    return sys.platform == 'linux2'
++
++
++def is_platform_mac():
++    return sys.platform == 'darwin'
+diff --git a/pandas/tests/test_series.py b/pandas/tests/test_series.py
+index 22f8aee..925cfa8 100644
+--- a/pandas/tests/test_series.py
++++ b/pandas/tests/test_series.py
+@@ -5398,7 +5398,8 @@ class TestSeries(tm.TestCase, CheckNameIntegration):
+     def test_getitem_setitem_datetime_tz_dateutil(self):
+         tm._skip_if_no_dateutil();
+         from dateutil.tz import tzutc
+-        from dateutil.zoneinfo import gettz
++        from pandas.tslib import _dateutil_gettz as gettz
++
+         tz = lambda x: tzutc() if x == 'UTC' else gettz(x)  # handle special case for utc in dateutil
+ 
+         from pandas import date_range
+diff --git a/pandas/tseries/tests/test_daterange.py b/pandas/tseries/tests/test_daterange.py
+index 841d81c..69b1d84 100644
+--- a/pandas/tseries/tests/test_daterange.py
++++ b/pandas/tseries/tests/test_daterange.py
+@@ -441,7 +441,7 @@ class TestDateRange(tm.TestCase):
+     def test_month_range_union_tz_dateutil(self):
+         _skip_if_windows_python_3()
+         tm._skip_if_no_dateutil()
+-        from dateutil.zoneinfo import gettz as timezone
++        from pandas.tslib import _dateutil_gettz as timezone
+         tz = timezone('US/Eastern')
+ 
+         early_start = datetime(2011, 1, 1)
+diff --git a/pandas/tseries/tests/test_period.py b/pandas/tseries/tests/test_period.py
+index 70c706f..0218af6 100644
+--- a/pandas/tseries/tests/test_period.py
++++ b/pandas/tseries/tests/test_period.py
+@@ -101,15 +101,15 @@ class TestPeriodProperties(tm.TestCase):
+                          pytz.timezone('Europe/Brussels').normalize(p).tzinfo)
+ 
+     def test_timestamp_tz_arg_dateutil(self):
+-        import dateutil
++        from pandas.tslib import _dateutil_gettz as gettz
+         from pandas.tslib import maybe_get_tz
+         p = Period('1/1/2005', freq='M').to_timestamp(tz=maybe_get_tz('dateutil/Europe/Brussels'))
+-        self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
++        self.assertEqual(p.tz, gettz('Europe/Brussels'))
+ 
+     def test_timestamp_tz_arg_dateutil_from_string(self):
+-        import dateutil
++        from pandas.tslib import _dateutil_gettz as gettz
+         p = Period('1/1/2005', freq='M').to_timestamp(tz='dateutil/Europe/Brussels')
+-        self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
++        self.assertEqual(p.tz, gettz('Europe/Brussels'))
+ 
+     def test_timestamp_nat_tz(self):
+         t = Period('NaT', freq='M').to_timestamp()
+diff --git a/pandas/tseries/tests/test_timeseries.py b/pandas/tseries/tests/test_timeseries.py
+index 0c4961d..6c20b02 100644
+--- a/pandas/tseries/tests/test_timeseries.py
++++ b/pandas/tseries/tests/test_timeseries.py
+@@ -417,9 +417,9 @@ class TestTimeSeries(tm.TestCase):
+     def test_timestamp_to_datetime_explicit_dateutil(self):
+         _skip_if_windows_python_3()
+         tm._skip_if_no_dateutil()
+-        import dateutil
++        from pandas.tslib import _dateutil_gettz as gettz
+         rng = date_range('20090415', '20090519',
+-                         tz=dateutil.zoneinfo.gettz('US/Eastern'))
++                         tz=gettz('US/Eastern'))
+ 
+         stamp = rng[0]
+         dtval = stamp.to_pydatetime()
+@@ -1807,7 +1807,7 @@ class TestTimeSeries(tm.TestCase):
+     def test_append_concat_tz_dateutil(self):
+         # GH 2938
+         tm._skip_if_no_dateutil()
+-        from dateutil.zoneinfo import gettz as timezone
++        from pandas.tslib import _dateutil_gettz as timezone
+ 
+         rng = date_range('5/8/2012 1:45', periods=10, freq='5T',
+                          tz='dateutil/US/Eastern')
+diff --git a/pandas/tslib.pyx b/pandas/tslib.pyx
+index 66f14bf..a0d4ee0 100644
+--- a/pandas/tslib.pyx
++++ b/pandas/tslib.pyx
+@@ -41,7 +41,11 @@ from datetime import time as datetime_time
+ # dateutil compat
+ from dateutil.tz import (tzoffset, tzlocal as _dateutil_tzlocal, tzfile as _dateutil_tzfile,
+                          tzutc as _dateutil_tzutc)
+-from dateutil.zoneinfo import gettz as _dateutil_gettz
++from pandas.compat import is_platform_windows
++if is_platform_windows():
++    from dateutil.tz import gettz as _dateutil_gettz
++else:
++    from dateutil.zoneinfo import gettz as _dateutil_gettz
+ 
+ from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
+ from pandas.compat import parse_date, string_types, PY3, iteritems
diff --git a/dev-python/pandas/pandas-0.16.1.ebuild b/dev-python/pandas/pandas-0.16.1.ebuild
new file mode 100644
index 000000000000..ad1059ec7d2f
--- /dev/null
+++ b/dev-python/pandas/pandas-0.16.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.16.1.ebuild,v 1.1 2015/05/13 12:50:55 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc excel html test R"
+
+EXTRA_DEPEND="
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	dev-python/openpyxl[${PYTHON_USEDEP}]
+	dev-python/pymysql[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/psycopg:2[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	"
+CDEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+		x11-misc/xclip
+		)
+	test? (
+		${EXTRA_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+		)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	excel? (
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+	)
+	html? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		|| (
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}] )
+	)
+	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-zoneinfo.patch
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	VIRTUALX_COMMAND="nosetests"
+	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+		virtualmake --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	local x
+	elog "Please install"
+	for x in ${EXTRA_DEPEND}; do
+		optfeature "additional functionality" "${x%%[*}"
+	done
+}
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index 792e9db09722..5b9534625281 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-9999.ebuild,v 1.10 2015/04/15 06:34:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-9999.ebuild,v 1.12 2015/05/13 12:50:55 jlec Exp $
 
 EAPI=5
 
@@ -79,8 +79,8 @@ RDEPEND="${CDEPEND}
 	)
 	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.2-zoneinfo.patch
+_PATCHES=(
+	"${FILESDIR}"/${P}-zoneinfo.patch
 )
 
 python_prepare_all() {
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index a66d5d67ed8e..7ea671aaca27 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,4 +1,4 @@
 DIST pymongo-2.6.3.tar.gz 324241 SHA256 cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2 SHA512 6da3cbf035b52379c24df37b76e1eb743b12c1026116e28e4e7b6450e2674d730f9c8c2dd85f352c6ee4c9f604decaffc2dbc57fe64268bd7522d8ce155cca9e WHIRLPOOL ac36dd88c4311237ecda66a6008fa0d89d0670e331df6c49a08a1d3bc4ddcafe72e8e003009c206d3ac12afb1b14afe2d3615834a5a8df5ce30442f7b49fdbf2
 DIST pymongo-2.7.2.tar.gz 381455 SHA256 8fb45e3edec006f4b11580fc579bec7781a8b3201ce0abf31593f086070e51f6 SHA512 0e78495462d670c168e716a7c34e05f6a11a203f0bf9b32c1488608343588a48cbbb76ce715411b310359de19d9cd57c75f80ac7d8195a122a760cec22e8d0c7 WHIRLPOOL 6cb7eedc530908c2fdb17b6e31561d9c860d6fd1edddb4d66288c3fe11bc199ebc58538a70508b2540b827077f62345a86729644fdf8d37c1b9934de03e77543
 DIST pymongo-2.8.1.tar.gz 399521 SHA256 300ea5762d059c07d1bb2578f35bd0e55bc31753951e2de3d6fe2ed54438e374 SHA512 8d02829eb8683572ffe8c1be5ee50a4c778e1a0b938820859be215b583e719d079183b1a26bc074fad7e31e8944756b82b146657ad528123514b59c725f6d7aa WHIRLPOOL b0c8c373771d3a4525ddf30db5903a6b1241aa1e160e688c215bef21395d598faa65f12e57ea8fe0f16d1c0eaa0abad02ebf3e0b9df2acb8e1c8e6ff9c20a214
-DIST pymongo-3.0.1.tar.gz 381044 SHA256 d26076e838335d33d10f35f5b94a5a618a7aea5519c889b9ec473b23200b1237 SHA512 2aed2c4c7cfc9fc8e4cca0ae1159279cd195528b4004a0fff06bef9527336a2d509bcf9cd4cde1339ed7f114f5919166ed7ad5e6e8e109f365fe9f2935b89d88 WHIRLPOOL b5432e4336964f0bce07d3b5ae3b89329718e53f25eefff589c13f0717c884188fe9a4fae9275abc991bad43bfef54481fe684e720d64d36de086475c277dfac
+DIST pymongo-3.0.2.tar.gz 382486 SHA256 eb4a2102a82603f94306be2081af0ddbbd6d9c21d65e1dc761f0fecffda4c831 SHA512 9203e96424c5cd8406e525a0680ee6b13a3bc79d24cb389a6920aa5164d63dad1e9f306bf79ef54a0fda65ad624a50128c21e4546fc2d6d92e6a71e2ab5163fb WHIRLPOOL e8b519c34c49f2183370020d0b9507bc4c319006df044dac9ecc481e41d95901457d732392948ab8e3d494e2b622c169788a618399513fb966d40deea9905a90
diff --git a/dev-python/pymongo/pymongo-3.0.1.ebuild b/dev-python/pymongo/pymongo-3.0.2.ebuild
similarity index 98%
rename from dev-python/pymongo/pymongo-3.0.1.ebuild
rename to dev-python/pymongo/pymongo-3.0.2.ebuild
index c9f39509c081..0dec743de468 100644
--- a/dev-python/pymongo/pymongo-3.0.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-3.0.1.ebuild,v 1.1 2015/04/22 12:55:08 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-3.0.2.ebuild,v 1.1 2015/05/13 08:27:29 ultrabug Exp $
 
 EAPI=5
 
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 9a9f44902490..293f09817f30 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -3,3 +3,4 @@ DIST TwistedConch-13.2.0.tar.bz2 243977 SHA256 1559f2070e47a8dfb63a387a8d8deb4da
 DIST TwistedConch-14.0.0.tar.bz2 219179 SHA256 5d1023bec87d2c1bf4d1e85f62a5fa304d9b3bf13e86c0af74cc8c9fb4916a83 SHA512 24826cad92b2f3b13cf4a3e731cfff9e36d703b45b15404fad2bba91df60bcc60f4cf687a3f2e646457f00d28b4ac3fa019ee1751a538b213a10526ab5aa24b8 WHIRLPOOL 71ddad3e483ccc9780eb2420cc04827d0809eb77e7d2e93ec886e3ccd4369193b34da905bddcc95414037fb27509cf33be334d39be969b7cb3749940263bab6b
 DIST TwistedConch-14.0.1.tar.bz2 219255 SHA256 41303b4f09ca7dcfc0b7e796f5f18f83d16cfde789f86364328a08217c18564e SHA512 a4800c437b15ca51fd9151b39e59771ba0a18ea2e9e07fcab2b26eabee925a272ab3dbed114197c9b52f1985f1dd23afacc91591c58fe9e64080394865a77a25 WHIRLPOOL d3551c7a4b412955f653eb1b004fbbca358523761b21578d7886756e180e791d90ef8240e4d5917d65a714a87e348c9fff6077c285e348517409babda90dff0f
 DIST TwistedConch-14.0.2.tar.bz2 219235 SHA256 6628807246be9dd2bea04222ebe2356f4a4a1accf38863983219df745052ad58 SHA512 dfceb9050ab5f1c9962e6ddc8568d546aea4f5028ba63a181b12b5880e130cfec1886fae5a74cd7e5bb79cf74cbcdae4fa7a4f5d814bd14f767ec9108fe83c19 WHIRLPOOL 99142269f412d82eb8e074dbab7f7d3925881e3d6c8e5823f2c72eff425625cf280ce82655d9f708ddb5db544cea8f4e0b02af3e0026133abe9343cb7c79ada4
+DIST TwistedConch-15.1.0.tar.bz2 222091 SHA256 51dc4d3ab3f13e64a196046e3d722689f87c586f3ebe42e287c2063fdd48bb4c SHA512 912d9a288fcc6bb3e8babee75325ea7a384e364d227f0629bbb5af8c813cff75dbeb38755d2f0eb5bd5ac243c45c4ed5f1c9e01bf0d693b027adeeef59ebd691 WHIRLPOOL 09717988167eaf7ed4ed48262ea344342125deae845b3dce0781a84122446922864d189943011d0be9ddc0711a2236637cb9d6c28e049f5e7c3a59440a65512b
diff --git a/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild b/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
new file mode 100644
index 000000000000..a59d2ae2ece6
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild,v 1.1 2015/05/13 08:01:25 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index 929aed9745e5..4919a191be50 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -4,3 +4,4 @@ DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c27511
 DIST TwistedCore-14.0.0.tar.bz2 1126188 SHA256 41fde42b917ea91c74e9ad15ae45a8104de156bcb32e7bb6a2dfa6c68141a72e SHA512 71294a10fb574d1794b730f11f89a689445ff13cf5553140dbbe049a03afe744bcc342cbff60b6d74714575bf840814fcddb0a7c94f5def1987966e0f1238704 WHIRLPOOL 1c68af280d33d0f6ce431a18f87bfa4f679aeab7f6217b388e8f7c7cb78d1b5e4587f3d3f02ccc0b7f87f6dc359c35aa15b0ee58f86385637a5d2236e7563c39
 DIST TwistedCore-14.0.1.tar.bz2 1126214 SHA256 4d80bb277bff34266fb03989d89f721ae41edfc755f4c0481813c04a759f16dc SHA512 44ef2e66636da1f7c6497cf1a4bacfdfdffd276e5b0f99b22c70f74a016de6f88a263fc549db3f04e09e86142514955bc79662760148680fb8ec823720a57a41 WHIRLPOOL ccd1acaf7f732d02b4fd45ca8285b8bbbcd3066176280b929a65879b4530f5158db8134296a35ffe565d2a8b72299ecf93329752bf5b409b60313a930cb1d876
 DIST TwistedCore-14.0.2.tar.bz2 1125732 SHA256 3d16cc6f432ecda1cc335b9a99592ee18d7eb8650e95d5f17895ab4e5e3a4ff8 SHA512 a361f5c9205eca3eda9bf222ed1894e1c55ff937e9950c0cfca193310a165486abffee529740c2c3cc0231c4ccba4d324e2ec7ef5d1aaa9516960b01e2e81ed9 WHIRLPOOL be3b1f70e616c48944741395e8c22240ea05d7f9c823b3b58ff9bebbe1d7293d0fb054b4820e19873aa1feb8d2c1e19fb84be1f632466b2c1d951900d1705d0b
+DIST TwistedCore-15.1.0.tar.bz2 1139396 SHA256 c769ecc62d65a33f04f932ec727c367eb557610392e9f7bab37eaf169fb1cebf SHA512 3978429d57b7929bd65103f86d5e150950de48d27382d23a08b97be5c62c218e7cbaa06067ba6c1b926fb372cc290baf5d629af91053cf338e331d996bf8c99a WHIRLPOOL 3baa9a5986e415fee15cbdb33263a9c9ba84a4c7c79a2f744acd28881de2043b56f97137acf5b97d243fe5d6b6885eebaae2b90cced5e81ac4bef5176fd6a1f7
diff --git a/dev-python/twisted-core/twisted-core-15.1.0.ebuild b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
new file mode 100644
index 000000000000..3c39d0455b65
--- /dev/null
+++ b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-15.1.0.ebuild,v 1.1 2015/05/13 07:47:46 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial test"
+
+RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=(
+	# Give a load-sensitive test a better chance of succeeding.
+	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Skip a test if twisted conch is not available
+	# (see Twisted ticket #5703)
+	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	# Skip broken tests.
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
+		|| die "sed failed"
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	# https://twistedmatrix.com/trac/ticket/6920 6921
+	# Just re-exposing them to list a full list of deficits
+#	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
+#	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
+
+	# Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
+	# test_loreDeprecation and test_exist failures appeared in version 14.0.0.
+	# Possibly due to over taxing of the distutils_install_for_testing function
+	rm -f twisted/python/test/test_release.py || die
+	sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
+	sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
+
+	# Requires connection to the network
+	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
+
+	# Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
+	# Upstream somewhat unreceptive
+	# The last of these invokes a hang or a long delay
+	sed -e 's:test_dataReceivedThrows:_&:' \
+		-e 's:test_resumeProducingThrows:_&:' \
+		-e 's:test_resumeProducingAbortLater:_&:' \
+		-e 's:test_resumeProducingAbort:_&:' \
+		-e 's:test_fullWriteBufferAfterByteExchange:_&:' \
+		-i twisted/internet/test/test_tcp.py || die
+	sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	local egg=( Twisted_Core*.egg-info )
+	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index cf72c220bcd6..fe8386a95722 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -3,3 +3,4 @@ DIST TwistedLore-13.2.0.tar.bz2 88616 SHA256 53ca37c533048ddaf209548a21bf3078cb5
 DIST TwistedLore-14.0.0.tar.bz2 53923 SHA256 d689acbff7e667eee9cc4e05ef7fa4a7de2667dfde062f487ddc33d44781b7c5 SHA512 148311175c66e934e80eb5007b616bdbde663793fe105a6ece346027598ab1b183ec55f189f153436a38615d3cc9a1ef43b8dd4b7875b975ce605442d8fda13d WHIRLPOOL 35daa28d74a3b7c16b8b9317628b8ae64468c14051f83e05c3681376e32fa623512bf34815656d2830c739fc52ca3555f51806e53afc55986ce9facc81a7467b
 DIST TwistedLore-14.0.1.tar.bz2 53945 SHA256 5fc9b933b1be160f4bf3702a95177b684e8b927d0e5103f4aa245f04dd4e2e26 SHA512 237011ad1868270512f169560a3b982f156beda7b4e36bf1bbd1d2f62fd11198a0f0b3efb70065e045844fb4641f53b3eee94da6f74a918b9acde741704b8d90 WHIRLPOOL 40f96bdb40d66743e286b3fa9341d1c9aa7b025a3a7e6d9014589e4cbfbc7d4a61d8e670cc669101629b4ca2db3b20149ef6b345b1a3f31144a6ac7d556fe64b
 DIST TwistedLore-14.0.2.tar.bz2 53980 SHA256 dcc3acf5d06b3cd4590c66354cc8dfb0491031686f30c5adb7b8c5b5bc50749b SHA512 f57cd80d61a33a2167967eed998ff8f26fb628c66fc3a16324dd82963e99679f8c036d2b028e554af184acdcdfe81673658bd88fc5acbce4fc9d8bf16e725640 WHIRLPOOL 88730c514c23b6f866c5222b15b7bd4e90ae2fec8e44d61c5fd287c653b848dfe7f0044c9bfefff4ff4c7766cc08659a0439652d68eaecb7465d03dbcc339b8e
+DIST TwistedLore-15.1.0.tar.bz2 54005 SHA256 62e3949683f5ec0cf0ee8160767dff2f5a3cc26c3474bedbafb2e007d5f746b4 SHA512 4a775705083e0fd180df6c2f514f97e79b76e9e6cd8c7ed4c3159ff3a604753dde59f5c780917ff1a136d7db76ed3048606df6c0babc01894746c3e6229f7a67 WHIRLPOOL 97f678887756d6663e22292f63b026fc8611fa017a460d2a11f02f1c60d958433d7bffd99194e93fac40cd2411f4ccbcabe2bef5de88da70440ac4e9e9dad4fe
diff --git a/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild b/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
new file mode 100644
index 000000000000..736862b115b2
--- /dev/null
+++ b/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild,v 1.1 2015/05/13 08:02:31 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
index 0d075ebd3ec6..8fedc52855ba 100644
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@@ -3,3 +3,4 @@ DIST TwistedMail-13.2.0.tar.bz2 160046 SHA256 6e4b3844a27bc1f85ae7529bf1c0574f69
 DIST TwistedMail-14.0.0.tar.bz2 157816 SHA256 6a4ac184a719cb273cb055869c2c42e4c96fd0cd8f56cc0ffdeff8cd68d22075 SHA512 0cff0f38d3a752d4ad48722b9138b4e0704668b06285f51a95ece14c265107c98bec7b01196ad52d676bbbb4e1c73b40fe9a663fcaf14ccbd8f824854eaa5025 WHIRLPOOL c3b704caa5396bd8e7e2e94f9a2f8a9e154a24476c9c72d71ff346c6c1bec5cb50986c50e220ffbaf06f1b96b3b53b7ddcc771349f3a7e47b0cac85d892c3a92
 DIST TwistedMail-14.0.1.tar.bz2 157660 SHA256 42aa76eff85a31d72162cfcea89d157d83e334f90e5c2ee59fc21e8f680c1450 SHA512 ef2071e24dcfabb0422f25ee529aa19cf8cda0d2f3e023a8672c0565511e1f6f899c6c88bb4adb79dd184f1a4d3dd4800332f33929fe5b6b922b1b7e44e39507 WHIRLPOOL 5e888367e5089f58ef0a132db5be315a670ed8b895c48d8248ae63727f398e1a323daaa35a5047ec513ad7be1e1bf05bac606d6a3c7ed01a431745d4fe1b782e
 DIST TwistedMail-14.0.2.tar.bz2 157653 SHA256 15d8d232e842fa7be639797eb132a87b5edf6a3cf08a732c471193b08bf925b3 SHA512 2ca682a838caf96139db6bb71b6ca536e9d8b403157e3293a097451760b3bb5a8e04777228e938dd4552a1ce3cd59ea560cf26a431d18bc77cbc8951be84fd3a WHIRLPOOL 3ce0a46976cb5315e9af87e9f601f4853d51cbd5875838a7928cd24da57b3f93508bff8353748f1b72736af108fc675df37b19bce47c7f1a6a13a802e55bd11a
+DIST TwistedMail-15.1.0.tar.bz2 161265 SHA256 fa83f1afc4c2f53321fc2911b64dc923755c0dd8f8f53cee1bbdecb6bcee6474 SHA512 2b5453e83185fa51222e26abf59a743c8cdc872f556c28135a7d7a717cf438f5a9d3ca6085ad4b35ae64509e49130812c3dba4cbe65aacdb738fc903492a1a15 WHIRLPOOL c762acb540f9a3be46788087c434ea8de42660f4ec5a646777d75b66a016d2ebb2fb4f15befa430e7ed01e2e0c7a65f3a47924eda8a6c6afa76febee4fe5391e
diff --git a/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild b/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
new file mode 100644
index 000000000000..c5e217b3d7ea
--- /dev/null
+++ b/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild,v 1.1 2015/05/13 08:03:13 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted Mail library, server and client"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
index 7c5bcb65e37a..6b9cbba40b04 100644
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@@ -3,3 +3,4 @@ DIST TwistedNames-13.2.0.tar.bz2 71127 SHA256 b8ed07790661eac454ee0bc424f9ede649
 DIST TwistedNames-14.0.0.tar.bz2 88385 SHA256 6adf7fea6048bd2938c6aa8b7dab852dd8f372e2896d65745389e3c88fcbf612 SHA512 6b1353c4588a2cb235487a607bdf9d842ca87f5da9b8fffcd8aa6d3011adce4e2089146a41332f8a495a038bfcb91e3cb87b0d4e8316d443c0d7ea4809711c23 WHIRLPOOL 0c075a1edfe8824ba138cf0648f99832d3cb7dd3b6594134afd651059e152410e891f40972e29d59e526c509be99cd7e834b2adc49f2dbc765a4bac9fe7b8dc2
 DIST TwistedNames-14.0.1.tar.bz2 88381 SHA256 477b0185f67bf684a03deae1f6ed394ac203c3dd4bec1d163378280c9c1778b6 SHA512 b896b338262d9ace8d98ece2578489bb1a5cd104edcfecf3222f3de4ff950c385f06c4359f6d9aaf3340a43dee646aff5bd354302e094f6454daecc23a4a8daf WHIRLPOOL 77de0fe2e651cbe70e79a1035e248a78031e39382866c19a797ff3b78589efcb2f81f80142cad8744ce7b7bf05c3c18faaa55f3e424456e07225da537e33e1dd
 DIST TwistedNames-14.0.2.tar.bz2 88321 SHA256 ad6d0b527c88e1b70f97350e0d768b8373c43f5a4b6558be8e2c5d9d4a891d54 SHA512 f9b3a19856cad2b1437adf62ca0f187d14c570b83e9cce92db9f990171ee633b069e0cf9b4b841e51bdc00bde8b64a9bc0d3309df69d31404235996083de728f WHIRLPOOL bd22a4d7da4f3f31d717cfbb7954697e96e2bf507f2edbda81fc32621e90aabc795acc094922af50d1d727c08fc19487d8b79433291ab799372dbb7fc964ad6b
+DIST TwistedNames-15.1.0.tar.bz2 88684 SHA256 998821c69b8f950264985bcb296340023602d81899a8e3345b055fb05e1f9b28 SHA512 c03141bce0eb26de927d537a896b72823b8dbabde946a3dffd68331c6bb63deab4e7260e07540eb980d31a190c7d5b8224b46dc2e908e8b1aa8c6f869acf745a WHIRLPOOL 768b2d70b00bc12004481dc034dbb437d7fcb21940c590cafe02aab08b68181189967e0c19e46fdebdb776b0ecfaa9b5fa127198ec361554a308e2769557ce29
diff --git a/dev-python/twisted-names/twisted-names-15.1.0.ebuild b/dev-python/twisted-names/twisted-names-15.1.0.ebuild
new file mode 100644
index 000000000000..1109624921a8
--- /dev/null
+++ b/dev-python/twisted-names/twisted-names-15.1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-15.1.0.ebuild,v 1.1 2015/05/13 08:03:53 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted DNS implementation"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
index 185a74e00478..aa7e9ebd90f3 100644
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@@ -3,3 +3,4 @@ DIST TwistedNews-13.2.0.tar.bz2 19706 SHA256 e6499fdb79767fd620f8b3dfbf47b356343
 DIST TwistedNews-14.0.0.tar.bz2 19797 SHA256 1fbb80b64ef8631c48133bad58a7705893af8c4a5f4cb1a3407d76f623ba4a35 SHA512 fd3fd1bb7901409610ac4bb18b5ef4a35be320c7f80b6ecdf05b5d1a798ec3fe6c24ecff672aa645cc01a42ffbaef3422ca46557ac0e97a5a0bd14fdb6f8bc98 WHIRLPOOL 0105c513cb97c14fcfdb03e01448e6c49ad0d8c38c0e926ed90051fce1d0091b7b96919b86d853041935e596e572880de2aca6a6e4b616280389b9d7d582865d
 DIST TwistedNews-14.0.1.tar.bz2 19829 SHA256 d2dadbe2f845d0cb97c281ef05fff6be762ec862d2227f0d063936de1ff981c2 SHA512 81095ec412fe2cca39e08d1385539de0d5491aefb56d694d525849c45f648a52b685c3ee0d8b0c5f78d02158c5f2a29368285122a865af55ac9cc3a6781f943a WHIRLPOOL 2def3054e79b962949db3318ec9d11235b2fd19d01e0fed1d5dfd3b1dacda78f2bb2fdf4c4a9bc2d7b0e15a3ea4434ac67c7a2315938ca70dbf9ddb123e2161f
 DIST TwistedNews-14.0.2.tar.bz2 19805 SHA256 91c8e1201410264c81fc5771aa425ea5e67fad6a4b1e352df70824f387484092 SHA512 305ab6469cab30b775ed371280581289e59607f210d49e7f514d4f80235d44eb1ebcb19e05598a2b2b47a45cccc8a97db5088c7c78c6ee9d7a8107658cb84e67 WHIRLPOOL d2650a751ec61e2c30043a0577be0c31367d848c1b1a336565ab3855320b06eb150c173dc4d4f80fbebf5088432567dc2e10b750b7732838e2b2dffb39f4968c
+DIST TwistedNews-15.1.0.tar.bz2 19843 SHA256 8212888036f10fbae5932dfdbc593047edf08daabff3ba6fa391a8afe1c93186 SHA512 4a1111d0807d95506ad1a44dfd5f49ff72f7e8162e102a2a9945d5ffcc7f58d12f6df65e085f07e47c0fcee4c341bc0b9cdff918e062b450a2a1a0bf974e57f6 WHIRLPOOL 828ef667619d75e7f1d90902d87a462ab409b8925eece72fa0d7b26f857318d229a3b510a9a2625eb694b4b9b47ffe4822d874edda69350b5964b85847c8324b
diff --git a/dev-python/twisted-news/twisted-news-15.1.0.ebuild b/dev-python/twisted-news/twisted-news-15.1.0.ebuild
new file mode 100644
index 000000000000..b49a4738abbb
--- /dev/null
+++ b/dev-python/twisted-news/twisted-news-15.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-15.1.0.ebuild,v 1.1 2015/05/13 08:04:35 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted News is an NNTP server and programming library"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
index 0a1abf9524e5..a5b8ca03bfc0 100644
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@@ -3,3 +3,4 @@ DIST TwistedPair-13.2.0.tar.bz2 9251 SHA256 600c7dd1e9a4798540c16a7a94585a0e45e9
 DIST TwistedPair-14.0.0.tar.bz2 21665 SHA256 5452ea55fdabefb1f773eb8385b3015db53a0ff50052a4cf884e7908ec5f450a SHA512 f033748e6f9c0aaffa475469b0f87ebca80747762c4e2a474323810749f46efb91f7692873f281c179d1de25fc2d18850ea02404e1ea6bcf5a0965d0048feb9e WHIRLPOOL eea5c3c17d22d72a49d1ab68d70fc60cf5e8e587311a760f56a44d290e462d93b564ba827e5df9020d2f919331f5d92f0f2569edd8280b59e52eeb69fbd2f6f0
 DIST TwistedPair-14.0.1.tar.bz2 21676 SHA256 659fd17029fc73b75feefe06b6adb9850cc1aaa31af36f66c9ec8bab01bdcba3 SHA512 022345da61e0638dd38c32c47af23900514f6345bcfa256ac4c9674363f3c66d3ef34b337dab2275c7cc09dbde46802722fc26955cb4c4560545a8810e9a380c WHIRLPOOL 92f0fe2ee299896ea73a351bf8c3eb38e5c4fbd3771454c61c8df11f8964563db54e2302d7c14fc4a16642f22f20448efca85cf052254ef8fb7ad411dff2324e
 DIST TwistedPair-14.0.2.tar.bz2 21678 SHA256 1c2f40c4fbb089479c9615f9b96c10ed82be196a283e82132413db0a1dbc1ceb SHA512 6339541a7638ad99de9d534e36956cdadaeffc07dd86c2b24847a1e31042f832fdf51565e1528a9eae8e97918b565d8c1bc96807ea4efb04ee855745e93ce818 WHIRLPOOL f60f886d50791c6fee243b5569ca69b3dd8eb59bdb74a18b1d7f02030128001db204298c8acde6402899acaed19773a58d54e3077f8b740889274dbb539ce020
+DIST TwistedPair-15.1.0.tar.bz2 21712 SHA256 b12521b6668efd001c01f1a2703c64f586a4ebbc388b5aca56bb076795c0762c SHA512 3214017dfd4f62e074d486561ed9c7640d4f43f20fd21b3068427d482bfb3b0b723732b547a5467603b667aa62404e957343ead19a00a0b8a2f0221aa8a4691e WHIRLPOOL 8060d0653dd7e510efc32bc3da2ced56ca9066f0667b2167db455dbaca944982d5cfb2e462eb081415e757b3735bbcf2415ddbf35657ba4e024c0759f45c5987
diff --git a/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild b/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
new file mode 100644
index 000000000000..749006e0adde
--- /dev/null
+++ b/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild,v 1.1 2015/05/13 08:05:08 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/eunuchs[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+# https://twistedmatrix.com/trac/ticket/7433
+PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
index 620ca1071cc3..75757eeebff0 100644
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@@ -3,3 +3,4 @@ DIST TwistedRunner-13.2.0.tar.bz2 12944 SHA256 0609d2706da8ed0f6e96ca1d94c7dbcb9
 DIST TwistedRunner-14.0.0.tar.bz2 13020 SHA256 918c8a0ecfbb6362df8a794260eaea9c74f70e080dc3642179b2c5d838f719fe SHA512 c7101948ff46cd04e36b88fd3527b9a453c0f779608e12ca2b762ad6469e3c9dd9088ef472e53b7a649d5fc2ef1a6bed81ffbc05552f5602331cac22d3bad5ed WHIRLPOOL 9550d59e09f22b8176d70980baef86ca53989cbac18c6b6c21d9e4c03150946a2bacb63ac55c99d3ae470568b43c3559a5beda0b639f604f30a5b3b8d5f8a4c4
 DIST TwistedRunner-14.0.1.tar.bz2 13055 SHA256 2d7d9ee60f1e6b67af8daf9c68f65ee210e6f388141731280de6b3bd39818bf7 SHA512 cc897c272f6e95858deae155b096f458d2f61eb3f1ebb3e70a800aee873f26a64d3979f1d9abad73705d60c1411507b9e12c9998ba65f43acd91cf05dd637ba1 WHIRLPOOL b645ec0c6f5a6c8a7f875e47c302995889b4699c37cce1674d13f494c1fbf566661fb79667b49b4f13217e3d96df849aaaebfbbac4a0dc24431e799bfb26f177
 DIST TwistedRunner-14.0.2.tar.bz2 13042 SHA256 54864586896cb1b0a89936cd1451d3bb9c02133228d8cac5200f6b8fc6d2e0c4 SHA512 dd8609913e533ac5ca7e6f2e5d7fad4ffe4208cc03e84d1d10dc75d0ca858120bd7a35ac265a43db9e0b178b15c642219c7aeda2d7489b3e8671e1b6c52f2fa1 WHIRLPOOL 2bafb3ebeb8eaa9cd88b0c4e59ccac78099077e207767c4acdca18c344355cbab3148eca634fe829753b789a1e919fbb047669ff1fc792732d9256c4cb5cde0e
+DIST TwistedRunner-15.1.0.tar.bz2 13088 SHA256 c28ccd6f8105629c99584e7d9c9a04f90191085bf5e548d15aeb3c226a4c9e24 SHA512 335cb42dc3ecc7708ebb69d79fd2eadfa78d7ef804ad4f6d76660234cff0315aeafbe2a1a7a7e48d994f17ac4403fecb5dc6f987a8a67c9960faca2339afd1c9 WHIRLPOOL 9a735454c03187553deae94c1006b5de74cc3b0382ba2f82b4ab3888b86d520795a996d6a28de9c789a3bc59722dd355c1b1f33161bf31eb7ed3d6a5a2627a56
diff --git a/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild b/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
new file mode 100644
index 000000000000..ba0310345bcd
--- /dev/null
+++ b/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild,v 1.1 2015/05/13 08:05:49 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index fe8b65591fab..439e2f197d79 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -4,3 +4,4 @@ DIST TwistedWeb-13.2.0.tar.bz2 403931 SHA256 aee160e0264d9dbaa0ec0613851128c91e3
 DIST TwistedWeb-14.0.0.tar.bz2 228686 SHA256 02ee70e0fc06c6e35ef808321826bff1d64baae5331f69b179af80a7069f3573 SHA512 b157824257474da7f3a2e63aca4a3bc44ffbe529d87d30ab789d1203216b7cc4c386ed00b17530c537a0a9b77d74467366633915c562872c9d56ea0c1f29ed67 WHIRLPOOL 5ea6e4a8b533d2712fe352497d0f9a4e9404a9bb30ae5a4cef8f0ad8100a1e6e9626f216c45700da15342988afa00da16df08cbd18d866035c75fba9a34a63db
 DIST TwistedWeb-14.0.1.tar.bz2 228976 SHA256 1cbbe10bb006d1ce2cb656e2e28d504cba70d399b19ad065956e4f14661e376b SHA512 32132b93e23aa300facbfab1dddc6afba70c8e7f5d78007f401eb2fa6a1c902f21a7a92a33c8ee698e50786b1323aa2f4e4b6fb4577ecb3365060c875e94a7d3 WHIRLPOOL 3bbe4eb926c1e2b34cd9fabf69fb568184fdc2ff4502923fb214b812b1818535a3ec11b823c1f82e9fb8cd0fa2a26ed7d1ec4eeda0cf16bbb49123c5cfcb4fca
 DIST TwistedWeb-14.0.2.tar.bz2 228949 SHA256 363521b4fd0ec1bb057da010318b2b6913a9e9eb2adf8b05efc21bf3bbacdadc SHA512 272e8f1854d18514d13eda808da5fecd5f7e534d66938352f11064ef5961f912bd5981f3664551102b8596560081dc8138e51033924de7c0da03571ffc13ca83 WHIRLPOOL db5680de57f7917b04f43c075b14c2818750bb667835f0beebb63d9d14b2860569512ec308b0b11fa840ae2fb50a2507fdf22b15eb8834dd1af55e526aa25a76
+DIST TwistedWeb-15.1.0.tar.bz2 231028 SHA256 ef55ca0c425f3eed8080003cab080365d7dde038c6554581b4a06aab5a3285ce SHA512 3eccfafa1110b4fa85892fb3c8b0a37514c33c51f1edc6ac41c257dd198fa2f113e82b884dc6af3fa4dc1aefc69e8e6cc3ab1fc19a569c125e608a829c229748 WHIRLPOOL 4783613bfeda1ebd0ead1b4474cff7f3cd6317e7d8752117da99f7f3b340e5ff9d48700a737583a4b6f9d3c6aa7e750d1b45afc4aca32f2792ce802611544d86
diff --git a/dev-python/twisted-web/twisted-web-15.1.0.ebuild b/dev-python/twisted-web/twisted-web-15.1.0.ebuild
new file mode 100644
index 000000000000..008ba36224a3
--- /dev/null
+++ b/dev-python/twisted-web/twisted-web-15.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-15.1.0.ebuild,v 1.1 2015/05/13 08:06:33 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+MY_PN="TwistedWeb"
+DESCRIPTION="Twisted web server, programmable in Python"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="soap"
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
+# putting in question as to whether it is a testsuite
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 8a4da2696126..0a5c7f5dece8 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -3,3 +3,4 @@ DIST TwistedWords-13.2.0.tar.bz2 176411 SHA256 079c4acc179d71058b4c5f802ceda4e3f
 DIST TwistedWords-14.0.0.tar.bz2 165343 SHA256 d7b7a604d8a35b62d255cac034e0890e231c41c0ab15b8756122f3b8e3c69b5a SHA512 22668b45377831be4db536544f6ec59437b8cd30dbd3b3cc72773e5a911bfa16ce9d774b171d4a31e9d1cafd42f8342931b513df27a4fdf60c74620e7cc25d64 WHIRLPOOL bd952477124d17a4b1a2343de363e1c68d92d7b240e7c6efad77a875041705eb6184697a7f5cf7f6283a60ddfb93729ac3d2e5ed15cc1edc568389efb8e2b081
 DIST TwistedWords-14.0.1.tar.bz2 165413 SHA256 e8f3e0bb91a7a69f743e102385f3347c3fbd05dc6f82fd0850d80976f7bf38a1 SHA512 d4e28be50c6893f5e0cee605d764b5cabed1fa100cb988165d330cebb676364eed74d8a8334a23e9fab667135a147d903f57137af3ff30d82c955504133a19c8 WHIRLPOOL 7d74c8146e8b80f9d6981a0393ffe56ae32374f0a109e8a3b47966f8ab3fedcbe5735cab546a3524908866dba5cd73c5cd942f11d289e1d47fe314af125a0cdb
 DIST TwistedWords-14.0.2.tar.bz2 165406 SHA256 f8810b5917da1a90471c6feb487d4ea058e87ae67862f0131dc331f4ad12f4ef SHA512 e551bfe4f1fa6a278a42b2fa295dbdf6b2d416beacf614819ae5a7ad1efb51b0d78cb5bd1c600c2d7a5cb2c3c2d064c0c2284a9b145633595f5cae67bfbb8d63 WHIRLPOOL dcfdccf5bb090b49102fdfea729477a768483b3e314db4968b872746479c94eed326215eb526cd68c992c1ffb89981cc36a8d071f14066ed012b0b6b8bf470dd
+DIST TwistedWords-15.1.0.tar.bz2 166836 SHA256 94863962e5dc339217c2c6dbeb081d78e8976a20bd588f287a23974bf58c1adc SHA512 1b711fea9aabc0d9f3e73e811cabbde41f1e5bdf4573dbe5fcbedb7da480aabe0ed23e006433ad3c425db39277c58804ef408c5d31d2b3e7c2c5564a9a631857 WHIRLPOOL 81e46ef43cf99e99b02348a89aff52d7b96b03180d09e27c9d76cb0887a3ccbfb54541497277d62c196f3cacab2c4b112cf7733df3f8ea5a5605dbb152d45a80
diff --git a/dev-python/twisted-words/twisted-words-15.1.0.ebuild b/dev-python/twisted-words/twisted-words-15.1.0.ebuild
new file mode 100644
index 000000000000..2dea415cec4a
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-15.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-15.1.0.ebuild,v 1.1 2015/05/13 08:07:16 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
new file mode 100644
index 000000000000..d498fec99f3e
--- /dev/null
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -0,0 +1 @@
+DIST ruby-oembed-0.8.14.gem 275456 SHA256 08367b29bd64fe21b388542902ab14736a5afeb06bc85b016d325b987981a336 SHA512 ff4bff8a1788283869b27d0e36f6e44daad6926de8ee033d2cba5bb0360207830bc61ab63977c3de66c17f4f60700adbecb3da8257056b940ef2f4232e5592a9 WHIRLPOOL c349cb8032c28a13f6ee98d9ff7319eb12bcfea120be08da313b60b88462db58bb375d8c806c426410514043a3f31457736e6a081f53c8ab377aa849dd690295
diff --git a/dev-ruby/ruby-oembed/metadata.xml b/dev-ruby/ruby-oembed/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/ruby-oembed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.8.14.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.8.14.ebuild
new file mode 100644
index 000000000000..df40fe1c6287
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.8.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oembed/ruby-oembed-0.8.14.ebuild,v 1.1 2015/05/13 07:09:48 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby."
+HOMEPAGE="https://github.com/judofyr/ruby-oembed"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:1
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/fakeweb
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 1.0"' spec/spec_helper.rb || die
+
+	# Fix broken spec (fix taken from upstream commit)
+	sed -i -e '127,135 s/should_receive/to receive/' spec/providers_spec.rb || die
+}
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
index b7694e727000..5b1b2357255e 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild,v 1.8 2015/04/28 18:34:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0-r1.ebuild,v 1.10 2015/05/13 09:37:21 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://shorturl.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-macos"
 IUSE=""
 
 # All tests require network connectivity.
diff --git a/dev-ruby/snmplib/snmplib-1.2.0.ebuild b/dev-ruby/snmplib/snmplib-1.2.0.ebuild
index f898b68fc7cd..2397fd102e20 100644
--- a/dev-ruby/snmplib/snmplib-1.2.0.ebuild
+++ b/dev-ruby/snmplib/snmplib-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/snmplib-1.2.0.ebuild,v 1.3 2015/04/28 18:41:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/snmplib-1.2.0.ebuild,v 1.5 2015/05/13 09:37:38 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -18,7 +18,7 @@ IUSE=""
 DESCRIPTION="SNMP library implemented in pure Ruby"
 HOMEPAGE="http://snmplib.rubyforge.org/"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="Ruby"
 SLOT="0"
 
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index e64652c0ff48..93467a254031 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1 +1,2 @@
+DIST vcr-1.11.3.gem 87552 SHA256 6dcdd782d631b1464192d47db2a5a86d2325c80a723a4b2970f47da98f006f1d SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a WHIRLPOOL f2c91385bc6dd68340f1a4960f3ec4944afd1907d33c8163ebe99d1e72c5b0f45e665463161654d4a330d2cfad25674b8a8e97a3cf2e1ae309d7ae6c4fd2be09
 DIST vcr-2.9.3.gem 152576 SHA256 041361620a613e18c514b5e680bfbed3a8db69e1ffe5916957ba36966dd92190 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7 WHIRLPOOL 0994aab3f00da3c628fe1ad5e752bc694b6096ace92edeb1d3f5877864a80ffdd4c3d1ce69d0119ca91dae8d72a6172de1901ab4db1c27750bf83f25825c0052
diff --git a/dev-ruby/vcr/vcr-1.11.3.ebuild b/dev-ruby/vcr/vcr-1.11.3.ebuild
new file mode 100644
index 000000000000..dc0be54ac690
--- /dev/null
+++ b/dev-ruby/vcr/vcr-1.11.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/vcr/vcr-1.11.3.ebuild,v 1.1 2015/05/13 06:55:02 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during future test runs."
+HOMEPAGE="https://github.com/myronmarston/vcr/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE="test"
+
+# Tests require all supported HTTP libraries to be present, and it is
+# not possible to avoid some of them without very extensive patches.
+RESTRICT="test"
diff --git a/dev-ruby/vcr/vcr-2.9.3.ebuild b/dev-ruby/vcr/vcr-2.9.3.ebuild
index 18cafc452d6f..8ef3a578e22d 100644
--- a/dev-ruby/vcr/vcr-2.9.3.ebuild
+++ b/dev-ruby/vcr/vcr-2.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/vcr/vcr-2.9.3.ebuild,v 1.1 2015/01/25 09:39:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/vcr/vcr-2.9.3.ebuild,v 1.2 2015/05/13 06:46:44 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/myronmarston/vcr/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
-SLOT="0"
+SLOT="2"
 IUSE="test"
 
 # Tests require all supported HTTP libraries to be present, and it is
diff --git a/dev-util/cpputest/cpputest-3.6.ebuild b/dev-util/cpputest/cpputest-3.6.ebuild
index 7d582e1cf823..89b2503fe9e1 100644
--- a/dev-util/cpputest/cpputest-3.6.ebuild
+++ b/dev-util/cpputest/cpputest-3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cpputest/cpputest-3.6.ebuild,v 1.1 2014/11/29 01:14:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cpputest/cpputest-3.6.ebuild,v 1.3 2015/05/13 09:37:03 ago Exp $
 
 EAPI=5
 inherit autotools-utils
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-util/qstlink2/qstlink2-1.0.3.ebuild b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
index 67dbb2615dcd..c387bc981131 100644
--- a/dev-util/qstlink2/qstlink2-1.0.3.ebuild
+++ b/dev-util/qstlink2/qstlink2-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qstlink2/qstlink2-1.0.3.ebuild,v 1.2 2015/05/12 07:55:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qstlink2/qstlink2-1.0.3.ebuild,v 1.3 2015/05/13 09:39:43 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mobyfab/QStlink2/archive/v1.0.3.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/libusb:0
diff --git a/dev-util/rbtools/rbtools-0.7.2.ebuild b/dev-util/rbtools/rbtools-0.7.2.ebuild
index 67d46960f305..aac81121ba2d 100644
--- a/dev-util/rbtools/rbtools-0.7.2.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.7.2.ebuild,v 1.1 2015/03/10 13:16:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.7.2.ebuild,v 1.3 2015/05/13 09:32:44 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compon
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-util/valkyrie/valkyrie-2.0.0.ebuild b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
index 3be5d4bd7115..632c053dfacd 100644
--- a/dev-util/valkyrie/valkyrie-2.0.0.ebuild
+++ b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-2.0.0.ebuild,v 1.4 2015/05/12 08:40:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-2.0.0.ebuild,v 1.5 2015/05/13 09:40:42 ago Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-util/valgrind-3.6.0
diff --git a/dev-vcs/git/git-2.3.6.ebuild b/dev-vcs/git/git-2.3.6.ebuild
index 750e6f6a1a8e..4653c0bed994 100644
--- a/dev-vcs/git/git-2.3.6.ebuild
+++ b/dev-vcs/git/git-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.6.ebuild,v 1.7 2015/05/13 05:58:57 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.6.ebuild,v 1.8 2015/05/13 06:47:17 jmorgan Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index bca1c525c423..5d0ebbc00e46 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,2 +1,3 @@
 DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c
 DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
+DIST mercurial-3.4.tar.gz 4289081 SHA256 ff1da0545cdd46ebcf473176d55937a22bb55fff51cdff9d4c2f900fc80baf10 SHA512 a61b0d4cf528136991243bb23ac972c11c50ab5681d09f8b2d12cf7d37d3a9d76262f7fe6e7a1834bf6d03e8dc0ebbd9231da982e049e09830341dabefe5d064 WHIRLPOOL 200374186efa25cc22315c6125ead6af9ba2952205f9547d37b33f9bfd3b97b255f0aa29c703793fd4563022b29377cf12689394d921b598396a366a386c8556
diff --git a/dev-vcs/mercurial/mercurial-3.4.ebuild b/dev-vcs/mercurial/mercurial-3.4.ebuild
new file mode 100644
index 000000000000..9d9319db7b3a
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.4.ebuild,v 1.1 2015/05/13 07:10:55 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+	                  *.el mercurial.spec)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/subversion/subversion-1.7.20.ebuild b/dev-vcs/subversion/subversion-1.7.20.ebuild
index 5e48df9493d9..85018e352597 100644
--- a/dev-vcs/subversion/subversion-1.7.20.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.20.ebuild,v 1.1 2015/04/23 11:51:48 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.20.ebuild,v 1.2 2015/05/13 09:23:32 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 11fbda66a68c..ecb5605fe5a5 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,2 +1,3 @@
 DIST tortoisehg-3.3.2.tar.gz 8226128 SHA256 779beb06588897d1c42fc463fecc4b61498f7cac76681fe1c1f017ecd811719a SHA512 4b7e1422731507aa8947b0e8e7746a6daa004186833db200122927c4e5a2f2cb1fbbf12f89089e3ee82d1a22fdb3c7745465188cbf3e14d73d831b953f2b2d9f WHIRLPOOL 34fce6c6383ae94eb4d6fbca854068535ac39b50746dbcc3ee9460976231dc68c3c5f824dc31082838505bdaeaf3620306ceea867d8ac5571d00ee1f1192e867
 DIST tortoisehg-3.3.3.tar.gz 8230380 SHA256 a22ec794b0152b25b085447a253594dde27f71863149b9471ec70669687fb47f SHA512 ed15a2ce76647f6c2d9df2daebc62f983eec6a27ea15a808060d83968cfee2c22f643b2ed6fb48bf06dd5d7cb9f4178e756e539eec2ca43e74fe4c8cfc7da4cf WHIRLPOOL d069dbe4ca109aaf2ebf9dd73f2d87343c2c71a8d5a894a5b7278a5edc878aa7eda56f9d53dca8968d1e730eea94a9f814a5cd76fb4af522a506753a5342cb47
+DIST tortoisehg-3.4.tar.gz 8230401 SHA256 d3ac14e374b551e3f7ebc14f15648250b68f103de3fbfea24fd866110299145c SHA512 9c968529432bc32f8dd1ce14415623687c0b37755fc5de97f6f8acfb395b61084a7ea92501552d77ff162c9394cbebd372423ecbd5986b6b647eb172e74a3388 WHIRLPOOL fc827fc0410d58f6963e0fa12f7d8b509675acfd94d31ca92eb628102d5bdfb3687591302be58ee8bb95b7f502dbb163dd68807f4ad7bf490521f07a08161b01
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild
new file mode 100644
index 000000000000..5d49cd8094e9
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-3.4.ebuild,v 1.1 2015/05/13 07:12:37 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-3.3 <dev-vcs/mercurial-3.5"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	KEYWORDS=""
+	SRC_URI=""
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="http://tortoisehg.bitbucket.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
+	dev-python/qscintilla-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${LINGUAS+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${LINGUAS}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
+	domenu contrib/thg.desktop
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt4 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 17dc420e8b8c..db12cfdfd076 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.668 2015/05/11 03:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.669 2015/05/13 09:12:57 vapier Exp $
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -1824,10 +1824,12 @@ fix_libtool_libdir_paths() {
 	# The libdir might not have any .la files. #548782
 	find "./${dir}" -maxdepth 1 -name '*.la' \
 		-exec sed -i -e "/^libdir=/s:=.*:='${dir}':" {} + || die
-	sed -i \
-		-e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
-		$(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
-		$(find ./${dir}/ -maxdepth 1 -name '*.la') || die
+	# Would be nice to combine these, but -maxdepth can not be specified
+	# on sub-expressions.
+	find "./${PREFIX}"/lib* -maxdepth 3 -name '*.la' \
+		-exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" {} + || die
+	find "./${dir}/" -maxdepth 1 -name '*.la' \
+		-exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" {} + || die
 
 	popd >/dev/null
 }
diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
index a8b449aaf0c2..a4342ef779fa 100644
--- a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
+++ b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild,v 1.1 2014/07/02 05:48:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild,v 1.3 2015/05/13 08:03:52 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/0.58.1-d2x.tar.gz ->
 
 LICENSE="D1X GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdinstall debug demo ipv6 linguas_de +music opengl opl3-musicpack sc55-musicpack"
 REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
 	opl3-musicpack? ( music )
diff --git a/games-action/descent2-data/descent2-data-1.0.ebuild b/games-action/descent2-data/descent2-data-1.0.ebuild
index 2e4f4add0175..cd809852d38b 100644
--- a/games-action/descent2-data/descent2-data-1.0.ebuild
+++ b/games-action/descent2-data/descent2-data-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-data/descent2-data-1.0.ebuild,v 1.10 2015/03/31 02:49:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent2-data/descent2-data-1.0.ebuild,v 1.11 2015/05/13 08:03:39 ago Exp $
 
 EAPI=5
 inherit eutils cdrom games
@@ -18,7 +18,7 @@ SRC_URI=""
 # See readme.txt
 LICENSE="${PN}"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="videos"
 
 # d2x-0.2.5-r2 may include the CD data itself.
diff --git a/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild b/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
index 25208b3b2ff9..c32ed93ef03c 100644
--- a/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
+++ b/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild,v 1.2 2015/05/12 07:56:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/commandergenius/commandergenius-1.8.0.0.ebuild,v 1.3 2015/05/13 09:30:12 ago Exp $
 
 EAPI=5
 CMAKE_IN_SOURCE_BUILD=1
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/clonekeenplus/CGenius/V${PV:0:3}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl tremor"
 RESTRICT="mirror" # contains keen files, but we do not install them
 
diff --git a/games-arcade/performous/performous-1.0.ebuild b/games-arcade/performous/performous-1.0.ebuild
index d4e7732a151e..07e563c8e1fe 100644
--- a/games-arcade/performous/performous-1.0.ebuild
+++ b/games-arcade/performous/performous-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-1.0.ebuild,v 1.2 2015/05/12 08:41:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-1.0.ebuild,v 1.3 2015/05/13 09:28:12 ago Exp $
 
 EAPI=5
 CMAKE_REMOVE_MODULES="yes"
@@ -27,7 +27,7 @@ LICENSE="GPL-2
 		CC-BY-NC-ND-2.5
 	)"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="midi songs tools webcam"
 
 RDEPEND="dev-cpp/glibmm
diff --git a/games-misc/lolcat/files/lolcat-42.1.0-paint.patch b/games-misc/lolcat/files/lolcat-42.1.0-paint.patch
new file mode 100644
index 000000000000..6b62b6bd933c
--- /dev/null
+++ b/games-misc/lolcat/files/lolcat-42.1.0-paint.patch
@@ -0,0 +1,11 @@
+--- all.orig/lolcat-42.1.0/lolcat.gemspec	2015-05-13 01:21:05.898321678 -0400
++++ all/lolcat-42.1.0/lolcat.gemspec	2015-05-13 02:02:11.987935841 -0400
+@@ -12,7 +12,7 @@
+   s.summary     = %q{Okay, no unicorns. But rainbows!!}
+ 
+   s.add_development_dependency "rake"
+-  s.add_dependency "paint", "~> 0.8.3"
++  s.add_dependency "paint"
+   s.add_dependency "trollop", "~> 1.16.2"
+ 
+   s.files         = `git ls-files`.split("\n")
diff --git a/games-misc/lolcat/lolcat-42.1.0.ebuild b/games-misc/lolcat/lolcat-42.1.0.ebuild
index 06147abf00d7..74652067e640 100644
--- a/games-misc/lolcat/lolcat-42.1.0.ebuild
+++ b/games-misc/lolcat/lolcat-42.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.1.0.ebuild,v 1.2 2015/02/06 10:12:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.1.0.ebuild,v 1.3 2015/05/13 07:13:34 mr_bones_ Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -18,5 +18,7 @@ LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RUBY_PATCHES=( "${FILESDIR}"/${P}-paint.patch )
+
 ruby_add_rdepend ">=dev-ruby/trollop-1.16.2-r3:0
 	dev-ruby/paint"
diff --git a/games-misc/nyancat/nyancat-1.2.1.ebuild b/games-misc/nyancat/nyancat-1.2.1.ebuild
index 0269acb386dc..d9a6c6c8c0f3 100644
--- a/games-misc/nyancat/nyancat-1.2.1.ebuild
+++ b/games-misc/nyancat/nyancat-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/nyancat/nyancat-1.2.1.ebuild,v 1.2 2015/05/12 08:41:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/nyancat/nyancat-1.2.1.ebuild,v 1.3 2015/05/13 09:28:46 ago Exp $
 
 EAPI=5
 inherit games
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_compile() {
diff --git a/games-simulation/openttd/openttd-1.5.0.ebuild b/games-simulation/openttd/openttd-1.5.0.ebuild
index 6c85d5ef728c..77a424f08660 100644
--- a/games-simulation/openttd/openttd-1.5.0.ebuild
+++ b/games-simulation/openttd/openttd-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.5.0.ebuild,v 1.2 2015/05/08 12:12:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.5.0.ebuild,v 1.3 2015/05/13 09:29:20 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
 RESTRICT="test" # needs a graphics set in order to test
 
diff --git a/games-sports/ski/ski-6.9.ebuild b/games-sports/ski/ski-6.9.ebuild
index db9eb3530747..863ec42cc84f 100644
--- a/games-sports/ski/ski-6.9.ebuild
+++ b/games-sports/ski/ski-6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.9.ebuild,v 1.2 2015/04/28 07:16:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.9.ebuild,v 1.3 2015/05/13 09:27:53 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-strategy/wesnoth/wesnoth-1.12.2.ebuild b/games-strategy/wesnoth/wesnoth-1.12.2.ebuild
index da28ac51154b..9797f94b611a 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.12.2.ebuild,v 1.2 2015/05/12 07:56:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.12.2.ebuild,v 1.3 2015/05/13 09:29:55 ago Exp $
 
 EAPI=5
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
diff --git a/games-util/nml/nml-0.4.0.ebuild b/games-util/nml/nml-0.4.0.ebuild
index f475c615f6a9..2d29af010bfe 100644
--- a/games-util/nml/nml-0.4.0.ebuild
+++ b/games-util/nml/nml-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.4.0.ebuild,v 1.2 2015/05/12 07:56:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.4.0.ebuild,v 1.3 2015/05/13 09:29:38 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{3_3,3_4} )
@@ -15,7 +15,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/nml-${PV}.r5527-3b43d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
index 9e1f4f69e495..3e83080ae802 100644
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
+++ b/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild,v 1.4 2015/04/29 17:23:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild,v 1.6 2015/05/13 09:33:03 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-base
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 else
 	KEYWORDS=""
diff --git a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
index d9f5c147e21a..fa33fcff4e2a 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 1.20 2015/05/13 05:41:20 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.4.0.ebuild,v 1.22 2015/05/13 07:00:41 jmorgan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="+berkdb qmail ssl doc ldap mysql postgres sqlite ipv6"
 
 REQUIRED_USE="|| ( berkdb mysql postgres sqlite )"
diff --git a/mail-mta/courier/courier-0.74.1-r1.ebuild b/mail-mta/courier/courier-0.74.1-r1.ebuild
index 9a4ce8caf93e..1de406701a63 100644
--- a/mail-mta/courier/courier-0.74.1-r1.ebuild
+++ b/mail-mta/courier/courier-0.74.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.74.1-r1.ebuild,v 1.3 2015/05/03 11:50:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.74.1-r1.ebuild,v 1.4 2015/05/13 07:55:56 ago Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies:
 # ~arm ~s390 ~ppc64 ~alpha ~hppa ~ia64 ~ppc ~sparc ~x86
-KEYWORDS="~amd64 ~arm hppa ~x86"
+KEYWORDS="amd64 ~arm hppa ~x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 
diff --git a/media-gfx/pydot/pydot-1.0.28-r2.ebuild b/media-gfx/pydot/pydot-1.0.28-r2.ebuild
index f00b95a08fdf..6bbf9ddad281 100644
--- a/media-gfx/pydot/pydot-1.0.28-r2.ebuild
+++ b/media-gfx/pydot/pydot-1.0.28-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r2.ebuild,v 1.10 2015/04/21 19:04:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r2.ebuild,v 1.11 2015/05/13 06:59:03 jmorgan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://pydot.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/aubio/aubio-0.4.1.ebuild b/media-libs/aubio/aubio-0.4.1.ebuild
index 378f927c2a16..fa6c874ea98f 100644
--- a/media-libs/aubio/aubio-0.4.1.ebuild
+++ b/media-libs/aubio/aubio-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.4.1.ebuild,v 1.1 2015/03/11 09:22:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aubio/aubio-0.4.1.ebuild,v 1.3 2015/05/13 09:36:35 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://aubio.org//pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python"
 
 RDEPEND="
diff --git a/media-libs/glfw/glfw-3.1.1.ebuild b/media-libs/glfw/glfw-3.1.1.ebuild
index 46780c991f35..271a9bd69136 100644
--- a/media-libs/glfw/glfw-3.1.1.ebuild
+++ b/media-libs/glfw/glfw-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-3.1.1.ebuild,v 1.3 2015/05/12 08:41:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-3.1.1.ebuild,v 1.4 2015/05/13 09:29:03 ago Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="egl examples"
 
 RDEPEND="x11-libs/libXrandr
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
index 2a1f2789a345..282cdfafe6a7 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild,v 1.1 2015/03/11 09:38:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild,v 1.3 2015/05/13 09:36:38 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=media-libs/aubio-0.4.1
diff --git a/media-sound/a2jmidid/a2jmidid-8-r1.ebuild b/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
index 4dbff719becc..da58efd8fecf 100644
--- a/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/a2jmidid-8-r1.ebuild,v 1.3 2015/05/12 08:41:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/a2jmidid-8-r1.ebuild,v 1.4 2015/05/13 09:26:10 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ SRC_URI="http://download.gna.org/a2jmidid/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 RDEPEND="media-libs/alsa-lib
diff --git a/media-sound/aqualung/aqualung-1.0_rc1.ebuild b/media-sound/aqualung/aqualung-1.0_rc1.ebuild
index 70809e370f6a..8fa1f27acc79 100644
--- a/media-sound/aqualung/aqualung-1.0_rc1.ebuild
+++ b/media-sound/aqualung/aqualung-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-1.0_rc1.ebuild,v 1.2 2015/04/26 16:06:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-1.0_rc1.ebuild,v 1.3 2015/05/13 08:44:22 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua
 	mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6c54c641ec06..5c3f6bd76f51 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2015 06:36:56 +0000
+Wed, 13 May 2015 13:06:51 +0000
diff --git a/metadata/glsa/glsa-201505-01.xml b/metadata/glsa/glsa-201505-01.xml
new file mode 100644
index 000000000000..39ca97310d0c
--- /dev/null
+++ b/metadata/glsa/glsa-201505-01.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201505-01">
+  <title>Ettercap: Multiple vulnerabilities </title>
+  <synopsis>Multiple vulnerabilities have been found in Ettercap, the worst of
+    which allows remote attackers to execute arbitrary code. 
+  </synopsis>
+  <product type="ebuild">ettercap</product>
+  <announced>May 13, 2015</announced>
+  <revised>May 13, 2015: 1</revised>
+  <bug>532764</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-analyzer/ettercap" auto="yes" arch="*">
+      <unaffected range="ge">0.8.2</unaffected>
+      <vulnerable range="lt">0.8.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Ettercap is a comprehensive suite for man in the middle attacks.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Ettercap. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Ettercap users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-analyzer/ettercap-0.8.2"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-6395">CVE-2014-6395</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-6396">CVE-2014-6396</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9376">CVE-2014-9376</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9377">CVE-2014-9377</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9378">CVE-2014-9378</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9379">CVE-2014-9379</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9380">CVE-2014-9380</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9381">CVE-2014-9381</uri>
+  </references>
+  <metadata tag="requester" timestamp="Mon, 06 Apr 2015 04:38:40 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Wed, 13 May 2015 09:24:38 +0000">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dab8f2a3ef60..b39197c2b20d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2015 06:36:57 +0000
+Wed, 13 May 2015 13:06:52 +0000
diff --git a/metadata/md5-cache/app-accessibility/festival-2.1-r1 b/metadata/md5-cache/app-accessibility/festival-2.1-r1
index a0d5766493c5..0a0136ebac75 100644
--- a/metadata/md5-cache/app-accessibility/festival-2.1-r1
+++ b/metadata/md5-cache/app-accessibility/festival-2.1-r1
@@ -3,10 +3,10 @@ DEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2
 DESCRIPTION=Festival Text to Speech engine
 EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/festival/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=FESTIVAL HPND BSD rc regexp-UofT free-noncomm
 RDEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/festival-2.1-release.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_CMU.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_OALD.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_POSLEX.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_awb_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_rms_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_slt_arctic_hts.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_rablpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_kallpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0b2e7411b0121fed4823c579e7773b80
+_md5_=603292b1512ebed4db0782d9c252afc4
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2 b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2
index 2e73d0904e27..d86962e01268 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Speech tools for Festival Text to Speech engine
 EAPI=5
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz http://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=39ac7dcad2eb4ca4a347aef072cb71ef
+_md5_=6bf441a0fc0ab8c9b39c60502050248e
diff --git a/metadata/md5-cache/app-admin/ansible-1.8.4 b/metadata/md5-cache/app-admin/ansible-1.8.4
deleted file mode 100644
index 8a0a6720dd55..000000000000
--- a/metadata/md5-cache/app-admin/ansible-1.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
-EAPI=5
-HOMEPAGE=http://ansible.com/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible/ansible-1.8.4.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=8704e9d29743cc9301ab0f30c9a1e88c
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.0.1 b/metadata/md5-cache/app-admin/ansible-1.9.0.1
index add3391fc9c0..76776fa3cbb4 100644
--- a/metadata/md5-cache/app-admin/ansible-1.9.0.1
+++ b/metadata/md5-cache/app-admin/ansible-1.9.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Radically simple deployment, model-driven configuration management,
 EAPI=5
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-1.9.0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ae4a0142dde964e42095e247f4e4fa31
+_md5_=29242e58a566a0192e12d28d5d02323f
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r3 b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r3
index ded261805646..189af5e650cf 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r3
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Single process stack of various system monitors
 EAPI=5
 HOMEPAGE=http://www.gkrellm.net/
 IUSE=gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl:0= ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gtk+:2 x11-libs/pango )
 SLOT=2
 SRC_URI=http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.5.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4366ba7acda793ac240100a1d9e1f706
+_md5_=0aec04d9d371c1a64b452eb59e1cabb3
diff --git a/metadata/md5-cache/app-admin/logrotate-3.8.9 b/metadata/md5-cache/app-admin/logrotate-3.8.9
index 76834f794593..5a4d935dfe4a 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.8.9
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.9
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl selinux
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) virtual/cron
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.9.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=80e3fccb9cdc124ed06ef533924c4d1b
+_md5_=632db17c75ad96085d1fb56ef350df0a
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.0.2 b/metadata/md5-cache/app-admin/mongo-tools-3.0.3
similarity index 78%
rename from metadata/md5-cache/app-admin/mongo-tools-3.0.2
rename to metadata/md5-cache/app-admin/mongo-tools-3.0.3
index 020ffd1c235e..beb165401f9f 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-3.0.2
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.0.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!<dev-db/mongodb-3.0.0
 SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.0.2.tar.gz -> mongo-tools-3.0.2.tar.gz
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.0.3.tar.gz -> mongo-tools-3.0.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=a1e40a9ad3a7224a62d5fb393328a152
+_md5_=deb84df6d04dd228a008c300c4cdfcbb
diff --git a/metadata/md5-cache/app-admin/monit-5.12.2 b/metadata/md5-cache/app-admin/monit-5.12.2
index b74f29a312fd..41d49913cbf3 100644
--- a/metadata/md5-cache/app-admin/monit-5.12.2
+++ b/metadata/md5-cache/app-admin/monit-5.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=a utility for monitoring and managing daemons or similar programs ru
 EAPI=5
 HOMEPAGE=http://mmonit.com/monit/
 IUSE=pam ssl
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=GPL-3
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.12.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=520b738ef2acaed8aa626c5faeab81f2
+_md5_=af9528495088955fa22a9054ef397e44
diff --git a/metadata/md5-cache/app-admin/testdisk-6.14 b/metadata/md5-cache/app-admin/testdisk-6.14
index 965aa26cbc8b..cf4abaa176b4 100644
--- a/metadata/md5-cache/app-admin/testdisk-6.14
+++ b/metadata/md5-cache/app-admin/testdisk-6.14
@@ -4,10 +4,10 @@ DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery
 EAPI=5
 HOMEPAGE=http://www.cgsecurity.org/wiki/TestDisk
 IUSE=jpeg ntfs reiserfs static
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( sys-apps/util-linux >=sys-libs/ncurses-5.2 jpeg? ( virtual/jpeg:* ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.cgsecurity.org/testdisk-6.14.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=30f1f625b756134dcd6bffceb8a92102
+_md5_=00793294c1d2dc5e105160b79c780dac
diff --git a/metadata/md5-cache/app-cdr/k3b-2.0.3-r1 b/metadata/md5-cache/app-cdr/k3b-2.0.3-r1
index 96b8ffd3dc59..1d400ee6c096 100644
--- a/metadata/md5-cache/app-cdr/k3b-2.0.3-r1
+++ b/metadata/md5-cache/app-cdr/k3b-2.0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The CD/DVD Kreator for KDE
 EAPI=5
 HOMEPAGE=http://www.k3b.org/
 IUSE=debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis linguas_ast linguas_be linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_ku linguas_lt linguas_lv linguas_mai linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2 FDL-1.2
 RDEPEND=|| ( kde-apps/libkcddb:4 >=kde-base/libkcddb-4.4:4[aqua=] ) media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) >=kde-base/kdelibs-4.4:4[aqua=,udev,udisks(+)] app-cdr/cdrdao media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) linguas_ast? ( || ( kde-apps/kde-l10n[linguas_ast(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ast(+)] ) ) linguas_be? ( || ( kde-apps/kde-l10n[linguas_be(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_csb? ( || ( kde-apps/kde-l10n[linguas_csb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_csb(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_eu? ( || ( kde-apps/kde-l10n[linguas_eu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_he? ( || ( kde-apps/kde-l10n[linguas_he(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) ) linguas_hi? ( || ( kde-apps/kde-l10n[linguas_hi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) ) linguas_hne? ( || ( kde-apps/kde-l10n[linguas_hne(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) ) linguas_hr? ( || ( kde-apps/kde-l10n[linguas_hr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_is? ( || ( kde-apps/kde-l10n[linguas_is(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_kk? ( || ( kde-apps/kde-l10n[linguas_kk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_ko? ( || ( kde-apps/kde-l10n[linguas_ko(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) ) linguas_ku? ( || ( kde-apps/kde-l10n[linguas_ku(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ku(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_lv? ( || ( kde-apps/kde-l10n[linguas_lv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) ) linguas_mai? ( || ( kde-apps/kde-l10n[linguas_mai(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_nn? ( || ( kde-apps/kde-l10n[linguas_nn(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) ) linguas_oc? ( || ( kde-apps/kde-l10n[linguas_oc(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_se? ( || ( kde-apps/kde-l10n[linguas_se(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@ijekavian? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavian(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) ) linguas_sr@ijekavianlatin? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavianlatin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) ) linguas_sr@latin? ( || ( kde-apps/kde-l10n[linguas_sr@latin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_th? ( || ( kde-apps/kde-l10n[linguas_th(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=dev-qt/qtmultimedia-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 REQUIRED_USE=mp3? ( encode ) sox? ( encode )
 SLOT=4
 SRC_URI=mirror://kde/stable/k3b/k3b-2.0.3a.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=41442a4add70d66337c17e78e2312cd7
+_md5_=1d5205bbbd6760c911e53faa7006da75
diff --git a/metadata/md5-cache/app-crypt/xca-1.1.0 b/metadata/md5-cache/app-crypt/xca-1.1.0
index f3a1bbf0c33e..8d61931872a1 100644
--- a/metadata/md5-cache/app-crypt/xca-1.1.0
+++ b/metadata/md5-cache/app-crypt/xca-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests an
 EAPI=5
 HOMEPAGE=http://xca.sourceforge.net
 IUSE=bindist
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-0.9.8[bindist=] dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/xca/xca-1.1.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=d846425ab004db1fd084565f3190d4a5
+_md5_=ff291cbdaa9faad48e0e9d1f82fca3af
diff --git a/metadata/md5-cache/app-editors/mg-20150323 b/metadata/md5-cache/app-editors/mg-20150323
index 7c64514155c7..3464009f330e 100644
--- a/metadata/md5-cache/app-editors/mg-20150323
+++ b/metadata/md5-cache/app-editors/mg-20150323
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=5
 HOMEPAGE=http://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=~alpha ~amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
 SRC_URI=http://homepage.boetes.org/software/mg/mg-20150323.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ed0c358ad4f375ac140719c5801664d1
+_md5_=d094924c70847ebe445ba21586edeae0
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2 b/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2
index b0cf81443871..ba2e8a4d7673 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2
@@ -4,11 +4,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
 IUSE=audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen elibc_glibc systemd
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:0 sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=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 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( 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 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=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 )
 SLOT=0/1.2.14
 SRC_URI=http://libvirt.org/sources/libvirt-1.2.14.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	25e9476cdec14dfb0af32f4c83c3f297	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7158ee0f976ea2627380fd7fe0e7f7a8
+_md5_=bb50287fee03480faa3b1f909d996758
diff --git a/metadata/md5-cache/app-misc/dvtm-0.11 b/metadata/md5-cache/app-misc/dvtm-0.11
index dabc500edefc..574934681c2f 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.11
+++ b/metadata/md5-cache/app-misc/dvtm-0.11
@@ -4,10 +4,10 @@ DESCRIPTION=Dynamic virtual terminal manager
 EAPI=5
 HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
 IUSE=unicode savedconfig
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.11.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=f85cfd72199fbeef53617c34c1bd9db0
+_md5_=059dbe598b7bdf475605d75d62272560
diff --git a/metadata/md5-cache/app-office/odeskteam-3.12.9 b/metadata/md5-cache/app-office/odeskteam-3.12.9
index 69839658a2a6..32c3be3b3347 100644
--- a/metadata/md5-cache/app-office/odeskteam-3.12.9
+++ b/metadata/md5-cache/app-office/odeskteam-3.12.9
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Project collaboration and tracking software for oDesk.com
 EAPI=5
 HOMEPAGE=https://www.odesk.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ODESK
 RDEPEND=|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] ) >=dev-libs/glib-2 app-arch/bzip2 dev-libs/libxml2 dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 media-libs/glu media-libs/mesa sys-libs/glibc x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXi
 SLOT=0
 SRC_URI=amd64? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.12.9.x86_64.rpm ) x86? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.12.9.i386.rpm )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=150b8e8bd6ad154203c651e62f4c64a2
+_md5_=d3817abe55bbf860e1f3eb37a6566e21
diff --git a/metadata/md5-cache/app-office/skrooge-1.10.0 b/metadata/md5-cache/app-office/skrooge-1.10.0
index eafa555058b7..e0f4b46056e9 100644
--- a/metadata/md5-cache/app-office/skrooge-1.10.0
+++ b/metadata/md5-cache/app-office/skrooge-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=personal finances manager for KDE4, aiming at being simple and intui
 EAPI=5
 HOMEPAGE=http://www.skrooge.org/
 IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_ko linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] app-crypt/qca:2[qt4(+)] dev-db/sqlite:3 dev-libs/grantlee:0 >=dev-libs/libofx-0.9.1 dev-libs/qjson dev-qt/qtsql:4[sqlite] >=kde-base/kde-dev-scripts-4.4:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_ia? ( || ( kde-apps/kde-l10n[linguas_ia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ia(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_ko? ( || ( kde-apps/kde-l10n[linguas_ko(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/skrooge/skrooge-1.10.0.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=426e4e92375fb83253b506e239eb8e14
+_md5_=eb74caf21fa795722cff9d3aacd4a615
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.30 b/metadata/md5-cache/app-officeext/ooofbtools-2.30
deleted file mode 100644
index 5ddddfee610f..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm unpack
-DEPEND=app-arch/unzip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) ) app-arch/unzip
-DESCRIPTION=Extension for converting and processing eBooks in FictionBook2 format with validator
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) )
-REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.30.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	office-ext-r1	370fdf6c0ffd835405efe2e8e16d1771	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=a37a392d3a9242397d35a76f96eb0792
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.31 b/metadata/md5-cache/app-officeext/ooofbtools-2.31
deleted file mode 100644
index c2fc20c3187b..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm unpack
-DEPEND=app-arch/unzip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) ) app-arch/unzip
-DESCRIPTION=Extension for converting and processing eBooks in FictionBook2 format with validator
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) )
-REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.31.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	office-ext-r1	370fdf6c0ffd835405efe2e8e16d1771	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=47833b3daa6c00993c8a7f936ef9689b
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.34 b/metadata/md5-cache/app-officeext/ooofbtools-2.34
index 5a4835889b93..54003e71bacb 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.34
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.34
@@ -4,11 +4,11 @@ DESCRIPTION=Extension for converting and processing eBooks in FictionBook2 forma
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/fbtools/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
 SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.34.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	office-ext-r1	370fdf6c0ffd835405efe2e8e16d1771	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=e885bc88236acb0e0af81da53a9c608e
+_md5_=066733b5b465f86f246804dc2042baf2
diff --git a/metadata/md5-cache/app-portage/portpeek-2.1.18 b/metadata/md5-cache/app-portage/portpeek-2.1.18
index e1558ddb3949..1e3b1b481547 100644
--- a/metadata/md5-cache/app-portage/portpeek-2.1.18
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.18
@@ -4,11 +4,11 @@ DESCRIPTION=A helper program for maintaining the package.keyword and package.unm
 EAPI=5
 HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ppc sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=app-portage/gentoolkit-0.3.0.9-r2 >=sys-apps/portage-2.2.8-r1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.18.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=dcfb3e0258455f0f157482ed89b38c1f
+_md5_=150bf63b8469eaa72bd5e187b4c9bf70
diff --git a/metadata/md5-cache/dev-db/mongodb-3.0.2 b/metadata/md5-cache/dev-db/mongodb-3.0.3
similarity index 90%
rename from metadata/md5-cache/dev-db/mongodb-3.0.2
rename to metadata/md5-cache/dev-db/mongodb-3.0.3
index a259f62bb5f0..690f75154cbc 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.0.2
+++ b/metadata/md5-cache/dev-db/mongodb-3.0.3
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.mongodb.org
 IUSE=debug kerberos mms-agent ssl +tools
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.0.2 )
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.0.3 )
 RDEPEND=app-arch/snappy >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.50[threads(+)] >=dev-libs/libpcre-8.30[cxx] dev-libs/snowball-stemmer dev-util/google-perftools[-minimal] net-libs/libpcap sys-libs/zlib mms-agent? ( app-admin/mms-agent ) ssl? ( >=dev-libs/openssl-1.0.1g:= )
 SLOT=0
-SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r3.0.2.tar.gz
+SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r3.0.3.tar.gz
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e74eda885ab5bdc3f871bb03e60ca083
+_md5_=c45bc753990aa20c28673ac95ce2d819
diff --git a/metadata/md5-cache/dev-db/sqlite-3.8.10.1 b/metadata/md5-cache/dev-db/sqlite-3.8.10.1
index 4da10e993768..e287840cfeee 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.8.10.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2015/sqlite-doc-3081001.zip ) tcl? ( http://sqlite.org/2015/sqlite-src-3081001.zip ) test? ( http://sqlite.org/2015/sqlite-src-3081001.zip ) tools? ( http://sqlite.org/2015/sqlite-src-3081001.zip ) !tcl? ( !test? ( !tools? ( http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz ) ) )
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0e62b941414c9fb08ac750dc810b5940
+_md5_=9f0c52e6dcb4e2c128eefc7d6b4b39e2
diff --git a/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.3-r1 b/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.3-r1
index fbd5277f73a8..c63ce619c21e 100644
--- a/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.3-r1
+++ b/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.3-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-embedded/libftdi dev-libs/confuse
+DEPEND=<dev-embedded/libftdi-1 dev-libs/confuse
 DESCRIPTION=Utility to program external EEPROM for FTDI USB chips
 EAPI=4
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
-RDEPEND=dev-embedded/libftdi dev-libs/confuse
+RDEPEND=<dev-embedded/libftdi-1 dev-libs/confuse
 SLOT=0
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/ftdi_eeprom-0.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c0835d19a9b363132e183d7a5aecd756
+_md5_=25dba7a345599a8da4ba0183faaba96a
diff --git a/metadata/md5-cache/dev-embedded/ftdi_eeprom-1.0 b/metadata/md5-cache/dev-embedded/ftdi_eeprom-1.0
new file mode 100644
index 000000000000..11a99491dd86
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/ftdi_eeprom-1.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=setup
+DESCRIPTION=Utility to program external EEPROM for FTDI USB chips
+EAPI=4
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-embedded/libftdi[tools]
+SLOT=0
+_md5_=a425f0dbaf24417bee51c5336e696c5c
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2 b/metadata/md5-cache/dev-embedded/libftdi-1.2
new file mode 100644
index 000000000000..7a50e8d1c886
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Userspace access to FTDI USB interface chips
+EAPI=4
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+IUSE=cxx doc examples python static-libs tools
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse )
+SLOT=0
+SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=05d309cc29bee5737a469223a6ad096d
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index 2459521f5bcf..7fce8dc071a1 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( dev-libs/confuse ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
 DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=4
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
 IUSE=cxx doc examples python static-libs tools
 LICENSE=LGPL-2
-RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( dev-libs/confuse )
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse )
 SLOT=0
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6fc90a0497f9486a7b89835d80692065
+_md5_=5117a414cb6e49219e1dcd192c03fe24
diff --git a/metadata/md5-cache/dev-games/ogre-1.9.0-r1 b/metadata/md5-cache/dev-games/ogre-1.9.0-r1
index f3f16f9bf5d9..6763850faded 100644
--- a/metadata/md5-cache/dev-games/ogre-1.9.0-r1
+++ b/metadata/md5-cache/dev-games/ogre-1.9.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Object-oriented Graphics Rendering Engine
 EAPI=5
 HOMEPAGE=http://www.ogre3d.org/
 IUSE=+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT public-domain
 RDEPEND=media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( >=media-libs/mesa-9.0.0[gles2] ) gles3? ( >=media-libs/mesa-10.0.0[gles2] ) gl3plus? ( >=media-libs/mesa-9.2.5 ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )
 REQUIRED_USE=threads? ( ^^ ( boost poco tbb ) ) poco? ( threads ) tbb? ( threads ) ?? ( gl3plus ( || ( gles2 gles3 ) ) ) gles3? ( gles2 ) gl3plus? ( opengl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/1.9.0
 SRC_URI=https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.bz2 -> ogre-1.9.0.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=eb88b6836fb8ac9ccd11574326cfc044
+_md5_=73626e500859c40fdb28fe3161fc2ab5
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
index 29119be177c5..a5d858402ddf 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
@@ -4,10 +4,10 @@ DESCRIPTION=A JNI code generator based on the generator used by the Eclipse SWT
 EAPI=5
 HOMEPAGE=https://github.com/fusesource/hawtjni
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8db06025bbfdcbb666604eca449c9e72
+_md5_=1302e56c3b1f8ff315e5b4521ee4e86b
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1 b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
index a70a3c0fc1b6..f6f837f051e6 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=library to smooth charset/localization issues
 EAPI=5
 HOMEPAGE=http://natspec.sourceforge.net/
 IUSE=doc python python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=d37d73d3a1ac9669c62aa0c2da6ef0c4
+_md5_=56f35fe4c153fef57ee435610753b2bb
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.25 b/metadata/md5-cache/dev-libs/libnl-3.2.25
index ad415bdfb6cc..76c95e745624 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.25
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.25
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of libraries providing APIs to netlink protocol based L
 EAPI=5
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/
 IUSE=static-libs python utils python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=3
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b12b03211fc4c2279b9f638c5ccbc022
+_md5_=f7328ee232c2c218b37687ebecff4fae
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.5 b/metadata/md5-cache/dev-libs/libtasn1-4.5
index 8c4963f9f801..df2611603566 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.5
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.5
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.5.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=f49f20b13e0b3a62d1a4de3bcc5f23ab
+_md5_=cb2b6005bf50585252134840121c05be
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p6 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p6
index b7726faa8b89..b1e91209b190 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p6
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p6
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=5
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=openssl
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zf.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=cfcf15a349001e38e723220dca1fc2f8
+_md5_=8b09b524e17dfe6e9c77e3ebe7e84ae9
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1m b/metadata/md5-cache/dev-libs/openssl-1.0.1m
index 38aa84570c5e..5408f4c2f6d2 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1m
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1m
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=4
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1m.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=86c2fee848271dafe73a83cf17bc6af9
+_md5_=00967bfa1d5558285c912655a6b2637e
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
index d3b4ec724b5e..ddf9ab73b193 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 DESCRIPTION=Look up country by IP Address
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Geo-IP/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.45.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=715cc2f7c62193d0d07b2c1e2a77c6ef
+_md5_=56ebe90353743113f0ad70e7f5bcee64
diff --git a/metadata/md5-cache/dev-perl/Net-Patricia-1.210.0-r1 b/metadata/md5-cache/dev-perl/Net-Patricia-1.210.0-r1
index a70aa76390c8..03db7f2e942a 100644
--- a/metadata/md5-cache/dev-perl/Net-Patricia-1.210.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Patricia-1.210.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Patricia Trie perl module for fast IP address lookups
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Net-Patricia/
 IUSE=ipv6
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=dev-perl/Net-CIDR-Lite ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.21.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=a6b4ef8c24ee1bd48bc18348523dd86a
+_md5_=eb4659769ff134582247c2ab00b150dc
diff --git a/metadata/md5-cache/dev-php/pecl-geoip-1.1.0 b/metadata/md5-cache/dev-php/pecl-geoip-1.1.0
index 1dc699f8f8cf..77dcdccf6cd7 100644
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.1.0
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=PHP extension to map IP address to geographic places
 EAPI=5
 HOMEPAGE=http://pecl.php.net/geoip
 IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3
 RDEPEND=>=dev-libs/geoip-1.4.0 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/geoip-1.1.0.tgz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	b4d5827d04ab9f22f094e1ecab1df639	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=8c36308ec8fc59049bfd87535bd7c9e5
+_md5_=4a32480b718e226ddd224760aea27915
diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.2.14 b/metadata/md5-cache/dev-python/libvirt-python-1.2.14
index 8adffa0e30f6..10cec9f1d253 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-1.2.14
+++ b/metadata/md5-cache/dev-python/libvirt-python-1.2.14
@@ -4,7 +4,7 @@ DESCRIPTION=libvirt Python bindings
 EAPI=5
 HOMEPAGE=http://www.libvirt.org
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/1.2.14 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.2.14.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=805b679c3af1797083b02f9a085c6a47
+_md5_=e8b0158daa9498ae4c166bf9a44e1637
diff --git a/metadata/md5-cache/dev-python/lxml-3.3.5 b/metadata/md5-cache/dev-python/lxml-3.3.5
index f35f4cb4c4e8..2131a99e40f2 100644
--- a/metadata/md5-cache/dev-python/lxml-3.3.5
+++ b/metadata/md5-cache/dev-python/lxml-3.3.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.3.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=e60ab3b0e34d1960821d9235e38949f4
+_md5_=e413d65ce016d0c0bf0aef9f09f18570
diff --git a/metadata/md5-cache/dev-python/lxml-3.4.4 b/metadata/md5-cache/dev-python/lxml-3.4.4
new file mode 100644
index 000000000000..54fa1085ce3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxml-3.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.23 beautifulsoup3? ( python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/beautifulsoup:python-3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/cssselect[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
+EAPI=5
+HOMEPAGE=http://lxml.de/ http://pypi.python.org/pypi/lxml/
+IUSE=beautifulsoup3 doc examples +threads test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~arm64
+LICENSE=BSD ElementTree GPL-2 PSF-2
+RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.23 beautifulsoup3? ( python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/beautifulsoup:python-3[python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/l/lxml/lxml-3.4.4.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=6b4d036da5bb2b2943a8c6262189ebea
diff --git a/metadata/md5-cache/dev-python/openpyxl-1.7.0 b/metadata/md5-cache/dev-python/openpyxl-1.7.0
deleted file mode 100644
index 6914e0c6af59..000000000000
--- a/metadata/md5-cache/dev-python/openpyxl-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-DESCRIPTION=Pure python reader and writer of Excel OpenXML files
-EAPI=5
-HOMEPAGE=http://bitbucket.org/ericgazoni/openpyxl-328/wiki/Home
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
-SLOT=0
-SRC_URI=https://bitbucket.org/ericgazoni/openpyxl-328/get/1.7.0.tar.bz2 -> openpyxl-1.7.0.tar.bz2
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=5cc10f4ec66a9798b6d0d905efcc0de9
diff --git a/metadata/md5-cache/dev-python/openpyxl-1.9.0 b/metadata/md5-cache/dev-python/openpyxl-1.9.0
deleted file mode 100644
index b8892b7c5524..000000000000
--- a/metadata/md5-cache/dev-python/openpyxl-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-DESCRIPTION=Pure python reader and writer of Excel OpenXML files
-EAPI=5
-HOMEPAGE=http://bitbucket.org/ericgazoni/openpyxl-328/wiki/Home
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
-SLOT=0
-SRC_URI=https://bitbucket.org/ericgazoni/openpyxl-328/get/1.9.0.tar.bz2 -> openpyxl-1.9.0.tar.bz2
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=856ff26c67974f77fd1f03340c80fed1
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.1.0 b/metadata/md5-cache/dev-python/openpyxl-2.1.0
index 28261842f2ea..139ce07a3ac7 100644
--- a/metadata/md5-cache/dev-python/openpyxl-2.1.0
+++ b/metadata/md5-cache/dev-python/openpyxl-2.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=test? ( dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Pure python reader and writer of Excel OpenXML files
 EAPI=5
-HOMEPAGE=http://bitbucket.org/ericgazoni/openpyxl-328/wiki/Home
+HOMEPAGE=http://openpyxl.readthedocs.org
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=https://bitbucket.org/ericgazoni/openpyxl-328/get/2.1.0.tar.bz2 -> openpyxl-2.1.0.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=123956e7b2ad53911d6cdc4e38a8da33
+_md5_=36a6ff6c2990dd73cb3b2ac32f51cd09
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.0.2 b/metadata/md5-cache/dev-python/openpyxl-2.2.2
similarity index 68%
rename from metadata/md5-cache/dev-python/openpyxl-2.0.2
rename to metadata/md5-cache/dev-python/openpyxl-2.2.2
index eff62e6c7ec2..ef461ca8afdd 100644
--- a/metadata/md5-cache/dev-python/openpyxl-2.0.2
+++ b/metadata/md5-cache/dev-python/openpyxl-2.2.2
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DEPEND=test? ( dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Pure python reader and writer of Excel OpenXML files
 EAPI=5
-HOMEPAGE=http://bitbucket.org/ericgazoni/openpyxl/wiki/Home
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+HOMEPAGE=http://openpyxl.readthedocs.org
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
 SLOT=0
-SRC_URI=https://bitbucket.org/ericgazoni/openpyxl/get/2.0.2.tar.bz2 -> openpyxl-2.0.2.tar.bz2
+SRC_URI=mirror://pypi/o/openpyxl/openpyxl-2.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=534f0d9e8727028f95ca14a5d668face
+_md5_=7fc4b42ccb7d01ab42d4369cb54b049a
diff --git a/metadata/md5-cache/dev-python/openpyxl-9999 b/metadata/md5-cache/dev-python/openpyxl-9999
new file mode 100644
index 000000000000..4535a5bdfd19
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openpyxl-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-vcs/mercurial
+DESCRIPTION=Pure python reader and writer of Excel OpenXML files
+EAPI=5
+HOMEPAGE=http://openpyxl.readthedocs.org
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+LICENSE=MIT
+RDEPEND=dev-python/jdcal[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=3fff84bf51380c0aa5f7ae6f5a2eab8d
diff --git a/metadata/md5-cache/dev-python/pandas-0.16.1 b/metadata/md5-cache/dev-python/pandas-0.16.1
new file mode 100644
index 000000000000..43adeded03fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-0.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/openpyxl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/openpyxl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymysql[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/statsmodels[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Powerful data structures for data analysis and statistics
+EAPI=5
+HOMEPAGE=http://pandas.pydata.org/
+IUSE=doc excel html test R python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/bottleneck[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytables[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] excel? ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) html? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) R? ( dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pandas/pandas-0.16.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=ccca8c4114067aa7170a078d0daa584c
diff --git a/metadata/md5-cache/dev-python/pandas-9999 b/metadata/md5-cache/dev-python/pandas-9999
index bc4cffa5e02d..17f8147bfd0a 100644
--- a/metadata/md5-cache/dev-python/pandas-9999
+++ b/metadata/md5-cache/dev-python/pandas-9999
@@ -9,4 +9,4 @@ RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=96e5ca69e95593dd5294ba856d53eb8a
+_md5_=583702d2fb6829863496e0fe38b9c51f
diff --git a/metadata/md5-cache/dev-python/pymongo-3.0.1 b/metadata/md5-cache/dev-python/pymongo-3.0.2
similarity index 96%
rename from metadata/md5-cache/dev-python/pymongo-3.0.1
rename to metadata/md5-cache/dev-python/pymongo-3.0.2
index a276f3734c37..e3210dddcb17 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.0.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.0.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=kerberos? ( dev-python/pykerberos ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
-SRC_URI=mirror://pypi/p/pymongo/pymongo-3.0.1.tar.gz
+SRC_URI=mirror://pypi/p/pymongo/pymongo-3.0.2.tar.gz
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=41ac75ca4b52580f342d6b67daf76392
+_md5_=93d24464c126b7bf64f126aa6376a0e4
diff --git a/metadata/md5-cache/dev-python/twisted-conch-15.1.0 b/metadata/md5-cache/dev-python/twisted-conch-15.1.0
new file mode 100644
index 000000000000..fe2f1a43c6c3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-conch-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted SSHv2 implementation
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Conch/15.1/TwistedConch-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=53b87875390d98d8efe9e6d2f35c3fed
diff --git a/metadata/md5-cache/dev-python/twisted-core-15.1.0 b/metadata/md5-cache/dev-python/twisted-core-15.1.0
new file mode 100644
index 000000000000..34d691d2658e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-core-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=An asynchronous networking framework written in Python
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=crypt gtk serial test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Core/15.1/TwistedCore-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5debe3e83e0a3ba77535a51d5d380994
diff --git a/metadata/md5-cache/dev-python/twisted-lore-15.1.0 b/metadata/md5-cache/dev-python/twisted-lore-15.1.0
new file mode 100644
index 000000000000..d9d150982eeb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-lore-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted documentation system
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Lore/15.1/TwistedLore-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=761b78bf309b521b2aa3a31f814303a1
diff --git a/metadata/md5-cache/dev-python/twisted-mail-15.1.0 b/metadata/md5-cache/dev-python/twisted-mail-15.1.0
new file mode 100644
index 000000000000..e4c04df3ada4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-mail-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A Twisted Mail library, server and client
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-names-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Mail/15.1/TwistedMail-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a8a38d827c9bd34a226d2c2bc0436dea
diff --git a/metadata/md5-cache/dev-python/twisted-names-15.1.0 b/metadata/md5-cache/dev-python/twisted-names-15.1.0
new file mode 100644
index 000000000000..79edf8b5bf4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-names-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A Twisted DNS implementation
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Names/15.1/TwistedNames-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bd2b3cf9e48540fa14d03d845a9b3c9d
diff --git a/metadata/md5-cache/dev-python/twisted-news-15.1.0 b/metadata/md5-cache/dev-python/twisted-news-15.1.0
new file mode 100644
index 000000000000..0929c30940f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-news-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted News is an NNTP server and programming library
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-mail-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/News/15.1/TwistedNews-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b5269ab5013b0876fce3f230a56dd138
diff --git a/metadata/md5-cache/dev-python/twisted-pair-15.1.0 b/metadata/md5-cache/dev-python/twisted-pair-15.1.0
new file mode 100644
index 000000000000..b93191845710
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-pair-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted low-level networking
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/eunuchs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Pair/15.1/TwistedPair-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b9850bb807fb9196ebb9a1e3f15b6da6
diff --git a/metadata/md5-cache/dev-python/twisted-runner-15.1.0 b/metadata/md5-cache/dev-python/twisted-runner-15.1.0
new file mode 100644
index 000000000000..f7505c5b7171
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-runner-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted Runner is a process management library and inetd replacement
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Runner/15.1/TwistedRunner-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4e9fa68f8abe4964462348147c79f9ca
diff --git a/metadata/md5-cache/dev-python/twisted-web-15.1.0 b/metadata/md5-cache/dev-python/twisted-web-15.1.0
new file mode 100644
index 000000000000..ec77a7aa6a7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-web-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted web server, programmable in Python
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=soap python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] soap? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Web/15.1/TwistedWeb-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d6750acfebcb0b1f241e11118a7f3fdf
diff --git a/metadata/md5-cache/dev-python/twisted-words-15.1.0 b/metadata/md5-cache/dev-python/twisted-words-15.1.0
new file mode 100644
index 000000000000..f63f01b962b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-words-15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted Words contains Instant Messaging implementations
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/twisted-web-15.1*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Words/15.1/TwistedWords-15.1.0.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5b7bae64f75556711fb0b668f3afa006
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14
new file mode 100644
index 000000000000..d55c7d09316e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/vcr:1[ruby_targets_ruby19] dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/fakeweb[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/vcr:1[ruby_targets_ruby20] dev-ruby/xml-simple[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/fakeweb[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/json[ruby_targets_ruby21] dev-ruby/vcr:1[ruby_targets_ruby21] dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/fakeweb[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=An oEmbed consumer library written in Ruby.
+EAPI=5
+HOMEPAGE=https://github.com/judofyr/ruby-oembed
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/ruby-oembed-0.8.14.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ca4558287c5e4a65ea808614be976f80
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
index 624db22fe57c..db42f1d2f41d 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A very simple library to use URL shortening services such as TinyURL
 EAPI=5
 HOMEPAGE=http://shorturl.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~x86-macos
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=09cc5fa19312f485c4e10d3788ecfcff
+_md5_=ec9fc562c82559c45082ab896832bcb7
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0
index a45789861596..2b9b688bbeff 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=SNMP library implemented in pure Ruby
 EAPI=5
 HOMEPAGE=http://snmplib.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.0.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=82f538f02698370dcce3d336243028d4
+_md5_=6c18071f3cca66832837b105509c1345
diff --git a/metadata/md5-cache/dev-ruby/vcr-1.11.3 b/metadata/md5-cache/dev-ruby/vcr-1.11.3
new file mode 100644
index 000000000000..0f1f9b5c5514
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/vcr-1.11.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Records your test suite's HTTP interactions and replay them during future test runs.
+EAPI=5
+HOMEPAGE=https://github.com/myronmarston/vcr/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://rubygems/vcr-1.11.3.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f12b9850ec36c317453f11eddffadda9
diff --git a/metadata/md5-cache/dev-ruby/vcr-2.9.3 b/metadata/md5-cache/dev-ruby/vcr-2.9.3
index 70da67cc7e3e..583f70c002e7 100644
--- a/metadata/md5-cache/dev-ruby/vcr-2.9.3
+++ b/metadata/md5-cache/dev-ruby/vcr-2.9.3
@@ -9,7 +9,7 @@ LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
-SLOT=0
+SLOT=2
 SRC_URI=mirror://rubygems/vcr-2.9.3.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4fa5530b5e1f5c604715d995ce10e657
+_md5_=50231de29e9e4c05c8ca4205640a3416
diff --git a/metadata/md5-cache/dev-util/cpputest-3.6 b/metadata/md5-cache/dev-util/cpputest-3.6
index 1af3ef629b8f..a618878c6950 100644
--- a/metadata/md5-cache/dev-util/cpputest-3.6
+++ b/metadata/md5-cache/dev-util/cpputest-3.6
@@ -4,9 +4,9 @@ DESCRIPTION=unit testing and mocking framework for C/C++
 EAPI=5
 HOMEPAGE=http://cpputest.github.io/ https://github.com/cpputest/cpputest
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/cpputest/cpputest/archive/v3.6.tar.gz -> cpputest-3.6.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=50de24c5055945602cd6b2045c0d9c9e
+_md5_=dfe3a5d0e8e7348fdfff623d986d34c8
diff --git a/metadata/md5-cache/dev-util/qstlink2-1.0.3 b/metadata/md5-cache/dev-util/qstlink2-1.0.3
index 32fd19d06f71..b0c16fbd5b46 100644
--- a/metadata/md5-cache/dev-util/qstlink2-1.0.3
+++ b/metadata/md5-cache/dev-util/qstlink2-1.0.3
@@ -3,10 +3,10 @@ DEPEND=virtual/libusb:0 dev-qt/qtcore:4 dev-qt/qtgui:4
 DESCRIPTION=GUI and CLI ST-Link V2(Debugger/Programmer) client
 EAPI=5
 HOMEPAGE=https://code.google.com/p/qstlink2/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=virtual/libusb:0 dev-qt/qtcore:4 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=https://github.com/mobyfab/QStlink2/archive/v1.0.3.tar.gz -> qstlink2-1.0.3.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	b9c5231d68391b53f154f7643e94605c	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=3d32b57e6d8c5ae5aa4cf942ffc2eac0
+_md5_=b34f6c04b7bacf7b797ab9986ae70794
diff --git a/metadata/md5-cache/dev-util/rbtools-0.7.2 b/metadata/md5-cache/dev-util/rbtools-0.7.2
index d83045c15239..0f5d22ddac25 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.7.2
+++ b/metadata/md5-cache/dev-util/rbtools-0.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Command line tools for use with Review Board
 EAPI=5
 HOMEPAGE=http://www.reviewboard.org/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0e32369511e9359adfba2609da1188c8
+_md5_=cd3fc0a3a7aab13d587b01aff19cdeb9
diff --git a/metadata/md5-cache/dev-util/valkyrie-2.0.0 b/metadata/md5-cache/dev-util/valkyrie-2.0.0
index 47ad4ad1ca0e..60298d41f9e0 100644
--- a/metadata/md5-cache/dev-util/valkyrie-2.0.0
+++ b/metadata/md5-cache/dev-util/valkyrie-2.0.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
 DESCRIPTION=Graphical front-end to the Valgrind suite of tools
 EAPI=3
 HOMEPAGE=http://www.valgrind.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valkyrie-2.0.0.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	b9c5231d68391b53f154f7643e94605c	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=2bc9dadb7fcfb9db8b2f4ffd65cb3c63
+_md5_=0ed3f1d72786336b10171d489e903f26
diff --git a/metadata/md5-cache/dev-vcs/git-2.3.6 b/metadata/md5-cache/dev-vcs/git-2.3.6
index 72d7ea615f0f..dbd90d266a7f 100644
--- a/metadata/md5-cache/dev-vcs/git-2.3.6
+++ b/metadata/md5-cache/dev-vcs/git-2.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-2.3.6.tar.xz mirror://kernel/software/scm/git/git-2.3.6.tar.xz http://git-core.googlecode.com/files/git-manpages-2.3.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.6.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.3.6.tar.xz )
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=7661e44691acae8e2f5aba1eefd26f54
+_md5_=029b2a0d4e38f5017d01684cfcb06023
diff --git a/metadata/md5-cache/dev-vcs/mercurial-3.4 b/metadata/md5-cache/dev-vcs/mercurial-3.4
new file mode 100644
index 000000000000..6ce3cd4236a9
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Scalable distributed SCM
+EAPI=5
+HOMEPAGE=http://mercurial.selenic.com/
+IUSE=bugzilla emacs gpg test tk python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://mercurial.selenic.com/release/mercurial-3.4.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=83d6338209ff110e3ac68bc83078d648
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.20 b/metadata/md5-cache/dev-vcs/subversion-1.7.20
index 7a4003ba95b5..1fb5daffbc1d 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.20
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.20
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.20.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f7dce580d4098b526be3fa17d4242820	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b58fd8060153bf11b08a1fbf8163efea
+_md5_=082ffbaf562a4b792df9b35df3b48ef7
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-3.4 b/metadata/md5-cache/dev-vcs/tortoisehg-3.4
new file mode 100644
index 000000000000..5d491925c4c4
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-vcs/mercurial-3.3 <dev-vcs/mercurial-3.5 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Set of graphical tools for Mercurial
+EAPI=5
+HOMEPAGE=http://tortoisehg.bitbucket.org
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-3.3 <dev-vcs/mercurial-3.5 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-3.4.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=c0b1d96eef116b1b61cc101f3a3782fe
diff --git a/metadata/md5-cache/games-action/d2x-rebirth-0.58.1 b/metadata/md5-cache/games-action/d2x-rebirth-0.58.1
index 238c5c562d06..21cd48535c37 100644
--- a/metadata/md5-cache/games-action/d2x-rebirth-0.58.1
+++ b/metadata/md5-cache/games-action/d2x-rebirth-0.58.1
@@ -4,7 +4,7 @@ DESCRIPTION=Descent Rebirth - enhanced Descent 2 engine
 EAPI=5
 HOMEPAGE=http://www.dxx-rebirth.com/
 IUSE=cdinstall debug demo ipv6 linguas_de +music opengl opl3-musicpack sc55-musicpack
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=D1X GPL-2 public-domain
 PDEPEND=cdinstall? ( games-action/descent2-data ) demo? ( games-action/descent2-demodata )
 RDEPEND=dev-games/physfs[hog,mvl,zip] media-libs/libsdl[X,sound,joystick,opengl?,video] music? ( media-libs/sdl-mixer[timidity,vorbis] ) opengl? ( virtual/opengl virtual/glu ) games-misc/games-envd
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55
 SLOT=0
 SRC_URI=https://github.com/dxx-rebirth/dxx-rebirth/archive/0.58.1-d2x.tar.gz -> d2x-rebirth-0.58.1.tar.gz opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.zip ) sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.zip ) linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.zip )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a733138d662a8adadab44b66f5952048
+_md5_=e16ff2559ff7c05db53ed9711d135b66
diff --git a/metadata/md5-cache/games-action/descent2-data-1.0 b/metadata/md5-cache/games-action/descent2-data-1.0
index f46822014bc3..a342c23f6369 100644
--- a/metadata/md5-cache/games-action/descent2-data-1.0
+++ b/metadata/md5-cache/games-action/descent2-data-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Data files for Descent 2
 EAPI=5
 HOMEPAGE=http://www.interplay.com/games/product.asp?GameID=109
 IUSE=videos
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=descent2-data
 PROPERTIES=interactive
 RDEPEND=!<games-action/d2x-0.2.5-r3 games-misc/games-envd
 SLOT=0
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cdrom	49b4b952fb5c83fac6c616b532723e60	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=75bfc7c31e36b42468e20a741ac82c12
+_md5_=44400a1ebf26382fd72085eccc1bc7da
diff --git a/metadata/md5-cache/games-arcade/commandergenius-1.8.0.0 b/metadata/md5-cache/games-arcade/commandergenius-1.8.0.0
index ac1fc445f8ec..74ef674eb702 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-1.8.0.0
+++ b/metadata/md5-cache/games-arcade/commandergenius-1.8.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source Commander Keen clone (needs original game files)
 EAPI=5
 HOMEPAGE=http://clonekeenplus.sourceforge.net
 IUSE=opengl tremor
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) games-misc/games-envd
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/clonekeenplus/CGenius/V1.8/CGenius-1.8.0.0-Release-Source.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=51c18c1cf54292c3c4023067c9f506b0
+_md5_=fca604a8704d2abc284f373f5f54fd08
diff --git a/metadata/md5-cache/games-arcade/performous-1.0 b/metadata/md5-cache/games-arcade/performous-1.0
index 99e570f6e9f2..9fffc519087a 100644
--- a/metadata/md5-cache/games-arcade/performous-1.0
+++ b/metadata/md5-cache/games-arcade/performous-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=SingStar GPL clone
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/performous/
 IUSE=midi songs tools webcam
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
 RDEPEND=dev-cpp/glibmm dev-cpp/libxmlpp media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib dev-libs/libxml2 gnome-base/librsvg media-gfx/imagemagick virtual/jpeg media-libs/libpng:0 media-libs/libsdl2[joystick,video] virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango media-libs/glew midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/performous/performous/archive/1.0.tar.gz -> performous-1.0.tar.gz songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=95bfca32167d24f2f148651ca3f41bd7
+_md5_=fe0669a9da14e7008fd31074e1ba50e7
diff --git a/metadata/md5-cache/games-misc/lolcat-42.1.0 b/metadata/md5-cache/games-misc/lolcat-42.1.0
index 0364fba44da9..2fab2e76d0fa 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.1.0
+++ b/metadata/md5-cache/games-misc/lolcat-42.1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-42.1.0.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0a6af92fa836e46f62b04f184f9da8f4
+_md5_=6e2ce3e4f873ee7b129f7d6d06385b61
diff --git a/metadata/md5-cache/games-misc/nyancat-1.2.1 b/metadata/md5-cache/games-misc/nyancat-1.2.1
index 18410570112d..a11bb16d5227 100644
--- a/metadata/md5-cache/games-misc/nyancat-1.2.1
+++ b/metadata/md5-cache/games-misc/nyancat-1.2.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Nyan Cat Telnet Server
 EAPI=5
 HOMEPAGE=http://github.com/klange/nyancat
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=UoI-NCSA
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/klange/nyancat/archive/1.2.1.tar.gz -> nyancat-1.2.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=17c678ba3b8870314ead36a4e142ae98
+_md5_=e436ae65727922192cbd5bfaba4516ed
diff --git a/metadata/md5-cache/games-simulation/openttd-1.5.0 b/metadata/md5-cache/games-simulation/openttd-1.5.0
index 12fbd8d7237e..092c1fdf33ce 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.5.0
+++ b/metadata/md5-cache/games-simulation/openttd-1.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
 EAPI=5
 HOMEPAGE=http://www.openttd.org/
 IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
 RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) games-misc/games-envd
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.5.0/openttd-1.5.0-source.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=460e56c54c6bc296002d14cff7bdce2f
+_md5_=7652b7d92ab3d06a0abcfc603e84f9e5
diff --git a/metadata/md5-cache/games-sports/ski-6.9 b/metadata/md5-cache/games-sports/ski-6.9
index 689ef22be2c1..f928454a107d 100644
--- a/metadata/md5-cache/games-sports/ski-6.9
+++ b/metadata/md5-cache/games-sports/ski-6.9
@@ -3,10 +3,10 @@ DESCRIPTION=A simple text-mode skiing game
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/ski/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/ski/ski-6.9.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=54a2cbaf24a91a468e4914d378b74362
+_md5_=803faafddd2aae69f8bace0f49ae0ef4
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.12.2 b/metadata/md5-cache/games-strategy/wesnoth-1.12.2
index 26abd50fe424..9f55b8aa0aa8 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.12.2
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
 EAPI=5
 HOMEPAGE=http://www.wesnoth.org/
 IUSE=dbus dedicated doc fribidi nls server
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.7:0[joystick,video,X] media-libs/sdl-net !dedicated? ( >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] fribidi? ( dev-libs/fribidi ) dbus? ( sys-apps/dbus ) sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig ) >=dev-libs/boost-1.48[nls,threads] virtual/libintl games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.12.2.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2011dc795ff3d6769e9f6ebceb44ea81
+_md5_=c14330c98c514f4e3f4390d967588eda
diff --git a/metadata/md5-cache/games-util/nml-0.4.0 b/metadata/md5-cache/games-util/nml-0.4.0
index f702a6368e0b..02dd7ca1974c 100644
--- a/metadata/md5-cache/games-util/nml-0.4.0
+++ b/metadata/md5-cache/games-util/nml-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler of NML files into grf/nfo files
 EAPI=5
 HOMEPAGE=http://dev.openttdcoop.org/projects/nml
 IUSE=python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pillow[zlib,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ply[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.0/nml-0.4.0.r5527-3b43d37dec19.tar.gz -> nml-0.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=5c7cfc64536778af717a4ae8c7130fab
+_md5_=556bb538dcc006a78c55be95adaf60b8
diff --git a/metadata/md5-cache/kde-misc/plasma-nm-0.9.3.5 b/metadata/md5-cache/kde-misc/plasma-nm-0.9.3.5
index 8ddb778d24cd..d9f0852656a5 100644
--- a/metadata/md5-cache/kde-misc/plasma-nm-0.9.3.5
+++ b/metadata/md5-cache/kde-misc/plasma-nm-0.9.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/playground/network/plasma-nm
 IUSE=debug modemmanager openconnect linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=net-libs/libnm-qt-0.9.8.2[modemmanager?] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.8.0 modemmanager? ( >=net-libs/libmm-qt-1.0.0 ) openconnect? ( net-misc/networkmanager-openconnect net-misc/openconnect ) !kde-misc/networkmanagement || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) linguas_ar? ( || ( kde-apps/kde-l10n[linguas_ar(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fa? ( || ( kde-apps/kde-l10n[linguas_fa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hr? ( || ( kde-apps/kde-l10n[linguas_hr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_is? ( || ( kde-apps/kde-l10n[linguas_is(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_ko? ( || ( kde-apps/kde-l10n[linguas_ko(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_lv? ( || ( kde-apps/kde-l10n[linguas_lv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lv(+)] ) ) linguas_mai? ( || ( kde-apps/kde-l10n[linguas_mai(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_nn? ( || ( kde-apps/kde-l10n[linguas_nn(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@ijekavian? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavian(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) ) linguas_sr@ijekavianlatin? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavianlatin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) ) linguas_sr@latin? ( || ( kde-apps/kde-l10n[linguas_sr@latin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_th? ( || ( kde-apps/kde-l10n[linguas_th(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/plasma-nm/plasma-nm-0.9.3.5.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d07cf16d9061ff47e438dafd8147d70f
+_md5_=f6eaa8e7004c650b215de216b2cd2151
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.0 b/metadata/md5-cache/mail-filter/spamassassin-3.4.0
index 17afc670ecf7..1cc7903bb2a5 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.0
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=SpamAssassin is an extensible email filter which is used to identify
 EAPI=5
 HOMEPAGE=http://spamassassin.apache.org/
 IUSE=+berkdb qmail ssl doc ldap mysql postgres sqlite ipv6
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=>=dev-lang/perl-5.8.8-r8 virtual/perl-MIME-Base64 >=virtual/perl-Pod-Parser-1.510.0-r2 virtual/perl-Storable virtual/perl-Time-HiRes >=dev-perl/HTML-Parser-3.43 >=dev-perl/Mail-DKIM-0.37 >=dev-perl/Net-DNS-0.53 dev-perl/Digest-SHA1 dev-perl/libwww-perl >=virtual/perl-Archive-Tar-1.23 app-crypt/gnupg >=virtual/perl-IO-Zlib-1.04 >=dev-util/re2c-0.12.0 dev-perl/Mail-SPF >=dev-perl/NetAddr-IP-4.0.1 dev-perl/Geo-IP dev-perl/Encode-Detect dev-perl/Net-Patricia ssl? ( dev-perl/IO-Socket-SSL dev-libs/openssl ) berkdb? ( virtual/perl-DB_File ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ipv6? ( || ( dev-perl/IO-Socket-INET6 virtual/perl-IO-Socket-IP ) ) dev-lang/perl:=[-build(-)]
 REQUIRED_USE=|| ( berkdb mysql postgres sqlite )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=7eabbd7832d6aaf3fe8e6ac2d4a985f2
+_md5_=b8485243b818474feb00addba17ce070
diff --git a/metadata/md5-cache/mail-mta/courier-0.74.1-r1 b/metadata/md5-cache/mail-mta/courier-0.74.1-r1
index e98007c394e7..1c2646d9ff9a 100644
--- a/metadata/md5-cache/mail-mta/courier-0.74.1-r1
+++ b/metadata/md5-cache/mail-mta/courier-0.74.1-r1
@@ -3,11 +3,11 @@ DEPEND=>=net-libs/courier-authlib-0.66.1 net-libs/courier-unicode !gnutls? ( >=d
 DESCRIPTION=An MTA designed specifically for maildirs
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~amd64 ~arm hppa ~x86
+KEYWORDS=amd64 ~arm hppa ~x86
 LICENSE=GPL-2
 PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.66.1 net-libs/courier-unicode !gnutls? ( >=dev-libs/openssl-0.9.6 ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.74.1.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=5f4c8883c0269c1b16f48b684a1574a2
+_md5_=8d238924b447decd3a1e12a9302ba0fa
diff --git a/metadata/md5-cache/media-gfx/pydot-1.0.28-r2 b/metadata/md5-cache/media-gfx/pydot-1.0.28-r2
index 1251acc96e6a..28087a8fd9cd 100644
--- a/metadata/md5-cache/media-gfx/pydot-1.0.28-r2
+++ b/metadata/md5-cache/media-gfx/pydot-1.0.28-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pydot/ http://pypi.python.org/pypi/pydot
 IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pydot.googlecode.com/files/pydot-1.0.28.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b729aa98877a0ad105e146e90d9aaf4f
+_md5_=623121cedc7b471dfdaa66f603f4345c
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.1 b/metadata/md5-cache/media-libs/aubio-0.4.1
index a773ea25f54d..cfa58ea57207 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.1
+++ b/metadata/md5-cache/media-libs/aubio-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for audio labelling
 EAPI=5
 HOMEPAGE=http://aubio.org/
 IUSE=doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) python? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sndfile? ( media-libs/libsndfile )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://aubio.org//pub/aubio-0.4.1.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=ab26ea684a8a7c828b67d4bd2bd4dae2
+_md5_=ef132dd0145677b1dabaa69d4471e301
diff --git a/metadata/md5-cache/media-libs/glfw-3.1.1 b/metadata/md5-cache/media-libs/glfw-3.1.1
index b7dddcad3957..062454350bd3 100644
--- a/metadata/md5-cache/media-libs/glfw-3.1.1
+++ b/metadata/md5-cache/media-libs/glfw-3.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Portable OpenGL FrameWork
 EAPI=5
 HOMEPAGE=http://www.glfw.org/
 IUSE=egl examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZLIB
 RDEPEND=x11-libs/libXrandr x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm x11-libs/libXinerama virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/glfw/glfw-3.1.1.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c2bbde656a2ecb24cc180892af80bcb1
+_md5_=3a522c16f3f7772d3f6dda426cf883a9
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
index 144b57c1ef9b..a7d3ed5bd2ee 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 DESCRIPTION=Onset detection, pitch tracking, note tracking and tempo tracking plugins
 EAPI=5
 HOMEPAGE=http://www.vamp-plugins.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
 SRC_URI=http://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=a2bea30f1fbaceac3ce4e59bc5b76bd0
+_md5_=2d7b02cb9d8f9debbf39682fc9db9ff0
diff --git a/metadata/md5-cache/media-sound/a2jmidid-8-r1 b/metadata/md5-cache/media-sound/a2jmidid-8-r1
index 2ae12dac0bea..90a9060bbc1c 100644
--- a/metadata/md5-cache/media-sound/a2jmidid-8-r1
+++ b/metadata/md5-cache/media-sound/a2jmidid-8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon for exposing legacy ALSA sequencer applications in JACK MIDI
 EAPI=5
 HOMEPAGE=http://home.gna.org/a2jmidid/
 IUSE=dbus python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit dbus? ( sys-apps/dbus ) >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 SLOT=0
 SRC_URI=http://download.gna.org/a2jmidid/a2jmidid-8.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=0d46180433c482d7e19d33d71fb7eed1
+_md5_=fb1d5c4860c2eac5c5dba9b19acfa08f
diff --git a/metadata/md5-cache/media-sound/aqualung-1.0_rc1 b/metadata/md5-cache/media-sound/aqualung-1.0_rc1
index 85f4b91aeda6..dba356eef9e2 100644
--- a/metadata/md5-cache/media-sound/aqualung-1.0_rc1
+++ b/metadata/md5-cache/media-sound/aqualung-1.0_rc1
@@ -4,10 +4,10 @@ DESCRIPTION=Music player for a wide range of formats designed for gapless playba
 EAPI=5
 HOMEPAGE=http://aqualung.factorial.hu/
 IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib app-arch/bzip2 dev-libs/libxml2 x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) pulseaudio? ( media-sound/pulseaudio ) flac? ( media-libs/flac ) lame? ( media-sound/lame ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) musepack? ( >=media-sound/musepack-tools-444 ) mp3? ( media-libs/libmad ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) ladspa? ( media-libs/liblrdf ) libsamplerate? ( media-libs/libsamplerate ) ifp? ( media-libs/libifp ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) lua? ( dev-lang/lua )
 SLOT=0
 SRC_URI=mirror://sourceforge/aqualung/aqualung-1.0-rc1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ccf08120a3cdfbb8c72c4d6d70d79ebf
+_md5_=4a6394e3efb971a845465828d3ade66a
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.9.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.9.2
index 09a93350f091..d0cbfa729f5d 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.9.2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=scans log files and bans IPs that show malicious signs
 EAPI=5
 HOMEPAGE=http://www.fail2ban.org/
 IUSE=selinux systemd python_targets_pypy python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_pypy python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-misc/whois virtual/mta virtual/logger net-firewall/iptables selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( sys-apps/systemd[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_3(-)?,python_single_target_python3_3(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?] ) python_single_target_python3_3? ( sys-apps/systemd[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_3(-)?,python_single_target_python3_3(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?] ) python_single_target_python3_4? ( sys-apps/systemd[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_3(-)?,python_single_target_python3_3(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?] ) ) python_single_target_pypy? ( virtual/pypy:0= ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy3(-),python_single_target_pypy(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( python_single_target_pypy python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.9.2 -> fail2ban-0.9.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=101357ec5910cba035ee6ff28c5bb132
+_md5_=e4ffe50c89460fb5c9d3377658a7f52c
diff --git a/metadata/md5-cache/net-analyzer/hydra-8.1 b/metadata/md5-cache/net-analyzer/hydra-8.1
index 1e6b84c72dbe..a34988137ebf 100644
--- a/metadata/md5-cache/net-analyzer/hydra-8.1
+++ b/metadata/md5-cache/net-analyzer/hydra-8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced parallized login hacker
 EAPI=5
 HOMEPAGE=http://www.thc.org/thc-hydra/
 IUSE=firebird gtk idn mysql ncp oracle pcre postgres ssl subversion
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl sys-libs/ncurses firebird? ( dev-db/firebird ) gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) mysql? ( virtual/mysql ) ncp? ( net-fs/ncpfs ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql ) ssl? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion )
 SLOT=0
 SRC_URI=http://freeworld.thc.org/releases/hydra-8.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6df94242fe7deaaa47c01144fbb9871f
+_md5_=1d2ad2649f63eb878a82a0cdf68cd6bf
diff --git a/metadata/md5-cache/net-analyzer/snortsam-2.70 b/metadata/md5-cache/net-analyzer/snortsam-2.70
index b3c932a703db..4d2289647863 100644
--- a/metadata/md5-cache/net-analyzer/snortsam-2.70
+++ b/metadata/md5-cache/net-analyzer/snortsam-2.70
@@ -3,9 +3,9 @@ DESCRIPTION=Snort plugin that allows automated blocking of IP addresses on sever
 EAPI=5
 HOMEPAGE=http://www.snortsam.net/
 IUSE=debug
-KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.snortsam.net/files/snortsam/snortsam-src-2.70.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=58cec3ac103a83cf932f8fb0a91d08df
+_md5_=0134b42f0f0a58271cd85b2bfa267b6a
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.13 b/metadata/md5-cache/net-analyzer/vnstat-1.13
index 6579523e2483..87e75b0b82cd 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.13
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.13
@@ -4,10 +4,10 @@ DESCRIPTION=Console-based network traffic monitor that keeps statistics of netwo
 EAPI=5
 HOMEPAGE=http://humdi.net/vnstat/
 IUSE=gd selinux test
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 SLOT=0
 SRC_URI=http://humdi.net/vnstat/vnstat-1.13.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f6f899c08b87a8253902f97f7d91bc5e
+_md5_=06db325d89d1e8077bca7777c305ce69
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.1
index 9894dcb19a7f..69be2c40fa44 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.1
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Netflow iptables module
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/ipt-netflow
 IUSE=debug snmp kernel_linux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipt-netflow/ipt-netflow-2.1.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	25e9476cdec14dfb0af32f4c83c3f297	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=276b4ca4660d7b70c2b658deca15880a
+_md5_=ec831bb96cc9485891a2bd21310c65c8
diff --git a/metadata/md5-cache/net-im/choqok-1.5 b/metadata/md5-cache/net-im/choqok-1.5
index 6e16e3d8e448..c939c73bc0bf 100644
--- a/metadata/md5-cache/net-im/choqok-1.5
+++ b/metadata/md5-cache/net-im/choqok-1.5
@@ -4,10 +4,10 @@ DESCRIPTION=Free/Open Source micro-blogging client for KDE
 EAPI=5
 HOMEPAGE=http://choqok.gnufolks.org/
 IUSE=ayatana debug telepathy linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libattica dev-libs/qjson >=dev-libs/qoauth-1.0.1 ayatana? ( dev-libs/libindicate-qt ) telepathy? ( net-libs/telepathy-qt[qt4] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fa? ( || ( kde-apps/kde-l10n[linguas_fa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hr? ( || ( kde-apps/kde-l10n[linguas_hr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_is? ( || ( kde-apps/kde-l10n[linguas_is(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) ) linguas_sq? ( || ( kde-apps/kde-l10n[linguas_sq(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sq(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/choqok/choqok-1.5.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6cc335be992368b843764db91619cd8b
+_md5_=bea6a858ea4e930200aed2361e7ffd33
diff --git a/metadata/md5-cache/net-im/prosody-0.9.8 b/metadata/md5-cache/net-im/prosody-0.9.8
index d81991d889ef..f5027063c41a 100644
--- a/metadata/md5-cache/net-im/prosody-0.9.8
+++ b/metadata/md5-cache/net-im/prosody-0.9.8
@@ -4,10 +4,10 @@ DESCRIPTION=Prosody is a flexible communications server for Jabber/XMPP written
 EAPI=5
 HOMEPAGE=http://prosody.im/
 IUSE=ipv6 libevent mysql postgres sqlite ssl zlib jit
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=net-im/jabber-base !jit? ( >=dev-lang/lua-5.1:0 ) jit? ( dev-lang/luajit:2 ) >=net-dns/libidn-1.1 dev-libs/openssl:0 >=dev-lua/luaexpat-1.3.0 dev-lua/luafilesystem ipv6? ( >=dev-lua/luasocket-3 ) !ipv6? ( dev-lua/luasocket ) libevent? ( >=dev-lua/luaevent-0.4.3 ) mysql? ( dev-lua/luadbi[mysql] ) postgres? ( dev-lua/luadbi[postgres] ) sqlite? ( dev-lua/luadbi[sqlite] ) ssl? ( dev-lua/luasec ) zlib? ( dev-lua/lua-zlib )
 SLOT=0
 SRC_URI=http://prosody.im/tmp/0.9.8/prosody-0.9.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1bf299f26ca5abb3f668c6965f373a02
+_md5_=17c3f5ba8783633da1460fd35e849f06
diff --git a/metadata/md5-cache/net-irc/weechat-1.1.1 b/metadata/md5-cache/net-irc/weechat-1.1.1
index 87dddbdb4d59..7e544f15fcac 100644
--- a/metadata/md5-cache/net-irc/weechat-1.1.1
+++ b/metadata/md5-cache/net-irc/weechat-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Portable and multi-interface IRC client
 EAPI=5
 HOMEPAGE=http://weechat.org/
 IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile:12 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 SLOT=0
 SRC_URI=http://weechat.org/files/src/weechat-1.1.1.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=fe02c8b9c36bce9c0eeaec1a4ee769ce
+_md5_=6e6daf0d3a59bc6f34c00db247a8b331
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.66.1 b/metadata/md5-cache/net-libs/courier-authlib-0.66.1
index d2ef7281f7e1..721889d0ea9a 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.66.1
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.66.1
@@ -4,7 +4,7 @@ DESCRIPTION=Courier authentication library
 EAPI=5
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=net-mail/mailbase gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db ) >=dev-libs/openssl-0.9.6 ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( >=dev-db/postgresql-8.4 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=( !vpopmail )
@@ -12,4 +12,4 @@ RESTRICT=userpriv !berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.66.1.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=8425f865154487c841ed5e9ef824f0ab
+_md5_=9b14e71ef96cd5b2dee9c567097c28d1
diff --git a/metadata/md5-cache/net-libs/courier-unicode-1.1 b/metadata/md5-cache/net-libs/courier-unicode-1.1
index f939c902e07f..1ae6819234fa 100644
--- a/metadata/md5-cache/net-libs/courier-unicode-1.1
+++ b/metadata/md5-cache/net-libs/courier-unicode-1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Unicode library used by the courier mail server
 EAPI=5
 HOMEPAGE=http://www.courier-mta.org/
-KEYWORDS=~amd64 ~arm hppa ppc64 ~x86
+KEYWORDS=amd64 ~arm hppa ppc64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-unicode-1.1.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c1a96d57c48b11e5ceea8cfa59f45b51
+_md5_=33f2713ffe6fb05a9ae53ab5e86340c0
diff --git a/metadata/md5-cache/net-libs/libecap-1.0.0 b/metadata/md5-cache/net-libs/libecap-1.0.0
index dd72a311e1a7..d29443da470b 100644
--- a/metadata/md5-cache/net-libs/libecap-1.0.0
+++ b/metadata/md5-cache/net-libs/libecap-1.0.0
@@ -3,10 +3,10 @@ DESCRIPTION=API for implementing ICAP content analysis and adaptation
 EAPI=5
 HOMEPAGE=http://www.e-cap.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD-2
 RDEPEND=!net-libs/libecap:0 !net-libs/libecap:0.2
 SLOT=1
 SRC_URI=http://www.measurement-factory.com/tmp/ecap/libecap-1.0.0.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ad45909f44dd882c7ba1dcc729143f77
+_md5_=fe3d74f3b6705d812a3d6e3badda66e0
diff --git a/metadata/md5-cache/net-libs/libssh-0.6.5 b/metadata/md5-cache/net-libs/libssh-0.6.5
index 0d7ac4f25c8e..05f68a3a96ed 100644
--- a/metadata/md5-cache/net-libs/libssh-0.6.5
+++ b/metadata/md5-cache/net-libs/libssh-0.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=5
 HOMEPAGE=http://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/121/libssh-0.6.5.tar.xz -> libssh-0.6.5.tar.xz https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> libssh-0.6.5-compilefix.patch
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=2a3fad825384ff6f6dafe748ff04c89e
+_md5_=137ffb5add8f1b32ec6c3532bd3218c0
diff --git a/metadata/md5-cache/net-misc/omniORB-4.1.4-r2 b/metadata/md5-cache/net-misc/omniORB-4.1.4-r2
index 3c2da22c6806..356ef28aa0f9 100644
--- a/metadata/md5-cache/net-misc/omniORB-4.1.4-r2
+++ b/metadata/md5-cache/net-misc/omniORB-4.1.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A robust, high-performance CORBA 2 ORB
 EAPI=5
 HOMEPAGE=http://omniorb.sourceforge.net/
 IUSE=doc ssl static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6b:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/omniorb/omniORB-4.1.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b5778652dfc6973f4690b5745ab0b536
+_md5_=f689d057995ee85d829a83d625d24578
diff --git a/metadata/md5-cache/net-misc/smb4k-1.2.0 b/metadata/md5-cache/net-misc/smb4k-1.2.0
index cc6844061147..2d5970b3d2c0 100644
--- a/metadata/md5-cache/net-misc/smb4k-1.2.0
+++ b/metadata/md5-cache/net-misc/smb4k-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=The advanced network neighborhood browser for KDE
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/smb4k/
 IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_mai linguas_mr linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-fs/samba-3.4.2[cups] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_is? ( || ( kde-apps/kde-l10n[linguas_is(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_ko? ( || ( kde-apps/kde-l10n[linguas_ko(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mai? ( || ( kde-apps/kde-l10n[linguas_mai(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=dev-qt/qtdeclarative-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/smb4k/smb4k-1.2.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cb6fde74c7f2ff89d12215fae3602a30
+_md5_=8f039d775209fcfc298c2aa0d1444e19
diff --git a/metadata/md5-cache/net-misc/tor-0.2.7.1_alpha b/metadata/md5-cache/net-misc/tor-0.2.7.1_alpha
new file mode 100644
index 000000000000..36c849033fb2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tor-0.2.7.1_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) upnp? ( net-libs/miniupnpc ) virtual/pkgconfig
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=5
+HOMEPAGE=http://www.torproject.org/
+IUSE=-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.2.7.1-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.7.1-alpha.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=8ce51a48d5a673498c55d3a5d5216fdf
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.4 b/metadata/md5-cache/net-proxy/squid-3.5.4
index 6cdbce560a4f..d8c0b2721a42 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.4
+++ b/metadata/md5-cache/net-proxy/squid-3.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.4.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	25e9476cdec14dfb0af32f4c83c3f297	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1be019dbd763286c2530335d7ee7d055
+_md5_=4cf5709aa4b2dde3c2f4fb4a0d421895
diff --git a/metadata/md5-cache/sci-biology/rebase-1503 b/metadata/md5-cache/sci-biology/rebase-1503
deleted file mode 100644
index c62a9fb9dd2b..000000000000
--- a/metadata/md5-cache/sci-biology/rebase-1503
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
-DESCRIPTION=A restriction enzyme database
-EAPI=5
-HOMEPAGE=http://rebase.neb.com
-IUSE=emboss minimal
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rebase-1503.tar.xz
-_md5_=91118a1af18a0be4e7c0673ffacb2678
diff --git a/metadata/md5-cache/sci-biology/rebase-1504 b/metadata/md5-cache/sci-biology/rebase-1504
index ebf100d49882..0372fe80571d 100644
--- a/metadata/md5-cache/sci-biology/rebase-1504
+++ b/metadata/md5-cache/sci-biology/rebase-1504
@@ -4,10 +4,10 @@ DESCRIPTION=A restriction enzyme database
 EAPI=5
 HOMEPAGE=http://rebase.neb.com
 IUSE=emboss minimal
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rebase-1504.tar.xz
-_md5_=32172a2aa26d7aa972b7d7becc2dd089
+_md5_=9c5f57a26ebfef0aa83fd1115c8e7503
diff --git a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2 b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
index c6e7f19a66fb..caa5c6bc9461 100644
--- a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
+++ b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
@@ -3,11 +3,11 @@ DEPEND=virtual/jpeg media-libs/libpng media-libs/gd:= media-libs/freeglut || ( x
 DESCRIPTION=Display molecular 3D structures, such as proteins, in both schematic and detailed representations
 EAPI=5
 HOMEPAGE=http://www.avatar.se/molscript/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=glut molscript
 RDEPEND=virtual/jpeg media-libs/libpng media-libs/gd:= media-libs/freeglut || ( x11-libs/libXmu x11-libs/libXext x11-libs/libX11 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=molscript-2.1.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=2c03b3c870859ebb00e236c160f783ab
+_md5_=8e39c890a758b7b8398864aad129fed0
diff --git a/metadata/md5-cache/sci-chemistry/mosflm-7.0.9 b/metadata/md5-cache/sci-chemistry/mosflm-7.0.9
index a054d7db7740..889497e8c1c1 100644
--- a/metadata/md5-cache/sci-chemistry/mosflm-7.0.9
+++ b/metadata/md5-cache/sci-chemistry/mosflm-7.0.9
@@ -3,10 +3,10 @@ DEPEND=app-shells/tcsh sci-libs/cbflib sci-libs/ccp4-libs sys-libs/ncurses virtu
 DESCRIPTION=A program for integrating single crystal diffraction data from area detectors
 EAPI=5
 HOMEPAGE=http://www.mrc-lmb.cam.ac.uk/harry/mosflm/
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ccp4
 RDEPEND=app-shells/tcsh sci-libs/cbflib sci-libs/ccp4-libs sys-libs/ncurses virtual/jpeg:0= x11-libs/libxdl_view virtual/fortran
 SLOT=0
 SRC_URI=http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver709/build-it-yourself/mosflm709.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=451cdf605e434caac881145a76f6bd95
+_md5_=df219de7009b3c2a2cd907822bd22f5e
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
index 3151e73a6edf..4487dc0cb903 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatic
 EAPI=5
 HOMEPAGE=http://www.poissonboltzmann.org/
 IUSE=doc examples opal +pdb2pka python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/openbabel-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdb2pka? ( sci-chemistry/apbs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),-mpi] ) virtual/fortran
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/releases/download/pdb2pqr-1.9.0/pdb2pqr-src-1.9.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=e47c660b45c687aa8dbb5a74df278ddf
+_md5_=bd2fcbf32ba90cb6d0df082eb2c2a57e
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20130511 b/metadata/md5-cache/sci-chemistry/tm-align-20130511
index 839b54ebfe30..c49d9b6c0be4 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20130511
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20130511
@@ -4,10 +4,10 @@ DESCRIPTION=Quick & Accurate Structural Alignment
 EAPI=5
 HOMEPAGE=http://zhanglab.ccmb.med.umich.edu/TM-align/
 IUSE=static custom-cflags
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20130511.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=d0ff2d31599491a3cdc259452724ec20
+_md5_=e0dc922ec66d6d3a77fd577e71900fe1
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20140601 b/metadata/md5-cache/sci-chemistry/tm-align-20140601
index c8e1b7fb5193..46bc3ea45cd7 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20140601
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20140601
@@ -4,10 +4,10 @@ DESCRIPTION=Quick & Accurate Structural Alignment
 EAPI=5
 HOMEPAGE=http://zhanglab.ccmb.med.umich.edu/TM-align/
 IUSE=static custom-cflags
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20140601.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ad7e62b22d8e0d3f480ed23ecb3ed392
+_md5_=6bb147ce77be27e8e2713ee19d552142
diff --git a/metadata/md5-cache/sci-libs/camd-2.3.1 b/metadata/md5-cache/sci-libs/camd-2.3.1
index 1e78f6ce14c7..73e1d5be1c2f 100644
--- a/metadata/md5-cache/sci-libs/camd-2.3.1
+++ b/metadata/md5-cache/sci-libs/camd-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/camd/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/camd-2.3.1.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=663c1c8e8d61c8dc8772545ccf9550ca
+_md5_=343ec476649626bd590f25ecc620382c
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.8.0 b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
index 671295b9b1f0..bffe7e7147fe 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/ccolamd-2.8.0.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=27504c49ea2dc6b23947a654aa4e634c
+_md5_=df34382cb2dbe481a64369fedff6a8cb
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.360 b/metadata/md5-cache/sci-libs/cfitsio-3.360
index acb9e1dc8815..3e85f56112c6 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.360
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.360
@@ -4,10 +4,10 @@ DESCRIPTION=C and Fortran library for manipulating FITS files
 EAPI=5
 HOMEPAGE=http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 IUSE=doc examples fortran static-libs +tools threads
-KEYWORDS=~alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/zlib fortran? ( virtual/fortran )
 SLOT=0/1
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.360.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b281abf093980ab210bbf402671a1527
+_md5_=6a1b0838e1463f8923e64adf120d6308
diff --git a/metadata/md5-cache/sci-libs/cholmod-2.1.2 b/metadata/md5-cache/sci-libs/cholmod-2.1.2
index 847d9df18472..8632715288d1 100644
--- a/metadata/md5-cache/sci-libs/cholmod-2.1.2
+++ b/metadata/md5-cache/sci-libs/cholmod-2.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/cholmod/
 IUSE=cuda doc lapack metis minimal static-libs
-KEYWORDS=amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )
 RDEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( sci-libs/metis sci-libs/parmetis ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cholmod-2.1.2.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c4df6491a9c082f11877978df4c546f4
+_md5_=7f671246e371b92cd6cab22f91945aee
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.3 b/metadata/md5-cache/sci-libs/cln-1.3.3
index c3309245cf70..b2db5f273acf 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.3
+++ b/metadata/md5-cache/sci-libs/cln-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Class library (C++) for numbers
 EAPI=5
 HOMEPAGE=http://www.ginac.de/CLN/
 IUSE=doc examples static-libs
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp
 SLOT=1
 SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.3.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=26917dded55e5062422b4dba94f33c2f
+_md5_=70b81dc22be9d920ad532f47557d5612
diff --git a/metadata/md5-cache/sci-libs/colamd-2.8.0 b/metadata/md5-cache/sci-libs/colamd-2.8.0
index 60f246e06dc9..8b6ccf6cf8db 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/colamd-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/colamd-2.8.0.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=18acc2aa1bf64df7e49424cd06e53b76
+_md5_=8e44d4b5707435d1582e35237f2e053f
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.17-r1 b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
index 68f9d410e6bf..1a58ba7f2d44 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.17-r1
+++ b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for Support Vector Machines
 EAPI=5
 HOMEPAGE=http://www.csie.ntu.edu.tw/~cjlin/libsvm/
 IUSE=java openmp python tools elibc_FreeBSD java python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.17.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f7dce580d4098b526be3fa17d4242820	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5f295f949e470f7ea423d138ed099287
+_md5_=26f4a3ce32b1012ad022628d3eb9a109
diff --git a/metadata/md5-cache/sci-libs/scipy-0.15.1 b/metadata/md5-cache/sci-libs/scipy-0.15.1
index 48002e4762a3..ac55a7ff46b1 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.15.1
+++ b/metadata/md5-cache/sci-libs/scipy-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Scientific algorithms library for Python
 EAPI=5
 HOMEPAGE=http://www.scipy.org/
 IUSE=doc sparse test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
 RDEPEND=dev-python/numpy[lapack,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) virtual/python-imaging[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] virtual/fortran 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.15.1.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.15.1/scipy-html-0.15.1.zip -> scipy-0.15.1-html.zip http://docs.scipy.org/doc/scipy-0.15.1/scipy-ref-0.15.1.pdf -> scipy-0.15.1-ref.pdf )
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=3b12c334edc6221d3626d506ec1552c5
+_md5_=cf789e6419793d40df8a1c2b175fbba3
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3 b/metadata/md5-cache/sci-libs/superlu-4.3
deleted file mode 100644
index a57b83b23d48..000000000000
--- a/metadata/md5-cache/sci-libs/superlu-4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
-DESCRIPTION=Sparse LU factorization library
-EAPI=5
-HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
-IUSE=doc examples static-libs test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=virtual/blas virtual/fortran
-SLOT=0
-SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=07a6f98621cbff201f61bb94be44de02
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r1 b/metadata/md5-cache/sci-libs/superlu-4.3-r1
index 2c84f99c14f0..cf8985a14201 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r1
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Sparse LU factorization library
 EAPI=5
 HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
 IUSE=doc examples static-libs test
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=a1202370b9fe24f78069d6ba27761373
+_md5_=b4533d9a46b9e6f3e1e5657ec779e8fc
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.6.2 b/metadata/md5-cache/sci-libs/umfpack-5.6.2
index 72c15fdef6af..dd54b0a4a2f6 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.6.2
+++ b/metadata/md5-cache/sci-libs/umfpack-5.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/umfpack
 IUSE=doc +cholmod static-libs
-KEYWORDS=amd64 ~arm hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/amd-1.3 sci-libs/suitesparseconfig virtual/blas cholmod? ( >=sci-libs/cholmod-2[-minimal] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/umfpack-5.6.2.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=bec2f2a48bfa42c0e318d8e88045984a
+_md5_=54fb3296fa907078ec2ec897186f7446
diff --git a/metadata/md5-cache/sci-visualization/g3data-1.5.3 b/metadata/md5-cache/sci-visualization/g3data-1.5.3
deleted file mode 100644
index 22a2a29c86ed..000000000000
--- a/metadata/md5-cache/sci-visualization/g3data-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig doc? ( ~app-text/docbook-sgml-utils-0.6.14 )
-DESCRIPTION=Tool for extracting data from graphs
-EAPI=2
-HOMEPAGE=http://www.frantz.fi/software/g3data.php
-IUSE=doc examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.frantz.fi/software/g3data-1.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6a1493e639cef97ad7e5631330583723
diff --git a/metadata/md5-cache/sci-visualization/g3data-1.5.4 b/metadata/md5-cache/sci-visualization/g3data-1.5.4
index 5766705512ff..d4e2b520efb7 100644
--- a/metadata/md5-cache/sci-visualization/g3data-1.5.4
+++ b/metadata/md5-cache/sci-visualization/g3data-1.5.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=Tool for extracting data from graphs
 EAPI=5
-HOMEPAGE=http://www.frantz.fi/software/g3data.php
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+HOMEPAGE=https://github.com/pn2200/g3data
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://github/pn2200/g3data/g3data-1.5.4.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=a16db00830bd133e0c5ff707bf11f62b
+_md5_=e38ea8682168f7c2a18372f9b03e9893
diff --git a/metadata/md5-cache/sci-visualization/veusz-1.22 b/metadata/md5-cache/sci-visualization/veusz-1.22
index 3ea76b00206e..4f5b6024c28d 100644
--- a/metadata/md5-cache/sci-visualization/veusz-1.22
+++ b/metadata/md5-cache/sci-visualization/veusz-1.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.6[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.6[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Qt scientific plotting package with good Postscript output
 EAPI=5
 HOMEPAGE=http://home.gna.org/veusz/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=http://download.gna.org/veusz/veusz-1.22.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=97c716585451e13c31e7eb7cea01fd83
+_md5_=d0cf757d0b50c2976f29240fdce5f604
diff --git a/metadata/md5-cache/sci-visualization/veusz-1.23 b/metadata/md5-cache/sci-visualization/veusz-1.23
new file mode 100644
index 000000000000..e8202df06e72
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/veusz-1.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.6[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Qt scientific plotting package with good Postscript output
+EAPI=5
+HOMEPAGE=http://home.gna.org/veusz/
+IUSE=dbus doc emf fits hdf5 minuit vo python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.6[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) minuit? ( dev-python/pyminuit[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) vo? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sampy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://download.gna.org/veusz/veusz-1.23.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=79555546a285a11e227b1f233055cadd
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.4 b/metadata/md5-cache/sys-apps/hwinfo-21.4
index eeeebde31c78..98495116bc7e 100644
--- a/metadata/md5-cache/sys-apps/hwinfo-21.4
+++ b/metadata/md5-cache/sys-apps/hwinfo-21.4
@@ -3,10 +3,10 @@ DEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu ) sys-devel/flex
 DESCRIPTION=hardware detection tool used in SuSE Linux
 EAPI=5
 HOMEPAGE=http://www.opensuse.org/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
 SLOT=0
 SRC_URI=http://download.opensuse.org/source/factory/repo/oss/suse/src/hwinfo-21.4-1.1.src.rpm
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b005704a6a6479b18d356c2971878bf6
+_md5_=dc24ea2b22866ed4bd248080d21f017e
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.10.0-r2 b/metadata/md5-cache/sys-apps/hwloc-1.10.0-r2
index 0104f3a08b53..8bcb5b2eca4a 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.10.0-r2
+++ b/metadata/md5-cache/sys-apps/hwloc-1.10.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses cairo? ( x11-libs/cairo[X?,svg?] ) cuda? ( dev-util/nvidia-cuda-toolkit ) gl? ( media-video/nvidia-settings ) opencl? ( x11-drivers/ati-drivers ) pci? ( sys-apps/pciutils x11-libs/libpciaccess ) plugins? ( dev-libs/libltdl:0 ) numa? ( sys-process/numactl ) xml? ( dev-libs/libxml2 )
 SLOT=0/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.0.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	cuda	2ba75c44d72d2b0b1fe31e2e2dc42d0e	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0a27e89c6097ee588b4d5476d8f08b86
+_md5_=0dea33433cdc4e9f29a2722fcfde68de
diff --git a/metadata/md5-cache/sys-apps/iproute2-3.19.0 b/metadata/md5-cache/sys-apps/iproute2-3.19.0
index b9fa1b335999..e8aafecd51ce 100644
--- a/metadata/md5-cache/sys-apps/iproute2-3.19.0
+++ b/metadata/md5-cache/sys-apps/iproute2-3.19.0
@@ -4,10 +4,10 @@ DESCRIPTION=kernel routing and traffic control utilities
 EAPI=5
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 IUSE=atm berkdb +iptables ipv6 minimal selinux
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.20:= ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.19.0.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=fba93691fe62f18b27759cb6c8edd600
+_md5_=4a297caf246cd28e1b20ed1350a94ab0
diff --git a/metadata/md5-cache/sys-apps/kmod-19 b/metadata/md5-cache/sys-apps/kmod-19
index e7f89b8546c1..581c31883364 100644
--- a/metadata/md5-cache/sys-apps/kmod-19
+++ b/metadata/md5-cache/sys-apps/kmod-19
@@ -4,7 +4,7 @@ DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-19.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=170893fb8f799baf01762fd7d72c1a56
+_md5_=46bbe27a344a4535161090e2dfa44b57
diff --git a/metadata/md5-cache/sys-apps/kmod-20 b/metadata/md5-cache/sys-apps/kmod-20
index bcf01d7784dc..fc190e1e3f53 100644
--- a/metadata/md5-cache/sys-apps/kmod-20
+++ b/metadata/md5-cache/sys-apps/kmod-20
@@ -4,7 +4,7 @@ DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 IUSE=debug doc lzma python static-libs +tools zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( 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 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-20.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=7ebbd70948aeade569e59a61f95b2ee6
+_md5_=b8ff9ce7101cabcb2331e0a151f9d770
diff --git a/metadata/md5-cache/sys-apps/most-5.0.0a-r1 b/metadata/md5-cache/sys-apps/most-5.0.0a-r1
index 26d9fc6a302c..d44ce745a1d9 100644
--- a/metadata/md5-cache/sys-apps/most-5.0.0a-r1
+++ b/metadata/md5-cache/sys-apps/most-5.0.0a-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/slang-2.1.3
 DESCRIPTION=Paging program that displays, one windowful at a time, the contents of a file
 EAPI=5
 HOMEPAGE=ftp://space.mit.edu/pub/davis/most
-KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~mips ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/slang-2.1.3
 SLOT=0
 SRC_URI=ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=5d49cf0394c8c573220c039448c67f32
+_md5_=1a38e428514230f386368059e1ce9dee
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r5 b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r5
index e9b74479ca1f..0faec5f4ff7c 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r5
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.7_rc1-r5
@@ -4,10 +4,10 @@ DESCRIPTION=pam_mysql is a module for pam to authenticate users with mysql
 EAPI=5
 HOMEPAGE=http://pam-mysql.sourceforge.net/
 IUSE=openssl
-KEYWORDS=~alpha amd64 ppc ~sparc x86
+KEYWORDS=~alpha amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=openssl? ( dev-libs/openssl:0= ) >=sys-libs/pam-0.72:0= virtual/mysql:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=d1cc111c659d43f9834059fc957c35e8
+_md5_=95e04f668fa8def93b23fc797bcdb8f4
diff --git a/metadata/md5-cache/sys-auth/pambase-20150213 b/metadata/md5-cache/sys-auth/pambase-20150213
index 16c1388d7e8a..fbc04f20bc13 100644
--- a/metadata/md5-cache/sys-auth/pambase-20150213
+++ b/metadata/md5-cache/sys-auth/pambase-20150213
@@ -4,11 +4,11 @@ DESCRIPTION=PAM base configuration files
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/base/pam/
 IUSE=consolekit cracklib debug gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 -sparc-fbsd -x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( >=sys-auth/consolekit-0.4.6[pam] ) cracklib? ( sys-libs/pam[cracklib] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) >=sys-auth/pam_krb5-4.3 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( >=sys-apps/systemd-204[pam] ) !<sys-apps/shadow-4.1.5-r1 !<sys-freebsd/freebsd-pam-modules-6.2-r1 !<sys-libs/pam-0.99.9.0-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~vapier/dist/pambase-20150213.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=dc483bbc1210f2193e2a787a70c6547e
+_md5_=352784b57eb70b932224005586e2c404
diff --git a/metadata/md5-cache/sys-block/partitionmanager-1.1.1 b/metadata/md5-cache/sys-block/partitionmanager-1.1.1
index cc7db73a86c0..f051fae536fd 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-1.1.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=KDE utility for management of partitions and file systems
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
 IUSE=debug linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_it linguas_lt linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) linguas_ar? ( || ( kde-apps/kde-l10n[linguas_ar(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sl? ( || ( kde-apps/kde-l10n[linguas_sl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@ijekavian? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavian(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) ) linguas_sr@ijekavianlatin? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavianlatin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) ) linguas_sr@latin? ( || ( kde-apps/kde-l10n[linguas_sr@latin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=mirror://kde/stable/partitionmanager/1.1.1/src/partitionmanager-1.1.1.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=535717038b86001bcd48d0a7a147b3fd
+_md5_=048acdefd1cda0f5c1cbfa1126134513
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04 b/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04
index b44e5a29a268..3efa3b7e4723 100644
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04
+++ b/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.04
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=GNU Autoconf Macro Archive
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/autoconf-archive/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
 SLOT=0
 SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2015.02.04.tar.xz
-_md5_=10d9c0f94939e4c22d5a88a9ca476962
+_md5_=58102d7f54783adcdc45241a65416ee6
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.24 b/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.24
new file mode 100644
index 000000000000..76c11af66fe4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/autoconf-archive-2015.02.24
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=GNU Autoconf Macro Archive
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/autoconf-archive/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
+SLOT=0
+SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2015.02.24.tar.xz
+_md5_=97e1b967a71e2a52f77255de697a98ad
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 59d5b6959c78..1943f267b9e5 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 RESTRICT=strip
 SLOT=2.95.3
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-2.95.3-patches-1.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7098fc65027f507dae4cb292939618dd
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 0de8f47b9a71..b2d5ac931c0d 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 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/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.9.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.9.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.9.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.9.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/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=078acd26bcfeb1cdc7ae13aa027f3d21
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 4a9b438c3326..999ebfabd661 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 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/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.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/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95e790a3495e8bbcad61fa00181a97b4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index 85429e4721b0..edf3e5f4c2dd 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? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 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/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0f2c128d6ee0d6f42a2c0b1cc984988
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 252282999d38..b7d6e2c68f98 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 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/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.5.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1069154ad2153516ecc5f75607f55d01
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 a33a3c3c8b5f..2adf1388a1a5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 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/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68e60d2c45d906c1208b2405d6c3856c
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 700ebc82ea68..43b3c1d38d7b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 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/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70d181115b1a24aeba94389e44f0a444
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 1d7a0e2c65e8..0011e8c65961 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e6ccc3025f79496398d707b65b57c84
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index c18f112b8cde..62658fb0c0b8 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d21c1097dba00081aba5d55e1f0b5bb7
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 959d3e3defce..80458554e707 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.2.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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b9ddba3ca8ba3d4c53e16b422cbf49b3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.0 b/metadata/md5-cache/sys-devel/gcc-4.7.0
index c17542befea5..62975b622be3 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af1e772cdd8ec9f5ce4e15a16418754f
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.1 b/metadata/md5-cache/sys-devel/gcc-4.7.1
index 5865c6267df9..7f454e2a99bd 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ece08c2d5a60eb0245cb0a0e4cb1b90e
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 3cce54c03eb8..c9213e045c5d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70ea60498aef6888403043f2c0299585
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 1cc71a95fcd7..45de0f69dad6 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.5.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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=606339d4dff2f0db4a28c58ed6cc7df7
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4 b/metadata/md5-cache/sys-devel/gcc-4.7.4
index a8f3b9b93fc5..753e00504a98 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4
@@ -4,12 +4,12 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla altivec nopie nossp doc gcj awt hardened multilib objc objc-gc mudflap libssp objc++ fixed-point go +nls +nptl +cxx +fortran +openmp
-KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 -amd64-fbsd -x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.7.4-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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6ad980584ca5897f5b4af77cd67cc22d
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=890096a9467c26bf1d66bf202870bb81
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.0 b/metadata/md5-cache/sys-devel/gcc-4.8.0
index d05f45b77ef8..d2321090fe2a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5940918799d8c59442ae48e661d429a
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 89aafc6f3043..ad5b8ecf2fd3 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12c225b2d2063bbcc5d149603949d560
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.2 b/metadata/md5-cache/sys-devel/gcc-4.8.2
index 0ff99cdbd6cc..f17da87cefdc 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2 mirror://gentoo/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.2-patches-1.3r1.tar.bz2 mirror://gentoo/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.2-piepatches-v0.5.8r1.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f64a9f3d5c69eb211d31eb50d457a9ed
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.3 b/metadata/md5-cache/sys-devel/gcc-4.8.3
index 76b0d5e2a181..594830a41e84 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.3
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.3-piepatches-v0.5.9.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6162059ba84826a12415bd30acc15877
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.4 b/metadata/md5-cache/sys-devel/gcc-4.8.4
index 23685417fdf8..20012175f4ec 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.4/gcc-4.8.4.tar.bz2 mirror://gentoo/gcc-4.8.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.4-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.4-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.4-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.4-patches-1.5.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.4-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.8.4-piepatches-v0.6.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.4-piepatches-v0.6.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.4-piepatches-v0.6.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.4-piepatches-v0.6.1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.4-piepatches-v0.6.1.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a60bc877ef94916b2e550fa1d9f4834c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.0 b/metadata/md5-cache/sys-devel/gcc-4.9.0
index d70eacaea0fc..45af9cbd228b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.0/gcc-4.9.0.tar.bz2 mirror://gentoo/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.0-piepatches-v0.6.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=311953851ce7b7890bc23b58116bd179
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.1 b/metadata/md5-cache/sys-devel/gcc-4.9.1
index 187f0ebb703b..ccd7929cdbe4 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.1/gcc-4.9.1.tar.bz2 mirror://gentoo/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.1-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.1-piepatches-v0.6.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62b6a9223c7cc3bbde9ebd55d135f9e8
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.2 b/metadata/md5-cache/sys-devel/gcc-4.9.2
index c3eb1d804df6..1caa6694fd8b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2 mirror://gentoo/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-patches-1.4.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-piepatches-v0.6.2.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-piepatches-v0.6.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5e66f977ab8b2948c2cd0c69e8ae9a0
diff --git a/metadata/md5-cache/sys-devel/gcc-5.1.0 b/metadata/md5-cache/sys-devel/gcc-5.1.0
index fec54d113596..3765434a4c25 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.1.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.1
 SRC_URI=mirror://gnu/gcc/gcc-5.1.0/gcc-5.1.0.tar.bz2 mirror://gentoo/gcc-5.1.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-5.1.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-5.1.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-5.1.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-5.1.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.1.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-5.1.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-5.1.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-5.1.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-5.1.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.1.0-piepatches-v0.6.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-5.1.0-piepatches-v0.6.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-5.1.0-piepatches-v0.6.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-5.1.0-piepatches-v0.6.3.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-5.1.0-piepatches-v0.6.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/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff0b8adc0f42dfdeeaf2570d264bb93c
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 269a505336d3..6971801d86ca 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	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _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 2af380301270..f96df1116518 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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _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 cb8d1a7f59c0..d1578071126d 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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ffe7d4840fa1a172ab518bfa0c67208
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 4f1cf7c22ebd..39e96ea7a4e6 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9755a405596c197684c32047de119558
diff --git a/metadata/md5-cache/sys-devel/kgcc64-3.4.6 b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
index 7aa32f8f932b..d5c3967a3820 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-3.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=763423aac2a46bad5797bf21595efff1
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 963849a5e57d..a90949367347 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
 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/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=539483eb32a8ea7ea0f16310cc0ca4cc
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 5d5aecfea43a..c1ea898e7296 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
 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/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4fddea884410fa1693158010106a104d
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 605a8ef49195..1af01c7fe35e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.5
 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/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef0ad9b40ac2c62a0192ff77c7344b0d
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index 99613896282c..0a9d819ffdd9 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -11,5 +11,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.5
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=57ab0b71d886c81b13bf7e82c61107b3
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index 26e3995a86e9..daac5dc492e9 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -11,5 +11,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.6
 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/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0158524737285e5b28380deed0178bb8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index a18016293e78..449a9bd103ef 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -11,5 +11,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.3
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bfef58f2c1d438af58ef6e2de0118e98
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index 1496c2e6bb6c..cea1acd256d7 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -11,5 +11,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.4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8b96b6dc86e612b5a9d9b54e190768c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.3 b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
index 91fa232fcf87..3c06410ca22e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
@@ -11,5 +11,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.3
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.6.3-patches-1.9.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63670b0cc94d1a84ebb151d09ef90201
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index 4387ab33888c..d000bdb08040 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -11,5 +11,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.4
 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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f78ace302f6be6eae0444b95961d9282
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index 9f7408dfa504..28e52268a91f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -11,5 +11,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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6fad764eadde5e581c3709a6101f40c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index 31a42152412a..7cf33cb9a683 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -11,5 +11,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.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10e5c73956f495abe47b639de51ba368
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.1 b/metadata/md5-cache/sys-devel/kgcc64-4.8.1
index 53a34e2f150e..84c2b51e3828 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.1
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.1
@@ -11,5 +11,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/~rhill/dist/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 http://dev.gentoo.org/~blueness/dist/gcc-4.8.1-patches-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7dabb5945bba9e391e216c9aa94c1f5e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.2 b/metadata/md5-cache/sys-devel/kgcc64-4.8.2
index f7dfc1a52105..ad278d0b0f2c 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.2
@@ -11,5 +11,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.2/gcc-4.8.2.tar.bz2 mirror://gentoo/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.2-patches-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2e56f321ccf494a6a3b65863aafa9b9
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index f2520193f092..cb1508467c9d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -11,5 +11,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.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d0a05fab4dcdf8b5abb908ce1497613
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.1 b/metadata/md5-cache/sys-devel/kgcc64-4.9.1
index 6bb6c57dabd7..cb4f98423a4b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.1
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.1
@@ -11,5 +11,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.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.1/gcc-4.9.1.tar.bz2 mirror://gentoo/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.1-patches-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a3ec6fec8aba1eaaa53058c70138a8a
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.2 b/metadata/md5-cache/sys-devel/kgcc64-4.9.2
index 132bb571d6f1..999eed283104 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.2
@@ -11,5 +11,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.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2 mirror://gentoo/gcc-4.9.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~blueness/dist/gcc-4.9.2-patches-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	88e6b2396bd1abf85fbb699d2f8199a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	4f9d89666fb0a19245fa221cc025014b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ff84f923510b0de26bd2d65e4510634
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.49.2 b/metadata/md5-cache/sys-kernel/genkernel-3.4.49.2
index 4aea8edcfbce..52799eb3f83d 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.49.2
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.49.2
@@ -4,10 +4,10 @@ DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=3
 HOMEPAGE=http://www.gentoo.org
 IUSE=crypt cryptsetup ibm selinux
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-0.2.1 !<sys-apps/openrc-0.9.9
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.4.49.2.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=1fc05c47aa4314b127259d38f1a959e8
+_md5_=1dc6533a9fb6f31100a8dcc9479317bf
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.77 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.78
similarity index 88%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.10.77
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.10.78
index e796c04ce7b3..49634e6b3c31 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.77
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.78
@@ -9,7 +9,7 @@ LICENSE=GPL-2 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.77
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.77.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
+SLOT=3.10.78
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.78.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=776cb74a1e1191f2d572d19583e49d3a
+_md5_=d72b2d6a3d8f6d6159fded5824920c21
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.8-r2 b/metadata/md5-cache/sys-libs/musl-1.1.8-r2
index 3d2691a0e686..8f7db7937ce6 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.8-r2
+++ b/metadata/md5-cache/sys-libs/musl-1.1.8-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Lightweight, fast and simple C library focused on standards-conforma
 EAPI=5
 HOMEPAGE=http://www.musl-libc.org/
 IUSE=crosscompile_opts_headers-only
-KEYWORDS=-* ~amd64 ~arm ~mips ~ppc ~x86
+KEYWORDS=-* amd64 arm ~mips ppc x86
 LICENSE=MIT LGPL-2 GPL-2
 RDEPEND=!sys-apps/getent
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.1.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=3f0ab124b3bb62c0760cfd40ea5d0f1d
+_md5_=59b1bc291e419797e83cc1e136ea69e4
diff --git a/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1 b/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
index ba6ffa5f40b1..ab37f4e3e786 100644
--- a/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
+++ b/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
@@ -3,10 +3,10 @@ DEPEND=net-dns/avahi[dbus] =www-servers/apache-2*
 DESCRIPTION=mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi
 EAPI=5
 HOMEPAGE=http://0pointer.de/lennart/projects/mod_dnssd/
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=net-dns/avahi[dbus] =www-servers/apache-2*
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-0.6.tar.gz
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=13a5dfe13628a884d9fe4385d9d1324c
+_md5_=1db1f472d97914c8b467fe95e7a0fb10
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0315215b9b05..7fa942e3d3be 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2015 06:37:00 +0000
+Wed, 13 May 2015 13:06:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f67c0c772d02..6a824c0e1fc6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 13 06:36:56 UTC 2015
+Wed May 13 13:06:51 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d207f7d907f4..67c5e12f33ce 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 13 May 2015 07:00:01 +0000
+Wed, 13 May 2015 13:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 395e4610083a..da4c7d39c074 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1431498901 Wed 13 May 2015 06:35:01 AM UTC
+1431522301 Wed 13 May 2015 01:05:01 PM UTC
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.2.ebuild
index 555b8aeb8786..9cfea3dfcc52 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.2.ebuild,v 1.4 2015/05/08 12:13:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.2.ebuild,v 1.5 2015/05/13 09:25:53 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="selinux systemd"
 
 DEPEND=""
diff --git a/net-analyzer/hydra/hydra-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild
index 44d71e978b36..c7bc7ff7e661 100644
--- a/net-analyzer/hydra/hydra-8.1.ebuild
+++ b/net-analyzer/hydra/hydra-8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-8.1.ebuild,v 1.3 2015/05/12 08:40:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-8.1.ebuild,v 1.4 2015/05/13 09:34:14 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion"
 
 RDEPEND="
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
index ece201425823..c49c022d28e3 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.70.ebuild,v 1.11 2015/05/13 06:00:24 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.70.ebuild,v 1.12 2015/05/13 06:59:43 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}files/snortsam/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="debug"
 
 S=${WORKDIR}/${PN}
diff --git a/net-analyzer/vnstat/vnstat-1.13.ebuild b/net-analyzer/vnstat/vnstat-1.13.ebuild
index 989bd2951645..bf806ce327e4 100644
--- a/net-analyzer/vnstat/vnstat-1.13.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.13.ebuild,v 1.3 2015/05/12 08:41:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.13.ebuild,v 1.4 2015/05/13 09:33:57 ago Exp $
 
 EAPI=5
 inherit toolchain-funcs user
@@ -11,7 +11,7 @@ SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
 IUSE="gd selinux test"
 
 COMMON_DEPEND="
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
index 90a764ca4014..742789d6fde0 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild,v 1.2 2015/04/28 07:15:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-2.1.ebuild,v 1.3 2015/05/13 09:35:56 ago Exp $
 
 EAPI=5
 MY_PN="${PN/_/-}"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug snmp"
 
diff --git a/net-im/choqok/choqok-1.5.ebuild b/net-im/choqok/choqok-1.5.ebuild
index c837afd1ab6b..be9ccca5f4ef 100644
--- a/net-im/choqok/choqok-1.5.ebuild
+++ b/net-im/choqok/choqok-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-1.5.ebuild,v 1.1 2015/01/26 19:15:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-1.5.ebuild,v 1.3 2015/05/13 09:32:07 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://choqok.gnufolks.org/"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 else
 	KEYWORDS=""
 fi
diff --git a/net-im/prosody/prosody-0.9.8.ebuild b/net-im/prosody/prosody-0.9.8.ebuild
index 62a95813f0b7..2bc53a19c4cd 100644
--- a/net-im/prosody/prosody-0.9.8.ebuild
+++ b/net-im/prosody/prosody-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.8.ebuild,v 1.6 2015/05/12 08:40:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.9.8.ebuild,v 1.7 2015/05/13 09:33:21 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
 
 DEPEND="net-im/jabber-base
diff --git a/net-irc/weechat/weechat-1.1.1.ebuild b/net-irc/weechat/weechat-1.1.1.ebuild
index 694607e3d8b6..25e48b55f3be 100644
--- a/net-irc/weechat/weechat-1.1.1.ebuild
+++ b/net-irc/weechat/weechat-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.1.1.ebuild,v 1.3 2015/04/01 20:52:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.1.1.ebuild,v 1.5 2015/05/13 09:37:00 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild
index a1bb8d681da3..9e5916fb49a5 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild,v 1.7 2015/05/01 04:42:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild,v 1.8 2015/05/13 07:56:00 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib user
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/courier-unicode-1.1.ebuild b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
index 00e58107cd8a..662e52d7b1ff 100644
--- a/net-libs/courier-unicode/courier-unicode-1.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-unicode/courier-unicode-1.1.ebuild,v 1.6 2015/05/03 07:15:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-unicode/courier-unicode-1.1.ebuild,v 1.7 2015/05/13 07:56:04 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ppc64 ~x86"
+KEYWORDS="amd64 ~arm hppa ppc64 ~x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/libecap/libecap-1.0.0.ebuild b/net-libs/libecap/libecap-1.0.0.ebuild
index 674de4a430c4..c5e5b7d28629 100644
--- a/net-libs/libecap/libecap-1.0.0.ebuild
+++ b/net-libs/libecap/libecap-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libecap/libecap-1.0.0.ebuild,v 1.10 2015/04/18 20:39:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libecap/libecap-1.0.0.ebuild,v 1.11 2015/05/13 06:34:48 jmorgan Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="!net-libs/libecap:0
diff --git a/net-libs/libssh/libssh-0.6.5.ebuild b/net-libs/libssh/libssh-0.6.5.ebuild
index 95e88914eb2e..90eca3be90b3 100644
--- a/net-libs/libssh/libssh-0.6.5.ebuild
+++ b/net-libs/libssh/libssh-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.5.ebuild,v 1.3 2015/05/08 04:52:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.5.ebuild,v 1.4 2015/05/13 07:56:21 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.
 	https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> ${PN}-0.6.5-compilefix.patch"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
diff --git a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
index 35cfa21e32e8..16e3ea29eb0b 100644
--- a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r2.ebuild,v 1.1 2015/04/08 09:25:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r2.ebuild,v 1.3 2015/05/13 09:26:44 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc ssl static-libs"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b:0= )"
diff --git a/net-misc/smb4k/smb4k-1.2.0.ebuild b/net-misc/smb4k/smb4k-1.2.0.ebuild
index 9823af2ef360..a23f5f369849 100644
--- a/net-misc/smb4k/smb4k-1.2.0.ebuild
+++ b/net-misc/smb4k/smb4k-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/smb4k-1.2.0.ebuild,v 1.2 2015/03/04 13:45:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/smb4k-1.2.0.ebuild,v 1.4 2015/05/13 09:31:29 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
 RDEPEND=">=net-fs/samba-3.4.2[cups]"
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 1d1ff53b7cda..06108c16dd95 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,3 @@
 DIST tor-0.2.5.12.tar.gz 3311423 SHA256 550fdafffeb4c1e3035bb8cc42e6e49d5af17ad79563bd118af22c1107f72b49 SHA512 67f78a9bb07987b311bd25548ea96cfc91d89dc8bfd29f284b77ab97b9dcb7d9a0f6e6cc0d1e4a2517653c42b3064aa7506227ebf339f56ad3d8f2ebad9258a0 WHIRLPOOL bd217c21318cf775bbf57c7df11b58c48f273d11db2057bb6071971aaa2744c3a910024011141f63cc3d99f7fc1b616e810d348709b5de6f3a84d8926e3f8b36
 DIST tor-0.2.6.7.tar.gz 3595669 SHA256 8c2be88a542ed1b22a8d3d595ec0acd0e28191de273dbcaefc64fdce92b89e6c SHA512 96e3cb5bcafddb1655663091ecf08f708213e47529d9701d67256e88d5fc2e70acffc6c062df6b8f0f4a4e3ef3d0dda76b5127ef9eeee06371ce0a66e53815b0 WHIRLPOOL 5da1f3e2ed1c12a1efba3eee91016beeaa5c40434831e684bb33670ae301e1661096c4a4231cd345c5dd833e8547f71f0c28d22c6d4b51a43bd0d6603160973c
+DIST tor-0.2.7.1-alpha.tar.gz 3603319 SHA256 9afc770a5a795e752f053ae7c2c1ee3a560145adc0aea377c83e602c2cbbed9b SHA512 7e9e27e761ed8ee60687ccdb0b524fa62d643632b8b64033b53ea57bba99e9b37f489a03f38265ce2b29778d7df33f2e596ba1f44f8eec3571505bac0e8a5a82 WHIRLPOOL 26886153252a07e501cce18224f8525dc18981f1ffaeb9dac9f3af034c357bb4fa93719e01605e5bf0ba3c7fdf688aaac594b6020d32c0caa2d136fbbe4ebc02
diff --git a/net-misc/tor/tor-0.2.7.1_alpha.ebuild b/net-misc/tor/tor-0.2.7.1_alpha.ebuild
new file mode 100644
index 000000000000..4b39d7822247
--- /dev/null
+++ b/net-misc/tor/tor-0.2.7.1_alpha.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.7.1_alpha.ebuild,v 1.1 2015/05/13 11:24:55 blueness Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
+
+DEPEND="dev-libs/openssl
+	sys-libs/zlib
+	dev-libs/libevent
+	bufferevents? ( dev-libs/libevent[ssl] )
+	nat-pmp? ( net-libs/libnatpmp )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	upnp? ( net-libs/miniupnpc )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
+	epatch_user
+}
+
+src_configure() {
+	# Upstream isn't sure of all the user provided CFLAGS that
+	# will break tor, but does recommend against -fstrict-aliasing.
+	# We'll filter-flags them here as we encounter them.
+	filter-flags -fstrict-aliasing
+
+	econf \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable stats instrument-downloads) \
+		$(use_enable bufferevents) \
+		$(use_enable nat-pmp) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upnp) \
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r7 tor
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	emake DESTDIR="${D}" install
+
+	keepdir /var/lib/tor
+
+	dodoc README ChangeLog ReleaseNotes doc/HACKING
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+
+	if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && $(gcc-micro-version) -ge 1 ]] ; then
+		ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os leads to an infinite"
+		ewarn "loop.  See:"
+		ewarn
+		ewarn "    https://trac.torproject.org/projects/tor/ticket/10259"
+		ewarn "    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358"
+		ewarn
+	fi
+}
diff --git a/net-proxy/squid/squid-3.5.4.ebuild b/net-proxy/squid/squid-3.5.4.ebuild
index 0b904fe7a311..43eb37ed7b90 100644
--- a/net-proxy/squid/squid-3.5.4.ebuild
+++ b/net-proxy/squid/squid-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.4 2015/05/13 05:43:11 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.5 2015/05/13 06:48:12 jmorgan Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/profiles/package.mask b/profiles/package.mask
index c676f1973aa0..35cc41c6010f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16524 2015/05/10 14:33:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16526 2015/05/13 09:21:05 monsieurp Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrice Clement <monsieurp@gentoo.org) (13 May 2015)
+# Unused package, homepage dead, no revdeps. 
+# Fails to compile with recent JVMs, see bug #549090.
+# Last release dates back to 2010.
+# Masked for removal in 30 days.
+dev-java/xt
+
+# Ian Delaney <idella4@gentoo.org> (13 May 2015)
+# package unused, no revdeps, obsolete.
+# masked for removal in 30 days
+dev-python/gevent-zeromq
+
 # Mike Gilbert <floppym@gentoo.org> (06 May 2015)
 # Obsolete development snapshots.
 >=app-emulation/open-vm-tools-2013
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index ef15b5142bfe..8b1dae2ec806 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -11,3 +11,4 @@ move dev-perl/Cgi-Simple dev-perl/CGI-Simple
 move net-mail/git-mailz dev-vcs/git-mailz
 move dev-perl/extutils-depends dev-perl/ExtUtils-Depends
 move dev-perl/class-returnvalue dev-perl/Class-ReturnValue
+slotmove =dev-ruby/vcr-2.9.3 0 2
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 68937980163c..6e26d6039967 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,3 +1,2 @@
-DIST rebase-1503.tar.xz 67267924 SHA256 6f808fd86bcc13f92a6ca876fa910260fc50bce50ac4bbe04e8d87cd2f9a4822 SHA512 83f2b1f0b44cb674ca99e1a5a917cd55621d6cd33d2d4d0c635af1bc958c038e6e77f5d1e2d03623010eaecb2ae88d050829797d90cb7142b83f6baace4e4d96 WHIRLPOOL 2e267cd39c626d61d33b37625c9bc56f8f83a84bfa709ac37790b90a400bf2b6e5577c34d7ced6db747dc37fb2aa72071da1e254ba185e81574eac301abd42a6
 DIST rebase-1504.tar.xz 69726880 SHA256 70b02c6f4f51b091c31685cc6df5a0442f5fde258cd57d143b6c81a9d2f23190 SHA512 6b35b872bd5e1ee1a7cac72b7caccc03d13ce20e426a05e6c557353c067f6737b82de926dcf0dac5bcffe1c5ff72c76ce3e237d2df7044a7dfb5e930316edc42 WHIRLPOOL 5c72ce616e70d1f47979e1335aa0a5ae22eabad59d5cede5446a2c499a5e6127c4dd99ebb9e9ef09bf3c4b7bf439647e9fadf3e1b782e898039560a96cf6b65a
 DIST rebase-1505.tar.xz 70790908 SHA256 dfeee8c7ee81dcd352e5a18319cc9c34c7cade73ef2843c8e7bec96fac29193f SHA512 9f83e7286908036478f021f1611bc04258458a769ce0cb62d1316726f5d644ed7038869e5e12a896123a33f433063d598c36771c80d90d7998d26a7aa19678d3 WHIRLPOOL 8e8ce8e5882d2a09b32cc5526c97724fec9894566587e79804425dbd68d4eb65644bc86eab3054190529b285c821e94bab0b60723d33bbe91332c5b165f2a9c6
diff --git a/sci-biology/rebase/rebase-1503.ebuild b/sci-biology/rebase/rebase-1503.ebuild
deleted file mode 100644
index c1698349fee8..000000000000
--- a/sci-biology/rebase/rebase-1503.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1503.ebuild,v 1.5 2015/04/08 16:53:27 mgorny Exp $
-
-EAPI=5
-
-MY_PV=${PV#1}
-
-DESCRIPTION="A restriction enzyme database"
-HOMEPAGE="http://rebase.neb.com"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emboss minimal"
-
-RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-src_compile() {
-	if use emboss; then
-		echo; einfo "Indexing Rebase for usage with EMBOSS."
-		mkdir REBASE || die
-		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
-				-protofile proto.${MY_PV} -equivalences \
-				|| die "Indexing Rebase failed."
-		echo
-	fi
-}
-
-src_install() {
-	if ! use minimal; then
-		insinto /usr/share/${PN}
-		doins withrefm.${MY_PV} proto.${MY_PV}
-	fi
-	newdoc REBASE.DOC README
-	if use emboss; then
-		insinto /usr/share/EMBOSS/data/REBASE
-		doins REBASE/embossre.{enz,ref,sup}
-		insinto /usr/share/EMBOSS/data
-		doins REBASE/embossre.equ
-	fi
-}
diff --git a/sci-biology/rebase/rebase-1504.ebuild b/sci-biology/rebase/rebase-1504.ebuild
index 1b3b90c99531..240d36ec0562 100644
--- a/sci-biology/rebase/rebase-1504.ebuild
+++ b/sci-biology/rebase/rebase-1504.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1504.ebuild,v 1.2 2015/05/12 08:41:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1504.ebuild,v 1.4 2015/05/13 09:38:12 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emboss minimal"
 
 RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
index e0bb668d54eb..6252b8d1f785 100644
--- a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild,v 1.2 2015/02/17 12:02:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild,v 1.3 2015/05/13 06:46:22 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="${P}.tar.gz"
 
 LICENSE="glut molscript"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-chemistry/mosflm/mosflm-7.0.9.ebuild b/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
index 2da6417036d8..a3a4e86e2ce3 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.9.ebuild,v 1.6 2015/05/08 12:12:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.9.ebuild,v 1.7 2015/05/13 09:30:32 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE}ver${MY_PV}/build-it-yourself/${MY_P}.tgz"
 
 SLOT="0"
 LICENSE="ccp4"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
index e4282ff41c73..8e7588594e5f 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild,v 1.4 2015/01/04 19:15:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild,v 1.5 2015/05/13 06:47:49 jmorgan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Electrostatics/apbs-${PN}/releases/download/${P}/${P
 SLOT="0"
 LICENSE="BSD"
 IUSE="doc examples opal +pdb2pka"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-chemistry/tm-align/tm-align-20130511.ebuild b/sci-chemistry/tm-align/tm-align-20130511.ebuild
index 8048498e190a..fd3122a73232 100644
--- a/sci-chemistry/tm-align/tm-align-20130511.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20130511.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20130511.ebuild,v 1.5 2015/04/21 19:06:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20130511.ebuild,v 1.6 2015/05/13 06:57:34 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
 
 LICENSE="tm-align"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static custom-cflags"
 
 S="${WORKDIR}"
diff --git a/sci-chemistry/tm-align/tm-align-20140601.ebuild b/sci-chemistry/tm-align/tm-align-20140601.ebuild
index a3a8811a6e53..95d96007de56 100644
--- a/sci-chemistry/tm-align/tm-align-20140601.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20140601.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20140601.ebuild,v 1.1 2015/03/29 13:15:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20140601.ebuild,v 1.3 2015/05/13 09:30:49 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
 
 LICENSE="tm-align"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static custom-cflags"
 
 S="${WORKDIR}"
diff --git a/sci-libs/camd/camd-2.3.1.ebuild b/sci-libs/camd/camd-2.3.1.ebuild
index d6b2019f50de..9e68fe310b7e 100644
--- a/sci-libs/camd/camd-2.3.1.ebuild
+++ b/sci-libs/camd/camd-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/camd-2.3.1.ebuild,v 1.9 2015/04/19 09:38:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/camd/camd-2.3.1.ebuild,v 1.11 2015/05/13 06:58:37 jmorgan Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
index 13d04a4961af..72e6c319445b 100644
--- a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ccolamd-2.8.0.ebuild,v 1.9 2015/04/19 09:51:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ccolamd-2.8.0.ebuild,v 1.11 2015/05/13 06:59:23 jmorgan Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index 01927462e908..2b637d69d0ca 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.360.ebuild,v 1.5 2015/04/21 18:57:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.360.ebuild,v 1.7 2015/05/13 07:02:13 jmorgan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 958bbbd8a629..a13c0f8f95f8 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-2.1.2.ebuild,v 1.8 2015/04/21 17:47:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cholmod/cholmod-2.1.2.ebuild,v 1.10 2015/05/13 07:01:31 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc lapack metis minimal static-libs"
 
 RDEPEND="
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
index 2dd92be98a76..d84e8279dee6 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.3.ebuild,v 1.9 2015/04/28 09:51:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.3.ebuild,v 1.10 2015/05/13 06:56:48 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="dev-libs/gmp"
diff --git a/sci-libs/colamd/colamd-2.8.0.ebuild b/sci-libs/colamd/colamd-2.8.0.ebuild
index 75dd9b472b42..485e89e8054a 100644
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ b/sci-libs/colamd/colamd-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/colamd-2.8.0.ebuild,v 1.9 2015/04/19 09:49:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/colamd/colamd-2.8.0.ebuild,v 1.11 2015/05/13 06:57:53 jmorgan Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/libsvm/libsvm-3.17-r1.ebuild b/sci-libs/libsvm/libsvm-3.17-r1.ebuild
index 1195ec4aa25f..f7f7b16af114 100644
--- a/sci-libs/libsvm/libsvm-3.17-r1.ebuild
+++ b/sci-libs/libsvm/libsvm-3.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.17-r1.ebuild,v 1.2 2015/04/08 18:49:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.17-r1.ebuild,v 1.4 2015/05/13 06:58:14 jmorgan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 
 DEPEND="java? ( >=virtual/jdk-1.4 )"
diff --git a/sci-libs/scipy/scipy-0.15.1.ebuild b/sci-libs/scipy/scipy-0.15.1.ebuild
index aaf162450be3..b97d225e01e9 100644
--- a/sci-libs/scipy/scipy-0.15.1.ebuild
+++ b/sci-libs/scipy/scipy-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.15.1.ebuild,v 1.4 2015/04/21 19:02:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.15.1.ebuild,v 1.5 2015/05/13 06:56:26 jmorgan Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/superlu/files/superlu-4.1-autotools.patch b/sci-libs/superlu/files/superlu-4.1-autotools.patch
deleted file mode 100644
index f96e9375fe14..000000000000
--- a/sci-libs/superlu/files/superlu-4.1-autotools.patch
+++ /dev/null
@@ -1,579 +0,0 @@
-diff -Nur SuperLU_4.1.orig/ax_blas.m4 SuperLU_4.1/ax_blas.m4
---- SuperLU_4.1.orig/ax_blas.m4	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/ax_blas.m4	2011-03-21 23:42:42.000000000 +0000
-@@ -0,0 +1,201 @@
-+# ===========================================================================
-+#          http://www.gnu.org/software/autoconf-archive/ax_blas.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro looks for a library that implements the BLAS linear-algebra
-+#   interface (see http://www.netlib.org/blas/). On success, it sets the
-+#   BLAS_LIBS output variable to hold the requisite library linkages.
-+#
-+#   To link with BLAS, you should link with:
-+#
-+#     $BLAS_LIBS $LIBS $FLIBS
-+#
-+#   in that order. FLIBS is the output variable of the
-+#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is
-+#   sometimes necessary in order to link with F77 libraries. Users will also
-+#   need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same
-+#   reason.
-+#
-+#   Many libraries are searched for, from ATLAS to CXML to ESSL. The user
-+#   may also use --with-blas=<lib> in order to use some specific BLAS
-+#   library <lib>. In order to link successfully, however, be aware that you
-+#   will probably need to use the same Fortran compiler (which can be set
-+#   via the F77 env. var.) as was used to compile the BLAS library.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a BLAS library is
-+#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
-+#   not found. If ACTION-IF-FOUND is not specified, the default action will
-+#   define HAVE_BLAS.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 11
-+
-+AU_ALIAS([ACX_BLAS], [AX_BLAS])
-+AC_DEFUN([AX_BLAS], [
-+AC_PREREQ(2.50)
-+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-+ax_blas_ok=no
-+
-+AC_ARG_WITH(blas,
-+	[AS_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
-+case $with_blas in
-+	yes | "") ;;
-+	no) ax_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
-+	*) BLAS_LIBS="-l$with_blas" ;;
-+esac
-+
-+# Get fortran linker names of BLAS functions to check for.
-+AC_F77_FUNC(sgemm)
-+AC_F77_FUNC(dgemm)
-+
-+ax_blas_save_LIBS="$LIBS"
-+LIBS="$LIBS $FLIBS"
-+
-+# First, check BLAS_LIBS environment variable
-+if test $ax_blas_ok = no; then
-+if test "x$BLAS_LIBS" != x; then
-+	save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-+	AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
-+	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes], [BLAS_LIBS=""])
-+	AC_MSG_RESULT($ax_blas_ok)
-+	LIBS="$save_LIBS"
-+fi
-+fi
-+
-+# BLAS linked to by default?  (happens on some supercomputers)
-+if test $ax_blas_ok = no; then
-+	save_LIBS="$LIBS"; LIBS="$LIBS"
-+	AC_MSG_CHECKING([if $sgemm is being linked in already])
-+	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes])
-+	AC_MSG_RESULT($ax_blas_ok)
-+	LIBS="$save_LIBS"
-+fi
-+
-+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(atlas, ATL_xerbla,
-+		[AC_CHECK_LIB(f77blas, $sgemm,
-+		[AC_CHECK_LIB(cblas, cblas_dgemm,
-+			[ax_blas_ok=yes
-+			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
-+			[], [-lf77blas -latlas])],
-+			[], [-latlas])])
-+fi
-+
-+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm,
-+		[AC_CHECK_LIB(dgemm, $dgemm,
-+		[AC_CHECK_LIB(sgemm, $sgemm,
-+			[ax_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
-+			[], [-lblas])],
-+			[], [-lblas])])
-+fi
-+
-+# BLAS in Intel MKL library?
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(mkl, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lmkl"])
-+fi
-+
-+# BLAS in Apple vecLib library?
-+if test $ax_blas_ok = no; then
-+	save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS"
-+	AC_MSG_CHECKING([for $sgemm in -framework vecLib])
-+	AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"])
-+	AC_MSG_RESULT($ax_blas_ok)
-+	LIBS="$save_LIBS"
-+fi
-+
-+# BLAS in Alpha CXML library?
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(cxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lcxml"])
-+fi
-+
-+# BLAS in Alpha DXML library? (now called CXML, see above)
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(dxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-ldxml"])
-+fi
-+
-+# BLAS in Sun Performance library?
-+if test $ax_blas_ok = no; then
-+	if test "x$GCC" != xyes; then # only works with Sun CC
-+		AC_CHECK_LIB(sunmath, acosp,
-+			[AC_CHECK_LIB(sunperf, $sgemm,
-+				[BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
-+                                 ax_blas_ok=yes],[],[-lsunmath])])
-+	fi
-+fi
-+
-+# BLAS in SCSL library?  (SGI/Cray Scientific Library)
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(scs, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lscs"])
-+fi
-+
-+# BLAS in SGIMATH library?
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(complib.sgimath, $sgemm,
-+		     [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
-+fi
-+
-+# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm,
-+		[AC_CHECK_LIB(essl, $sgemm,
-+			[ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
-+			[], [-lblas $FLIBS])])
-+fi
-+
-+# Generic BLAS library?
-+if test $ax_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lblas"])
-+fi
-+
-+AC_SUBST(BLAS_LIBS)
-+
-+LIBS="$ax_blas_save_LIBS"
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_blas_ok" = xyes; then
-+        ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
-+        :
-+else
-+        ax_blas_ok=no
-+        $2
-+fi
-+])dnl AX_BLAS
-diff -Nur SuperLU_4.1.orig/configure.ac SuperLU_4.1/configure.ac
---- SuperLU_4.1.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/configure.ac	2011-03-21 23:42:42.000000000 +0000
-@@ -0,0 +1,16 @@
-+# -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(superlu, 4.0, xsli@lbl.gov)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_HEADER([config.h])
-+AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
-+AC_PROG_F77
-+sinclude(ax_blas.m4)
-+AX_BLAS
-+if test x"$BLAS_LIBS" = x; then
-+   AC_MSG_ERROR([Cannot find blas libraries])
-+fi
-+AC_CHECK_LIB([m], [floor])
-+AC_CONFIG_FILES([Makefile SRC/Makefile superlu.pc])
-+AC_OUTPUT
-diff -Nur SuperLU_4.1.orig/EXAMPLE/Makefile SuperLU_4.1/EXAMPLE/Makefile
---- SuperLU_4.1.orig/EXAMPLE/Makefile	2011-03-21 23:42:28.000000000 +0000
-+++ SuperLU_4.1/EXAMPLE/Makefile	2011-03-21 23:42:42.000000000 +0000
-@@ -1,4 +1,3 @@
--include ../make.inc
- 
- #######################################################################
- #  This makefile creates the example programs for the linear equation
-@@ -32,7 +31,9 @@
- #
- #######################################################################
- 
--HEADER   = ../SRC
-+HEADER = $(shell pkg-config --cflags superlu)
-+LIBS   = $(shell pkg-config --libs superlu)
-+CDEFS  = -DAdd_
- 
- SLINEXM		= slinsol.o
- SLINEXM1	= slinsol1.o
-@@ -63,7 +64,6 @@
- ZLINXEXM2 	= zlinsolx2.o
- ZITSOL	     	= zitersol.o zfgmr.o
- 
--
- all:    single double complex complex16
- 
- single:    slinsol slinsol1 slinsolx slinsolx1 slinsolx2 sitersol
-@@ -71,86 +71,86 @@
- complex:   clinsol clinsol1 clinsolx clinsolx1 clinsolx2 citersol
- complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zitersol
- 
--slinsol: $(SLINEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@
-+slinsol: $(SLINEXM) 
-+	$(LD) $(LDFLAGS) $(SLINEXM) $(LIBS)  -o $@
- 
--slinsol1: $(SLINEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SLINEXM1) $(LIBS) -lm -o $@
-+slinsol1: $(SLINEXM1) 
-+	$(LD) $(LDFLAGS) $(SLINEXM1) $(LIBS)  -o $@
- 
--slinsolx: $(SLINXEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SLINXEXM) $(LIBS) -lm -o $@
-+slinsolx: $(SLINXEXM) 
-+	$(LD) $(LDFLAGS) $(SLINXEXM) $(LIBS)  -o $@
- 
--slinsolx1: $(SLINXEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SLINXEXM1) $(LIBS) -lm -o $@
-+slinsolx1: $(SLINXEXM1) 
-+	$(LD) $(LDFLAGS) $(SLINXEXM1) $(LIBS)  -o $@
- 
--slinsolx2: $(SLINXEXM2) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SLINXEXM2) $(LIBS) -lm -o $@
-+slinsolx2: $(SLINXEXM2) 
-+	$(LD) $(LDFLAGS) $(SLINXEXM2) $(LIBS)  -o $@
- 
--sitersol: $(SITSOL) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@
-+sitersol: $(SITSOL) 
-+	$(LD) $(LDFLAGS) $(SITSOL) $(LIBS)  -o $@
- 
--dlinsol: $(DLINEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
-+dlinsol: $(DLINEXM) 
-+	$(LD) $(LDFLAGS) $(DLINEXM) $(LIBS)  -o $@
- 
--dlinsol1: $(DLINEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(DLINEXM1) $(LIBS) -lm -o $@
-+dlinsol1: $(DLINEXM1) 
-+	$(LD) $(LDFLAGS) $(DLINEXM1) $(LIBS)  -o $@
- 
--dlinsolx: $(DLINXEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(DLINXEXM) $(LIBS) -lm -o $@
-+dlinsolx: $(DLINXEXM) 
-+	$(LD) $(LDFLAGS) $(DLINXEXM) $(LIBS)  -o $@
- 
--dlinsolx1: $(DLINXEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(DLINXEXM1) $(LIBS) -lm -o $@
-+dlinsolx1: $(DLINXEXM1) 
-+	$(LD) $(LDFLAGS) $(DLINXEXM1) $(LIBS)  -o $@
- 
--dlinsolx2: $(DLINXEXM2) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(DLINXEXM2) $(LIBS) -lm -o $@
-+dlinsolx2: $(DLINXEXM2) 
-+	$(LD) $(LDFLAGS) $(DLINXEXM2) $(LIBS)  -o $@
- 
--superlu: $(SUPERLUEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
-+superlu: $(SUPERLUEXM) 
-+	$(LD) $(LDFLAGS) $(SUPERLUEXM) $(LIBS)  -o $@
- 
--ditersol: $(DITSOL) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@
-+ditersol: $(DITSOL) 
-+	$(LD) $(LDFLAGS) $(DITSOL) $(LIBS)  -o $@
- 
--clinsol: $(CLINEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
-+clinsol: $(CLINEXM) 
-+	$(LD) $(LDFLAGS) $(CLINEXM) $(LIBS)  -o $@
- 
--clinsol1: $(CLINEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(CLINEXM1) $(LIBS) -lm -o $@
-+clinsol1: $(CLINEXM1) 
-+	$(LD) $(LDFLAGS) $(CLINEXM1) $(LIBS)  -o $@
- 
--clinsolx: $(CLINXEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(CLINXEXM) $(LIBS) -lm -o $@
-+clinsolx: $(CLINXEXM) 
-+	$(LD) $(LDFLAGS) $(CLINXEXM) $(LIBS)  -o $@
- 
--clinsolx1: $(CLINXEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(CLINXEXM1) $(LIBS) -lm -o $@
-+clinsolx1: $(CLINXEXM1) 
-+	$(LD) $(LDFLAGS) $(CLINXEXM1) $(LIBS)  -o $@
- 
--clinsolx2: $(CLINXEXM2) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(CLINXEXM2) $(LIBS) -lm -o $@
-+clinsolx2: $(CLINXEXM2) 
-+	$(LD) $(LDFLAGS) $(CLINXEXM2) $(LIBS)  -o $@
- 
--citersol: $(CITSOL) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) -lm -o $@
-+citersol: $(CITSOL) 
-+	$(LD) $(LDFLAGS) $(CITSOL) $(LIBS)  -o $@
- 
--zlinsol: $(ZLINEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@
-+zlinsol: $(ZLINEXM) 
-+	$(LD) $(LDFLAGS) $(ZLINEXM) $(LIBS)  -o $@
- 
--zlinsol1: $(ZLINEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(ZLINEXM1) $(LIBS) -lm -o $@
-+zlinsol1: $(ZLINEXM1) 
-+	$(LD) $(LDFLAGS) $(ZLINEXM1) $(LIBS)  -o $@
- 
--zlinsolx: $(ZLINXEXM) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(ZLINXEXM) $(LIBS) -lm -o $@
-+zlinsolx: $(ZLINXEXM) 
-+	$(LD) $(LDFLAGS) $(ZLINXEXM) $(LIBS)  -o $@
- 
--zlinsolx1: $(ZLINXEXM1) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(ZLINXEXM1) $(LIBS) -lm -o $@
-+zlinsolx1: $(ZLINXEXM1) 
-+	$(LD) $(LDFLAGS) $(ZLINXEXM1) $(LIBS)  -o $@
- 
--zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(ZLINXEXM2) $(LIBS) -lm -o $@
-+zlinsolx2: $(ZLINXEXM2) 
-+	$(LD) $(LDFLAGS) $(ZLINXEXM2) $(LIBS)  -o $@
- 
--zitersol: $(ZITSOL) $(SUPERLULIB)
--	$(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@
-+zitersol: $(ZITSOL) 
-+	$(LD) $(LDFLAGS) $(ZITSOL) $(LIBS)  -o $@
- 
- .c.o:
--	$(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
-+	$(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
- 
- .f.o:
--	$(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
-+	$(FC) $(FFLAGS) -c $< $(VERBOSE)
- 
- clean:	
- 	rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
-diff -Nur SuperLU_4.1.orig/FORTRAN/Makefile SuperLU_4.1/FORTRAN/Makefile
---- SuperLU_4.1.orig/FORTRAN/Makefile	2011-03-21 23:42:29.000000000 +0000
-+++ SuperLU_4.1/FORTRAN/Makefile	2011-03-21 23:45:29.000000000 +0000
-@@ -1,12 +1,12 @@
--include ../make.inc
-+#include ../make.inc
- 
- #######################################################################
- #  This makefile creates the Fortran example interface to use the
- #  C routines in SuperLU.
- #######################################################################
- 
--HEADER   = ../SRC
--LIBS	= $(SUPERLULIB) $(BLASLIB) -lm
-+HEADER   = $(shell pkg-config --cflags superlu)
-+LIBS	= $(shell pkg-config --libs superlu)
- 
- # double real
- F77EXM	= f77_main.o hbcode1.o c_fortran_dgssv.o
-@@ -17,19 +17,19 @@
- all:	f77exm zf77exm
- 
- f77exm: $(F77EXM) $(SUPERLULIB)
--	$(FORTRAN) $(LOADOPTS) $(F77EXM) $(LIBS) -o $@
-+	$(FC) $(LDFLAGS) $(F77EXM) $(LIBS) -o $@
- 
- zf77exm: $(ZF77EXM) $(SUPERLULIB)
- 	$(FORTRAN) $(LOADOPTS) $(ZF77EXM) $(LIBS) -o $@
- 
- c_fortran_zgssv.o: c_fortran_zgssv.c
--	$(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
-+	$(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
- 
- .c.o:
--	$(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
-+	$(CC) $(CFLAGS) $(CDEFS) $(HEADER) -c $< $(VERBOSE)
- 
- .f.o:
--	$(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
-+	$(FC) $(FFLAGS) -c $< $(VERBOSE)
- 
- clean:	
- 	rm -f *.o f77exm zf77exm
-diff -Nur SuperLU_4.1.orig/Makefile.am SuperLU_4.1/Makefile.am
---- SuperLU_4.1.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/Makefile.am	2011-03-21 23:42:42.000000000 +0000
-@@ -0,0 +1,4 @@
-+SUBDIRS = SRC
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = superlu.pc
-diff -Nur SuperLU_4.1.orig/SRC/Makefile.am SuperLU_4.1/SRC/Makefile.am
---- SuperLU_4.1.orig/SRC/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/SRC/Makefile.am	2011-03-21 23:42:42.000000000 +0000
-@@ -0,0 +1,116 @@
-+AM_CPPFLAGS = -DAdd_
-+
-+### headers
-+noinst_HEADERS = \
-+	colamd.h \
-+	html_mainpage.h
-+
-+src_includedir = $(includedir)/superlu
-+src_include_HEADERS = \
-+	slu_cdefs.h \
-+	slu_ddefs.h \
-+	slu_sdefs.h \
-+	slu_zdefs.h \
-+	slu_Cnames.h \
-+	slu_dcomplex.h \
-+	slu_scomplex.h \
-+	slu_util.h \
-+	superlu_enum_consts.h \
-+	supermatrix.h
-+
-+### LAPACK 
-+LAAUX 	= lsame.c xerbla.c
-+SLASRC 	= slacon.c 
-+DLASRC	= dlacon.c
-+CLASRC	= clacon.c scsum1.c icmax1.c
-+ZLASRC	= zlacon.c dzsum1.c izmax1.c
-+SCLAUX 	= slamch.c
-+DZLAUX 	= dlamch.c
-+
-+### SuperLU 
-+ALLAUX 	= superlu_timer.c util.c memory.c get_perm_c.c mmd.c \
-+	  sp_coletree.c sp_preorder.c sp_ienv.c relax_snode.c \
-+	  heap_relax_snode.c colamd.c \
-+	  ilu_relax_snode.c ilu_heap_relax_snode.c mark_relax.c \
-+	  mc64ad.f qselect.f
-+
-+SLUSRC = \
-+	sgssv.c sgssvx.c \
-+	ssp_blas2.c ssp_blas3.c sgscon.c  \
-+	slangs.c sgsequ.c slaqgs.c spivotgrowth.c \
-+	sgsrfs.c sgstrf.c sgstrs.c scopy_to_ucol.c \
-+	ssnode_dfs.c ssnode_bmod.c \
-+	spanel_dfs.c spanel_bmod.c sreadhb.c \
-+	scolumn_dfs.c scolumn_bmod.c spivotL.c spruneL.c \
-+	smemory.c sutil.c smyblas2.c \
-+	sgsisx.c sgsitrf.c sldperm.c \
-+	ilu_sdrop_row.c ilu_ssnode_dfs.c \
-+	ilu_scolumn_dfs.c ilu_spanel_dfs.c ilu_scopy_to_ucol.c \
-+	ilu_spivotL.c sdiagonal.c
-+
-+DLUSRC = \
-+	dgssv.c dgssvx.c \
-+	dsp_blas2.c dsp_blas3.c dgscon.c \
-+	dlangs.c dgsequ.c dlaqgs.c dpivotgrowth.c  \
-+	dgsrfs.c dgstrf.c dgstrs.c dcopy_to_ucol.c \
-+	dsnode_dfs.c dsnode_bmod.c \
-+	dpanel_dfs.c dpanel_bmod.c dreadhb.c \
-+	dcolumn_dfs.c dcolumn_bmod.c dpivotL.c dpruneL.c \
-+	dmemory.c dutil.c dmyblas2.c \
-+	dgsisx.c dgsitrf.c \
-+	dldperm.c \
-+	ilu_ddrop_row.c ilu_dsnode_dfs.c \
-+	ilu_dcolumn_dfs.c ilu_dpanel_dfs.c ilu_dcopy_to_ucol.c \
-+	ilu_dpivotL.c ddiagonal.c
-+
-+CLUSRC = \
-+	scomplex.c cgssv.c cgssvx.c csp_blas2.c csp_blas3.c cgscon.c \
-+	clangs.c cgsequ.c claqgs.c cpivotgrowth.c  \
-+	cgsrfs.c cgstrf.c cgstrs.c ccopy_to_ucol.c \
-+	csnode_dfs.c csnode_bmod.c \
-+	cpanel_dfs.c cpanel_bmod.c creadhb.c \
-+	ccolumn_dfs.c ccolumn_bmod.c cpivotL.c cpruneL.c \
-+	cmemory.c cutil.c cmyblas2.c \
-+	cgsisx.c cgsitrf.c cldperm.c \
-+	ilu_cdrop_row.c ilu_csnode_dfs.c \
-+	ilu_ccolumn_dfs.c ilu_cpanel_dfs.c ilu_ccopy_to_ucol.c \
-+	ilu_cpivotL.c cdiagonal.c
-+
-+ZLUSRC = \
-+	dcomplex.c zgssv.c zgssvx.c zsp_blas2.c zsp_blas3.c zgscon.c \
-+	zlangs.c zgsequ.c zlaqgs.c zpivotgrowth.c  \
-+	zgsrfs.c zgstrf.c zgstrs.c zcopy_to_ucol.c \
-+	zsnode_dfs.c zsnode_bmod.c \
-+	zpanel_dfs.c zpanel_bmod.c zreadhb.c \
-+	zcolumn_dfs.c zcolumn_bmod.c zpivotL.c zpruneL.c \
-+	zmemory.c zutil.c zmyblas2.c \
-+	zgsisx.c zgsitrf.c zldperm.c \
-+	ilu_zdrop_row.c ilu_zsnode_dfs.c \
-+	ilu_zcolumn_dfs.c ilu_zpanel_dfs.c ilu_zcopy_to_ucol.c \
-+	ilu_zpivotL.c zdiagonal.c
-+
-+lib_LTLIBRARIES = libsuperlu.la
-+libsuperlu_la_SOURCES = \
-+	$(ALLAUX) $(LAAUX) \
-+	$(SCLAUX) $(DZLAUX) \
-+	$(SLUSRC) $(SLASRC) \
-+	$(DLUSRC) $(DLASRC) \
-+	$(CLUSRC) $(CLASRC) \
-+	$(ZLUSRC) $(ZLASRC)
-+libsuperlu_la_LIBADD = $(BLAS_LIBS)
-+libsuperlu_la_LDFLAGS = -no-undefined -version-info 4:0:0
-+
-+##################################
-+# Do not optimize these routines #
-+##################################
-+LTCOMPILE_NOOPT = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
-+
-+slamch.lo: slamch.c
-+	$(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+dlamch.lo: dlamch.c
-+	$(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+superlu_timer.lo: superlu_timer.c
-+	$(LTCOMPILE_NOOPT) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+##################################
-diff -Nur SuperLU_4.1.orig/superlu.pc.in SuperLU_4.1/superlu.pc.in
---- SuperLU_4.1.orig/superlu.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ SuperLU_4.1/superlu.pc.in	2011-03-21 23:42:42.000000000 +0000
-@@ -0,0 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Sparse LU factorization library
-+Version: @PACKAGE_VERSION@
-+URL: http://www.netlib.org/blas/
-+Libs: -L${libdir} -lsuperlu 
-+Libs.private: -lm @FLIBS@
-+Requires: blas
-+Cflags: -I${includedir}/superlu
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r1.ebuild
index cfae4f76f224..8f388f179a8d 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3-r1.ebuild,v 1.4 2015/04/21 19:06:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3-r1.ebuild,v 1.5 2015/05/13 06:57:11 jmorgan Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 RDEPEND="
diff --git a/sci-libs/superlu/superlu-4.3.ebuild b/sci-libs/superlu/superlu-4.3.ebuild
deleted file mode 100644
index 1aa9735b2409..000000000000
--- a/sci-libs/superlu/superlu-4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3.ebuild,v 1.12 2015/01/26 10:33:10 ago Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fortran-2 toolchain-funcs multilib
-
-MY_PN=SuperLU
-
-DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-
-RDEPEND="
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-S="${WORKDIR}/${MY_PN}_${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
-
-src_prepare() {
-	unset VERBOSE
-	sed \
-		-e "s:= ar:= $(tc-getAR):g" \
-		-e "s:= ranlib:= $(tc-getRANLIB):g" \
-		-i make.inc || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" )
-	autotools-utils_src_configure
-	rm EXAMPLE/*itersol1 || die
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/TESTING
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		FORTRAN="$(tc-getFC)" \
-		LOADER="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		FFLAGS="${FFLAGS}" \
-		LOADOPTS="${LDFLAGS}" \
-		BLASLIB="$($(tc-getPKG_CONFIG) --libs blas)" \
-		SUPERLULIB="${S}/SRC/.libs/libsuperlu$(get_libname)" \
-		LD_LIBRARY_PATH="${S}/SRC/.libs" \
-		DYLD_LIBRARY_PATH="${S}/SRC/.libs"
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc DOC/ug.pdf && dohtml DOC/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
-	fi
-}
diff --git a/sci-libs/umfpack/umfpack-5.6.2.ebuild b/sci-libs/umfpack/umfpack-5.6.2.ebuild
index 8653883eef45..beacaed15495 100644
--- a/sci-libs/umfpack/umfpack-5.6.2.ebuild
+++ b/sci-libs/umfpack/umfpack-5.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.6.2.ebuild,v 1.11 2015/05/06 06:28:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/umfpack/umfpack-5.6.2.ebuild,v 1.12 2015/05/13 07:01:52 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +cholmod static-libs"
 
 RDEPEND="
diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest
index bb610fbbb63e..24129d4331b5 100644
--- a/sci-visualization/g3data/Manifest
+++ b/sci-visualization/g3data/Manifest
@@ -1,2 +1 @@
-DIST g3data-1.5.3.tar.gz 52051 SHA256 afedb9e4ad8968dbf8f0ffddab149f24c41f028fe984f4d0740009e8b2de1de0
 DIST g3data-1.5.4.tar.gz 127973 SHA256 ec729322fa8b47dd8f70ecef350ff880faf73e18b693cb5d4b2330f7ebb08b7a SHA512 b4651eb6ba87ddb745c46520ccf2d7146d179e69a614d7c6c247b82eaf188b30e955d60e7df59419f63a304a5c5215829d3bea3cc233d2729ff599c523d852e2 WHIRLPOOL 7736929e7131bf3b2adfef61d750ba4ead8550a59940c6c9bce18d028d036accc1547d6d95098dde6cb2cb283b57d4af608f62a8d3f89947c87e5ed3a94a2fe9
diff --git a/sci-visualization/g3data/g3data-1.5.3.ebuild b/sci-visualization/g3data/g3data-1.5.3.ebuild
deleted file mode 100644
index d9c65b5909aa..000000000000
--- a/sci-visualization/g3data/g3data-1.5.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/g3data-1.5.3.ebuild,v 1.6 2012/05/04 08:07:00 jdhore Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Tool for extracting data from graphs"
-HOMEPAGE="http://www.frantz.fi/software/g3data.php"
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( ~app-text/docbook-sgml-utils-0.6.14 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-	# although doc is only 1 man file, it pulls lots of deps
-	if use doc; then
-		emake g3data.1 || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	dobin g3data || die "dobin failed - no binary!"
-	dodoc README.SOURCE
-	# xpm image is really a png file
-	newicon g3data-icon.xpm g3data.png
-	make_desktop_entry g3data "g3data data extractor"
-	if use examples; then
-		docinto examples
-		dodoc README.TEST
-		insinto /usr/share/doc/${PF}/examples
-		doins test1.png test1.values test2.png test2.values
-	fi
-	if use doc; then
-		doman g3data.1 || die "doman failed"
-	fi
-}
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
index 14d54da3bf60..1f47d6050960 100644
--- a/sci-visualization/g3data/g3data-1.5.4.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/g3data-1.5.4.ebuild,v 1.3 2015/05/12 07:55:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/g3data/g3data-1.5.4.ebuild,v 1.5 2015/05/13 12:34:55 jlec Exp $
 
 EAPI=5
 
 inherit autotools-utils eutils
 
 DESCRIPTION="Tool for extracting data from graphs"
-HOMEPAGE="http://www.frantz.fi/software/g3data.php"
+HOMEPAGE="https://github.com/pn2200/g3data"
 SRC_URI="mirror://github/pn2200/g3data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index b52e93d6e4fb..3ceab2ed78c9 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -4,3 +4,4 @@ DIST veusz-1.20.tar.gz 1774169 SHA256 6a73b357f0c0602e6fd45eaec3a5a305181101f15e
 DIST veusz-1.21.1.tar.gz 1804339 SHA256 fa1ba0129228218c804fc7c654cdfd4d6c4b5a93830a307afc893eb126b0a2c5 SHA512 6fa40674fb9100522e7fefa3d49759488c7ee0d11b90bb2a7de6ccb4f03da53e8e2024027987df8638fa1a7742845ac6e8263d9942ac287d1e4c2e1dece42dd8 WHIRLPOOL 9f5d7e874c7547c87eaf348661d72ad2b72fe8ead966b713c136a5a11e1fbfce073009fb58601887a98c729be78566178016472d80ccca3e7330ad633a809be0
 DIST veusz-1.21.tar.gz 1803048 SHA256 15dae8891d7d87d13c097b93b0c65e6b9c657f919a735a0b2e59260733feb7d0 SHA512 1fb061f31f258b2c17f5200c9d25b6aa94c1cf85b675097ab236e6772c87721b3bbe9d655c0ffe698f087e2e116aa371824a58ce380def9beadde37c8e49bf1c WHIRLPOOL dfa8212590e4b9b190918814e77111601f4ffb26932ccb3c0a9d38ddbb510fc5aad4dcd4268da74dcf717278940ffe7c621325aee906e1526e956bed8b493847
 DIST veusz-1.22.tar.gz 1809097 SHA256 46665217787053a2524adf425db4ceab667a69098de1548c03e512c2bd8cefbb SHA512 dca03c04280e63dae9e709e6269382cc9b5e33ea253137cda5cdb1873c5588638a0609dcec763abae8bf15d41d5b624baa4761f2e195c462821faf2f87830231 WHIRLPOOL 34c211fa570d2cb91678966e8ff68d9720002a246d8ce3431d193d3bc7bceee914ace4c010a5d9340800df17ee6825775f0248b8aabfff12aa98cc87dfb26bda
+DIST veusz-1.23.tar.gz 1822000 SHA256 6ba03cef320764cf8d1cc62f6ab20e52727a86faf21c45382e999f596d62c301 SHA512 4a7ec1e94338bbcc072caf7256da8185b999814e9c2cda907c7989fd5b80efda49029c801f49d4b95a8745f3b47bf0e4b16732f9524558e3466321d27d696646 WHIRLPOOL 11f246a8139c324f8ef58ce28b9108a6d416722909b28af69d154bd283409105fb6c5cc4e19ad5630f870766e2a741b68f51076f171e12974c53b180e5974b8e
diff --git a/sci-visualization/veusz/veusz-1.22.ebuild b/sci-visualization/veusz/veusz-1.22.ebuild
index 5882f5d4e0fb..a1b1aa0f69aa 100644
--- a/sci-visualization/veusz/veusz-1.22.ebuild
+++ b/sci-visualization/veusz/veusz-1.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.22.ebuild,v 1.3 2015/03/04 14:08:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.22.ebuild,v 1.4 2015/05/13 12:18:53 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit eutils fdo-mime distutils-r1 virtualx
 
@@ -28,10 +28,11 @@ RDEPEND="${CDEPEND}
 	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
 	minuit? ( dev-python/pyminuit[${PYTHON_USEDEP}] )
 	vo? (
-			dev-python/astropy[${PYTHON_USEDEP}]
-			dev-python/sampy[$(python_gen_usedep 'python2*')]
-		)"
+		dev-python/astropy[${PYTHON_USEDEP}]
+		dev-python/sampy[$(python_gen_usedep 'python2*')]
+	)"
 DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sip[${PYTHON_USEDEP}]
 	"
 
diff --git a/sci-visualization/veusz/veusz-1.23.ebuild b/sci-visualization/veusz/veusz-1.23.ebuild
new file mode 100644
index 000000000000..305f9d76ca0d
--- /dev/null
+++ b/sci-visualization/veusz/veusz-1.23.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.23.ebuild,v 1.1 2015/05/13 12:18:53 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit eutils fdo-mime distutils-r1 virtualx
+
+DESCRIPTION="Qt scientific plotting package with good Postscript output"
+HOMEPAGE="http://home.gna.org/veusz/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc emf fits hdf5 minuit vo"
+
+CDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
+	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	minuit? ( dev-python/pyminuit[${PYTHON_USEDEP}] )
+	vo? (
+		dev-python/astropy[${PYTHON_USEDEP}]
+		dev-python/sampy[$(python_gen_usedep 'python2*')]
+	)"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	"
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	VIRTUALX_COMMAND="${EPYTHON}" \
+		VEUSZ_RESOURCE_DIR="${S}" \
+		virtualmake runselftest.py
+}
+
+python_install() {
+	distutils-r1_python_install
+	# symlink the license, bug #341653
+	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
+	ln -s "${PORTDIR}"/licenses/${LICENSE} \
+		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc Documents/manual.pdf && \
+		dohtml -r Documents/{manimages,manual.html}
+
+	doicon icons/veusz.png
+	domenu "${FILESDIR}"/veusz.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/veusz.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sys-apps/hwinfo/hwinfo-21.4.ebuild b/sys-apps/hwinfo/hwinfo-21.4.ebuild
index 9206cd29fb6d..22fdfef0ca69 100644
--- a/sys-apps/hwinfo/hwinfo-21.4.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-21.4.ebuild,v 1.1 2014/05/28 10:19:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-21.4.ebuild,v 1.2 2015/05/13 06:46:46 jmorgan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.1.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
index 94fee59ba356..3dd4574c163a 100644
--- a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild,v 1.6 2015/05/13 05:44:37 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild,v 1.7 2015/05/13 06:37:22 jmorgan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
 
 # TODO opencl only works with AMD so no virtual
diff --git a/sys-apps/iproute2/iproute2-3.19.0.ebuild b/sys-apps/iproute2/iproute2-3.19.0.ebuild
index 5e13390b51d8..54660f3699f5 100644
--- a/sys-apps/iproute2/iproute2-3.19.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.19.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.19.0.ebuild,v 1.8 2015/05/11 19:34:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.19.0.ebuild,v 1.10 2015/05/13 09:47:21 blueness Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kmod/kmod-19.ebuild b/sys-apps/kmod/kmod-19.ebuild
index 137de6b4ba33..623aa71ce477 100644
--- a/sys-apps/kmod/kmod-19.ebuild
+++ b/sys-apps/kmod/kmod-19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-19.ebuild,v 1.10 2015/04/14 12:38:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-19.ebuild,v 1.11 2015/05/13 06:36:35 jmorgan Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/kmod/kmod-20.ebuild b/sys-apps/kmod/kmod-20.ebuild
index 64423d09b90d..c70bf52302e6 100644
--- a/sys-apps/kmod/kmod-20.ebuild
+++ b/sys-apps/kmod/kmod-20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-20.ebuild,v 1.8 2015/04/26 20:03:47 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-20.ebuild,v 1.9 2015/05/13 09:50:02 blueness Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild
index e402a57c9d16..f437a84c9af9 100644
--- a/sys-apps/most/most-5.0.0a-r1.ebuild
+++ b/sys-apps/most/most-5.0.0a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-5.0.0a-r1.ebuild,v 1.2 2015/05/08 12:13:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-5.0.0a-r1.ebuild,v 1.4 2015/05/13 11:23:37 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"
diff --git a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild
index 61d95986c021..0688b427a4cc 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild,v 1.4 2015/05/11 19:31:42 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r5.ebuild,v 1.5 2015/05/13 11:32:09 zlogene Exp $
 
 EAPI=5
 inherit autotools-utils pam
@@ -17,7 +17,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
 IUSE="openssl"
 S="${WORKDIR}/${P/_rc/RC}"
 
diff --git a/sys-auth/pambase/pambase-20150213.ebuild b/sys-auth/pambase/pambase-20150213.ebuild
index 2343b520f224..aae4e8bf997b 100644
--- a/sys-auth/pambase/pambase-20150213.ebuild
+++ b/sys-auth/pambase/pambase-20150213.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20150213.ebuild,v 1.6 2015/05/06 16:44:01 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20150213.ebuild,v 1.8 2015/05/13 11:13:27 zlogene Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 -sparc-fbsd -x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="consolekit cracklib debug gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT=binchecks
diff --git a/sys-block/partitionmanager/partitionmanager-1.1.1.ebuild b/sys-block/partitionmanager/partitionmanager-1.1.1.ebuild
index 5dc898c14b34..42f96786f74e 100644
--- a/sys-block/partitionmanager/partitionmanager-1.1.1.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partitionmanager/partitionmanager-1.1.1.ebuild,v 1.1 2015/02/17 10:20:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partitionmanager/partitionmanager-1.1.1.ebuild,v 1.3 2015/05/13 09:31:48 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index 2df1c9fa927a..f35ae447eb49 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -3,3 +3,4 @@ DIST autoconf-archive-2013.06.09.tar.xz 531052 SHA256 a98d0a7bf74ee74754096e7233
 DIST autoconf-archive-2013.11.01.tar.xz 540316 SHA256 78ab75310cfacc5d71b4dacbce97450eed21a27afeb3a0f0fa48b3e0ec1c0161 SHA512 2360c1016e708c9669dca681811231872301559253bda5286eaf006046445711a692dff75c299cc9fd077166d0f7c871e1930c6cfe089408de95cb069e3ad63e WHIRLPOOL 184c48ca9acd653cc9a8853cdab3c18d5051f8efaadf5ad721e74414feba66b4aaf84ab21276fae2fe42f3c594b0c7fee7b52399327642acf4e50de0ed05a5ee
 DIST autoconf-archive-2014.02.28.tar.xz 550416 SHA256 f4b22a73654f98bf70201bee6913418426d0b2836bf833719ca38b8b19fe503b SHA512 196e4d41a2e3f5c4af1386388bfdeef904fb433f82920a6baf73cb8f938efe8d11b73ff96d34afab2c795458327bb4c6b2c35fa127312a8b64c10f8ab102c99b WHIRLPOOL 20e69ac1de4c847341e2a443050b588c5504e6b3b44453512deee0ce09a110da0b26913aed31422c6180e3222e54b75241aa801f22b3067364118fef7d7c6057
 DIST autoconf-archive-2015.02.04.tar.xz 575956 SHA256 dfd460d23a9690322dee29a355ea285b5774f37383d3741cf77a4ad6a11a7e81 SHA512 54382adcf55b9dd126de6727c034cae7c72c8217c9979d3b889705c3bfe41ec8329621dea5ff592ebf7e530775ce96faf47baffe36e8fedf9cd78c8dc423932e WHIRLPOOL 82298941615179234da8f1ab360ddb890d32ef54e983dd90965f766b0d89d6322867f5bff06954e4cc67c7d59819284350e4f8cfc85c44a7fd4d4b015bb383f2
+DIST autoconf-archive-2015.02.24.tar.xz 578536 SHA256 69715bdd078f552ca85e498a94543e11cb8bcdf0359e659b84d84d19372b0dc5 SHA512 111cb9ba8abac766dd9dc7d96cd3a4a3f845430a3f3365712765eb61adc00f3d278ae0ddbda950a08c2a34091023a2d889896f716b0379d7f328eae35a246e17 WHIRLPOOL c8dcd24520da545a4e1a909f83d8d0a41491eac723714437e486e5fa8e335f097e751990f5513e67cc7bd6e8f328b2ef5faeb22407c5b8daec089e3a9255c7d5
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild
index 5623dfc264eb..8d2cff8a53e2 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild,v 1.2 2015/02/17 00:50:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild,v 1.4 2015/05/13 09:26:27 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 #file collisions, bug #540246
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2015.02.24.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2015.02.24.ebuild
new file mode 100644
index 000000000000..a210612bf762
--- /dev/null
+++ b/sys-devel/autoconf-archive/autoconf-archive-2015.02.24.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.24.ebuild,v 1.1 2015/05/13 09:03:23 vapier Exp $
+
+EAPI=5
+
+DESCRIPTION="GNU Autoconf Macro Archive"
+HOMEPAGE="http://www.gnu.org/software/autoconf-archive/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+#file collisions, bug #540246
+RDEPEND="!=gnome-base/gnome-common-3.14.0
+	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
+DEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_install() {
+	default
+	rm -rf "${ED}/usr/share/${PN}" || die
+}
diff --git a/sys-devel/gcc/gcc-4.7.4.ebuild b/sys-devel/gcc/gcc-4.7.4.ebuild
index 445abfc1e756..7c193968235e 100644
--- a/sys-devel/gcc/gcc-4.7.4.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.4.ebuild,v 1.11 2015/05/10 18:34:59 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.4.ebuild,v 1.12 2015/05/13 09:39:25 ago Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild
index 9fbe4d4f7f3a..223c95281e96 100644
--- a/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild,v 1.13 2015/04/25 16:41:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.49.2.ebuild,v 1.14 2015/05/13 07:00:10 jmorgan Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -38,12 +38,12 @@ then
 	inherit git-2 bash-completion-r1 eutils
 	S="${WORKDIR}/${PN}"
 	SRC_URI="${COMMON_URI}"
-	KEYWORDS="alpha arm hppa ia64 ppc s390 sh sparc"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 s390 sh sparc"
 else
 	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		${COMMON_URI}"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index fb24f0060aa5..7ad9cadecc3d 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,7 +10,7 @@ DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b
 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 linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
-DIST patch-3.10.77.xz 1102324 SHA256 0eadd5d850448107d3aaee813b2190251115b6a3a370e1691e7baadd2fbe074b SHA512 ac88e9cd4e245496055cc98fbaf547e54dabee4876b31768dfca00f89c5cf4ad7bf4708febd7982047008b499709735d5e4d9f4a6e798a3e344ac0d2bdb98659 WHIRLPOOL d4b7f80d4fd74f622760c75db3229411df4c463f12608ab428c064f745f23b36142d8afc47a5dd2e53b1846e5b4c9b4a30b892093cc9fb3a68a047e35b893891
+DIST patch-3.10.78.xz 1109132 SHA256 0b86190c3142fc22e405865d9d028f3e72ca4197d46dd034fe47e6d80665737c SHA512 a878c20ec95b3e6d2cc0ee664eca95b5b7c0c321d281d2617ade1cea0a4bb78cb21491a2f677992fabb2577938dd4fdd404f0ead54ff63076672ea6dba2e7770 WHIRLPOOL 352af0017d169e8d5b0d0ee3d18aa2b3f78f3e1ff5b9a49c0f1daae0ff0b5f0d8551642e87bc3f23496dcdb858c61cbf6544756f48f80777de45f0e8929af760
 DIST patch-3.12.42.xz 1207152 SHA256 43b79cde0a61471c11a1f90f70607a254263f3568a9d33563ac9446fb1cf0817 SHA512 5441162d835cdbd95e41107de010d29c3ac9fb94277d3d273614e13a9753bc16fedf9787b19c7b1dead5b72008983ed4ef716f268a6b6beb7820c7c7790e135e WHIRLPOOL 6faeb7463c5020894d085d6e1838ebfc283624bd518b29ddecd251818643f7180f0431441e2e929bc26d30d653019b7f2394983773a1fa14fe78317d5a426c70
 DIST patch-3.14.41.xz 876872 SHA256 64b3131606ff534ee27f61323ca1cc9693545edf4871bdbcb2bfa299ce5efca9 SHA512 d3426fce0b4709955167164f1226de5f7d7292fea57f5f0e565bd590a226b854424c428f3c28909132cd93330af0c3105eb53f77aa8ddc8bbfaef38a413a9992 WHIRLPOOL 3e193713b1c04ad1b48ff3d0dfc006faf00ad1a17298e4ec162eed468319adde93ad8bf80a8060201a7f6b1a3ec34e4e03a9cf2d3807d0b03dda140f13c1ce18
 DIST patch-3.18.13.xz 368132 SHA256 d9191eb7fa47e95c81945e561cdf35bb12fcdd2bbf12f37f60533cbf57be429c SHA512 4d85a6a64b2d07b94b817fd4c3e0406910dd7d2028e58cfb13cf04d9ebb3bfe0f99148742489e2d5a72d93018c85adbf0e37bd068c01084d305574a9c49f9dff WHIRLPOOL dba5b06eddd83a592f53af1c3d57d51afaf01dab7b43471ff071b2d33bd12363f3c14b1c6dc5dab0bcf1574eaa58db8f6ac0a63f7d8efff57d019b453f698b2a
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.77.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.78.ebuild
similarity index 89%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.10.77.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.10.78.ebuild
index 540f2bf99d29..f5d023fc16f1 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.77.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.10.78.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.77.ebuild,v 1.1 2015/05/06 21:32:29 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.10.78.ebuild,v 1.1 2015/05/13 12:53:59 mpagano Exp $
 
 EAPI="5"
 K_NOUSENAME="yes"
diff --git a/sys-libs/musl/musl-1.1.8-r2.ebuild b/sys-libs/musl/musl-1.1.8-r2.ebuild
index 8af23f4113e2..748cbc40e650 100644
--- a/sys-libs/musl/musl-1.1.8-r2.ebuild
+++ b/sys-libs/musl/musl-1.1.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.8-r2.ebuild,v 1.1 2015/04/18 11:24:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.8-r2.ebuild,v 1.2 2015/05/13 12:51:20 blueness Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.musl-libc.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
 fi
 
 LICENSE="MIT LGPL-2 GPL-2"
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
index 3cba19e1c049..4492d77273f1 100644
--- a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild,v 1.2 2015/05/12 07:56:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild,v 1.3 2015/05/13 09:33:39 ago Exp $
 
 EAPI=5
 inherit apache-module eutils
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="net-dns/avahi[dbus]"
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index d1e831689039..74fcf355ff49 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pchrist@gentoo.org</email>
 		<name>Panagiotis Christopoulos</name>
 	</maintainer>
 	<maintainer>
-		<email>dlcampbell@gmx.com</email>
+		<email>zlg@gentoo.org</email>
 		<name>Daniel Campbell</name>
-		<description>Mantainer. Assign bugs to him</description>
+		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<longdescription>
 		Fluxbox is yet another windowmanager for X. Originally based upon the
@@ -19,14 +18,12 @@
 		countless additional features.
 	</longdescription>
 	<use>
-		<flag name='bidi'>
+		<flag name="bidi">
 			Enable bidirectional language support with
 			<pkg>dev-libs/fribidi</pkg>
 		</flag>
-		<flag name='slit'>Enables the Fluxbox slit (or dock)</flag>
-		<flag name='systray'>
-			Enables the system tray in the Fluxbox toolbar
-		</flag>
-		<flag name='toolbar'>Enables the Fluxbox toolbar</flag>
+		<flag name="slit">Enables the Fluxbox slit (or dock)</flag>
+		<flag name="systray">Enables the system tray in the Fluxbox toolbar</flag>
+		<flag name="toolbar">Enables the Fluxbox toolbar</flag>
 	</use>
 </pkgmetadata>